netlink: kill loginuid/sessionid/sid members from struct netlink_skb_parms

Netlink message processing in the kernel is synchronous these days, the
session information can be collected when needed.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 32 insertions, 24 deletions

diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 673698d380d7..468ab60d3dc0 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -497,9 +497,9 @@ static int xfrm_add_sa(struct sk_buff *skb, struct nlmsghdr *nlh,
         struct xfrm_state *x;
         int err;
         struct km_event c;
-        uid_t loginuid = NETLINK_CB(skb).loginuid;
-        u32 sessionid = NETLINK_CB(skb).sessionid;
-        u32 sid = NETLINK_CB(skb).sid;
+        uid_t loginuid = audit_get_loginuid(current);
+        u32 sessionid = audit_get_sessionid(current);
+        u32 sid;
 
         err = verify_newsa_info(p, attrs);
         if (err)
@@ -515,6 +515,7 @@ static int xfrm_add_sa(struct sk_buff *skb, struct nlmsghdr *nlh,
         else
                 err = xfrm_state_update(x);
 
+        security_task_getsecid(current, &sid);
         xfrm_audit_state_add(x, err ? 0 : 1, loginuid, sessionid, sid);
 
         if (err < 0) {
@@ -575,9 +576,9 @@ static int xfrm_del_sa(struct sk_buff *skb, struct nlmsghdr *nlh,
         int err = -ESRCH;
         struct km_event c;
         struct xfrm_usersa_id *p = nlmsg_data(nlh);
-        uid_t loginuid = NETLINK_CB(skb).loginuid;
-        u32 sessionid = NETLINK_CB(skb).sessionid;
-        u32 sid = NETLINK_CB(skb).sid;
+        uid_t loginuid = audit_get_loginuid(current);
+        u32 sessionid = audit_get_sessionid(current);
+        u32 sid;
 
         x = xfrm_user_state_lookup(net, p, attrs, &err);
         if (x == NULL)
@@ -602,6 +603,7 @@ static int xfrm_del_sa(struct sk_buff *skb, struct nlmsghdr *nlh,
         km_state_notify(x, &c);
 
 out:
+        security_task_getsecid(current, &sid);
         xfrm_audit_state_delete(x, err ? 0 : 1, loginuid, sessionid, sid);
         xfrm_state_put(x);
         return err;
@@ -1265,9 +1267,9 @@ static int xfrm_add_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
         struct km_event c;
         int err;
         int excl;
-        uid_t loginuid = NETLINK_CB(skb).loginuid;
-        u32 sessionid = NETLINK_CB(skb).sessionid;
-        u32 sid = NETLINK_CB(skb).sid;
+        uid_t loginuid = audit_get_loginuid(current);
+        u32 sessionid = audit_get_sessionid(current);
+        u32 sid;
 
         err = verify_newpolicy_info(p);
         if (err)
@@ -1286,6 +1288,7 @@ static int xfrm_add_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
          * a type XFRM_MSG_UPDPOLICY - JHS */
         excl = nlh->nlmsg_type == XFRM_MSG_NEWPOLICY;
         err = xfrm_policy_insert(p->dir, xp, excl);
+        security_task_getsecid(current, &sid);
         xfrm_audit_policy_add(xp, err ? 0 : 1, loginuid, sessionid, sid);
 
         if (err) {
@@ -1522,10 +1525,11 @@ static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
                                             NETLINK_CB(skb).pid);
                 }
         } else {
-                uid_t loginuid = NETLINK_CB(skb).loginuid;
-                u32 sessionid = NETLINK_CB(skb).sessionid;
-                u32 sid = NETLINK_CB(skb).sid;
+                uid_t loginuid = audit_get_loginuid(current);
+                u32 sessionid = audit_get_sessionid(current);
+                u32 sid;
 
+                security_task_getsecid(current, &sid);
                 xfrm_audit_policy_delete(xp, err ? 0 : 1, loginuid, sessionid,
                                          sid);
 
@@ -1553,9 +1557,9 @@ static int xfrm_flush_sa(struct sk_buff *skb, struct nlmsghdr *nlh,
         struct xfrm_audit audit_info;
         int err;
 
-        audit_info.loginuid = NETLINK_CB(skb).loginuid;
-        audit_info.sessionid = NETLINK_CB(skb).sessionid;
-        audit_info.secid = NETLINK_CB(skb).sid;
+        audit_info.loginuid = audit_get_loginuid(current);
+        audit_info.sessionid = audit_get_sessionid(current);
+        security_task_getsecid(current, &audit_info.secid);
         err = xfrm_state_flush(net, p->proto, &audit_info);
         if (err) {
                 if (err == -ESRCH) /* empty table */
@@ -1720,9 +1724,9 @@ static int xfrm_flush_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
         if (err)
                 return err;
 
-        audit_info.loginuid = NETLINK_CB(skb).loginuid;
-        audit_info.sessionid = NETLINK_CB(skb).sessionid;
-        audit_info.secid = NETLINK_CB(skb).sid;
+        audit_info.loginuid = audit_get_loginuid(current);
+        audit_info.sessionid = audit_get_sessionid(current);
+        security_task_getsecid(current, &audit_info.secid);
         err = xfrm_policy_flush(net, type, &audit_info);
         if (err) {
                 if (err == -ESRCH) /* empty table */
@@ -1789,9 +1793,11 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh,
 
         err = 0;
         if (up->hard) {
-                uid_t loginuid = NETLINK_CB(skb).loginuid;
-                uid_t sessionid = NETLINK_CB(skb).sessionid;
-                u32 sid = NETLINK_CB(skb).sid;
+                uid_t loginuid = audit_get_loginuid(current);
+                u32 sessionid = audit_get_sessionid(current);
+                u32 sid;
+
+                security_task_getsecid(current, &sid);
                 xfrm_policy_delete(xp, p->dir);
                 xfrm_audit_policy_delete(xp, 1, loginuid, sessionid, sid);
 
@@ -1830,9 +1836,11 @@ static int xfrm_add_sa_expire(struct sk_buff *skb, struct nlmsghdr *nlh,
         km_state_expired(x, ue->hard, current->pid);
 
         if (ue->hard) {
-                uid_t loginuid = NETLINK_CB(skb).loginuid;
-                uid_t sessionid = NETLINK_CB(skb).sessionid;
-                u32 sid = NETLINK_CB(skb).sid;
+                uid_t loginuid = audit_get_loginuid(current);
+                u32 sessionid = audit_get_sessionid(current);
+                u32 sid;
+
+                security_task_getsecid(current, &sid);
                 __xfrm_state_delete(x);
                 xfrm_audit_state_delete(x, 1, loginuid, sessionid, sid);
         }