audit: convert all sessionid declaration to unsigned int

[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 3f565e495ac68cea83e1d52cf7db7e820fe777ad..ec97e13743e6ec32ff7e2a9a77a7056ebb8874b8 100644 (file)
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -446,7 +446,8 @@ static void copy_from_user_state(struct xfrm_state *x, struct xfrm_usersa_info *
        memcpy(&x->sel, &p->sel, sizeof(x->sel));
        memcpy(&x->lft, &p->lft, sizeof(x->lft));
        x->props.mode = p->mode;
-       x->props.replay_window = p->replay_window;
+       x->props.replay_window = min_t(unsigned int, p->replay_window,
+                                       sizeof(x->replay.bitmap) * 8);
        x->props.reqid = p->reqid;
        x->props.family = p->family;
        memcpy(&x->props.saddr, &p->saddr, sizeof(x->props.saddr));
@@ -599,7 +600,7 @@ static int xfrm_add_sa(struct sk_buff *skb, struct nlmsghdr *nlh,
        int err;
        struct km_event c;
        kuid_t loginuid = audit_get_loginuid(current);
-       u32 sessionid = audit_get_sessionid(current);
+       unsigned int sessionid = audit_get_sessionid(current);
        u32 sid;
 
        err = verify_newsa_info(p, attrs);
@@ -678,7 +679,7 @@ static int xfrm_del_sa(struct sk_buff *skb, struct nlmsghdr *nlh,
        struct km_event c;
        struct xfrm_usersa_id *p = nlmsg_data(nlh);
        kuid_t loginuid = audit_get_loginuid(current);
-       u32 sessionid = audit_get_sessionid(current);
+       unsigned int sessionid = audit_get_sessionid(current);
        u32 sid;
 
        x = xfrm_user_state_lookup(net, p, attrs, &err);
@@ -1404,7 +1405,7 @@ static int xfrm_add_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
        int err;
        int excl;
        kuid_t loginuid = audit_get_loginuid(current);
-       u32 sessionid = audit_get_sessionid(current);
+       unsigned int sessionid = audit_get_sessionid(current);
        u32 sid;
 
        err = verify_newpolicy_info(p);
@@ -1662,7 +1663,7 @@ static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
                }
        } else {
                kuid_t loginuid = audit_get_loginuid(current);
-               u32 sessionid = audit_get_sessionid(current);
+               unsigned int sessionid = audit_get_sessionid(current);
                u32 sid;
 
                security_task_getsecid(current, &sid);
@@ -1856,7 +1857,7 @@ static int xfrm_new_ae(struct sk_buff *skb, struct nlmsghdr *nlh,
        if (x->km.state != XFRM_STATE_VALID)
                goto out;
 
-       err = xfrm_replay_verify_len(x->replay_esn, rp);
+       err = xfrm_replay_verify_len(x->replay_esn, re);
        if (err)
                goto out;
 
@@ -1958,7 +1959,7 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh,
        err = 0;
        if (up->hard) {
                kuid_t loginuid = audit_get_loginuid(current);
-               u32 sessionid = audit_get_sessionid(current);
+               unsigned int sessionid = audit_get_sessionid(current);
                u32 sid;
 
                security_task_getsecid(current, &sid);
@@ -2001,7 +2002,7 @@ static int xfrm_add_sa_expire(struct sk_buff *skb, struct nlmsghdr *nlh,
 
        if (ue->hard) {
                kuid_t loginuid = audit_get_loginuid(current);
-               u32 sessionid = audit_get_sessionid(current);
+               unsigned int sessionid = audit_get_sessionid(current);
                u32 sid;
 
                security_task_getsecid(current, &sid);