Merge branch 'sched/urgent' into sched/core

[firefly-linux-kernel-4.4.55.git] / net / xfrm / xfrm_user.c

diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 6106b72826d374f4d5cbcc1ea8ab1c391bef2917..ba59983aaffee6e3d7f7a0afb241f92d787b152d 100644 (file)
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -1741,6 +1741,10 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh,
        if (err)
                return err;
 
+       err = verify_policy_dir(p->dir);
+       if (err)
+               return err;
+
        if (p->index)
                xp = xfrm_policy_byid(net, mark, type, p->dir, p->index, 0, &err);
        else {
@@ -1766,13 +1770,9 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh,
        if (xp == NULL)
                return -ENOENT;
 
-       read_lock(&xp->lock);
-       if (xp->walk.dead) {
-               read_unlock(&xp->lock);
+       if (unlikely(xp->walk.dead))
                goto out;
-       }
 
-       read_unlock(&xp->lock);
        err = 0;
        if (up->hard) {
                uid_t loginuid = NETLINK_CB(skb).loginuid;
@@ -1783,7 +1783,7 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh,
 
        } else {
                // reset the timers here?
-               printk("Dont know what to do with soft policy expire\n");
+               WARN(1, "Dont know what to do with soft policy expire\n");
        }
        km_policy_expired(xp, p->dir, up->hard, current->pid);
 
@@ -1883,7 +1883,7 @@ static int xfrm_add_acquire(struct sk_buff *skb, struct nlmsghdr *nlh,
        return 0;
 
 bad_policy:
-       printk("BAD policy passed\n");
+       WARN(1, "BAD policy passed\n");
 free_state:
        kfree(x);
 nomem:
@@ -2385,8 +2385,9 @@ static int xfrm_send_state_notify(struct xfrm_state *x, struct km_event *c)
        case XFRM_MSG_FLUSHSA:
                return xfrm_notify_sa_flush(c);
        default:
-                printk("xfrm_user: Unknown SA event %d\n", c->event);
-                break;
+               printk(KERN_NOTICE "xfrm_user: Unknown SA event %d\n",
+                      c->event);
+               break;
        }
 
        return 0;
@@ -2676,7 +2677,8 @@ static int xfrm_send_policy_notify(struct xfrm_policy *xp, int dir, struct km_ev
        case XFRM_MSG_POLEXPIRE:
                return xfrm_exp_policy_notify(xp, dir, c);
        default:
-               printk("xfrm_user: Unknown Policy event %d\n", c->event);
+               printk(KERN_NOTICE "xfrm_user: Unknown Policy event %d\n",
+                      c->event);
        }
 
        return 0;