Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2014-05-22

This is the last ipsec pull request before I leave for
a three weeks vacation tomorrow. David, can you please
take urgent ipsec patches directly into net/net-next
during this time?

I'll continue to run the ipsec/ipsec-next trees as soon
as I'm back.

1) Simplify the xfrm audit handling, from Tetsuo Handa.

2) Codingstyle cleanup for xfrm_output, from abian Frederick.

Please pull or let me know if there are problems.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 36 insertions, 105 deletions

diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index 3bb2cdc13b46..c51e8f7b8653 100644
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -199,6 +199,7 @@ int xfrm_output(struct sk_buff *skb)
 
         return xfrm_output2(skb);
 }
+EXPORT_SYMBOL_GPL(xfrm_output);
 
 int xfrm_inner_extract_output(struct xfrm_state *x, struct sk_buff *skb)
 {
@@ -213,6 +214,7 @@ int xfrm_inner_extract_output(struct xfrm_state *x, struct sk_buff *skb)
                 return -EAFNOSUPPORT;
         return inner_mode->afinfo->extract_output(x, skb);
 }
+EXPORT_SYMBOL_GPL(xfrm_inner_extract_output);
 
 void xfrm_local_error(struct sk_buff *skb, int mtu)
 {
@@ -233,7 +235,4 @@ void xfrm_local_error(struct sk_buff *skb, int mtu)
         afinfo->local_error(skb, mtu);
         xfrm_state_put_afinfo(afinfo);
 }
-
-EXPORT_SYMBOL_GPL(xfrm_output);
-EXPORT_SYMBOL_GPL(xfrm_inner_extract_output);
 EXPORT_SYMBOL_GPL(xfrm_local_error);
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index e63f242ae03e..a8ef5108e0d8 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -769,7 +769,7 @@ EXPORT_SYMBOL(xfrm_policy_byid);
 
 #ifdef CONFIG_SECURITY_NETWORK_XFRM
 static inline int
-xfrm_policy_flush_secctx_check(struct net *net, u8 type, struct xfrm_audit *audit_info)
+xfrm_policy_flush_secctx_check(struct net *net, u8 type, bool task_valid)
 {
         int dir, err = 0;
 
@@ -783,10 +783,7 @@ xfrm_policy_flush_secctx_check(struct net *net, u8 type, struct xfrm_audit *audi
                                 continue;
                         err = security_xfrm_policy_delete(pol->security);
                         if (err) {
-                                xfrm_audit_policy_delete(pol, 0,
-                                                         audit_info->loginuid,
-                                                         audit_info->sessionid,
-                                                         audit_info->secid);
+                                xfrm_audit_policy_delete(pol, 0, task_valid);
                                 return err;
                         }
                 }
@@ -800,9 +797,7 @@ xfrm_policy_flush_secctx_check(struct net *net, u8 type, struct xfrm_audit *audi
                                                                 pol->security);
                                 if (err) {
                                         xfrm_audit_policy_delete(pol, 0,
-                                                        audit_info->loginuid,
-                                                        audit_info->sessionid,
-                                                        audit_info->secid);
+                                                                 task_valid);
                                         return err;
                                 }
                         }
@@ -812,19 +807,19 @@ xfrm_policy_flush_secctx_check(struct net *net, u8 type, struct xfrm_audit *audi
 }
 #else
 static inline int
-xfrm_policy_flush_secctx_check(struct net *net, u8 type, struct xfrm_audit *audit_info)
+xfrm_policy_flush_secctx_check(struct net *net, u8 type, bool task_valid)
 {
         return 0;
 }
 #endif
 
-int xfrm_policy_flush(struct net *net, u8 type, struct xfrm_audit *audit_info)
+int xfrm_policy_flush(struct net *net, u8 type, bool task_valid)
 {
         int dir, err = 0, cnt = 0;
 
         write_lock_bh(&net->xfrm.xfrm_policy_lock);
 
-        err = xfrm_policy_flush_secctx_check(net, type, audit_info);
+        err = xfrm_policy_flush_secctx_check(net, type, task_valid);
         if (err)
                 goto out;
 
@@ -841,9 +836,7 @@ int xfrm_policy_flush(struct net *net, u8 type, struct xfrm_audit *audit_info)
                         write_unlock_bh(&net->xfrm.xfrm_policy_lock);
                         cnt++;
 
-                        xfrm_audit_policy_delete(pol, 1, audit_info->loginuid,
-                                                 audit_info->sessionid,
-                                                 audit_info->secid);
+                        xfrm_audit_policy_delete(pol, 1, task_valid);
 
                         xfrm_policy_kill(pol);
 
@@ -862,10 +855,7 @@ int xfrm_policy_flush(struct net *net, u8 type, struct xfrm_audit *audit_info)
                                 write_unlock_bh(&net->xfrm.xfrm_policy_lock);
                                 cnt++;
 
-                                xfrm_audit_policy_delete(pol, 1,
-                                                         audit_info->loginuid,
-                                                         audit_info->sessionid,
-                                                         audit_info->secid);
+                                xfrm_audit_policy_delete(pol, 1, task_valid);
                                 xfrm_policy_kill(pol);
 
                                 write_lock_bh(&net->xfrm.xfrm_policy_lock);
@@ -2860,21 +2850,14 @@ out_byidx:
 
 static void xfrm_policy_fini(struct net *net)
 {
-        struct xfrm_audit audit_info;
         unsigned int sz;
         int dir;
 
         flush_work(&net->xfrm.policy_hash_work);
 #ifdef CONFIG_XFRM_SUB_POLICY
-        audit_info.loginuid = INVALID_UID;
-        audit_info.sessionid = (unsigned int)-1;
-        audit_info.secid = 0;
-        xfrm_policy_flush(net, XFRM_POLICY_TYPE_SUB, &audit_info);
+        xfrm_policy_flush(net, XFRM_POLICY_TYPE_SUB, false);
 #endif
-        audit_info.loginuid = INVALID_UID;
-        audit_info.sessionid = (unsigned int)-1;
-        audit_info.secid = 0;
-        xfrm_policy_flush(net, XFRM_POLICY_TYPE_MAIN, &audit_info);
+        xfrm_policy_flush(net, XFRM_POLICY_TYPE_MAIN, false);
 
         WARN_ON(!list_empty(&net->xfrm.policy_all));
 
@@ -2989,15 +2972,14 @@ static void xfrm_audit_common_policyinfo(struct xfrm_policy *xp,
         }
 }
 
-void xfrm_audit_policy_add(struct xfrm_policy *xp, int result,
-                           kuid_t auid, unsigned int sessionid, u32 secid)
+void xfrm_audit_policy_add(struct xfrm_policy *xp, int result, bool task_valid)
 {
         struct audit_buffer *audit_buf;
 
         audit_buf = xfrm_audit_start("SPD-add");
         if (audit_buf == NULL)
                 return;
-        xfrm_audit_helper_usrinfo(auid, sessionid, secid, audit_buf);
+        xfrm_audit_helper_usrinfo(task_valid, audit_buf);
         audit_log_format(audit_buf, " res=%u", result);
         xfrm_audit_common_policyinfo(xp, audit_buf);
         audit_log_end(audit_buf);
@@ -3005,14 +2987,14 @@ void xfrm_audit_policy_add(struct xfrm_policy *xp, int result,
 EXPORT_SYMBOL_GPL(xfrm_audit_policy_add);
 
 void xfrm_audit_policy_delete(struct xfrm_policy *xp, int result,
-                              kuid_t auid, unsigned int sessionid, u32 secid)
+                              bool task_valid)
 {
         struct audit_buffer *audit_buf;
 
         audit_buf = xfrm_audit_start("SPD-delete");
         if (audit_buf == NULL)
                 return;
-        xfrm_audit_helper_usrinfo(auid, sessionid, secid, audit_buf);
+        xfrm_audit_helper_usrinfo(task_valid, audit_buf);
         audit_log_format(audit_buf, " res=%u", result);
         xfrm_audit_common_policyinfo(xp, audit_buf);
         audit_log_end(audit_buf);
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 8e9c781a6bba..0ab54134bb40 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -463,9 +463,7 @@ expired:
         if (!err)
                 km_state_expired(x, 1, 0);
 
-        xfrm_audit_state_delete(x, err ? 0 : 1,
-                                audit_get_loginuid(current),
-                                audit_get_sessionid(current), 0);
+        xfrm_audit_state_delete(x, err ? 0 : 1, true);
 
 out:
         spin_unlock(&x->lock);
@@ -562,7 +560,7 @@ EXPORT_SYMBOL(xfrm_state_delete);
 
 #ifdef CONFIG_SECURITY_NETWORK_XFRM
 static inline int
-xfrm_state_flush_secctx_check(struct net *net, u8 proto, struct xfrm_audit *audit_info)
+xfrm_state_flush_secctx_check(struct net *net, u8 proto, bool task_valid)
 {
         int i, err = 0;
 
@@ -572,10 +570,7 @@ xfrm_state_flush_secctx_check(struct net *net, u8 proto, struct xfrm_audit *audi
                 hlist_for_each_entry(x, net->xfrm.state_bydst+i, bydst) {
                         if (xfrm_id_proto_match(x->id.proto, proto) &&
                            (err = security_xfrm_state_delete(x)) != 0) {
-                                xfrm_audit_state_delete(x, 0,
-                                                        audit_info->loginuid,
-                                                        audit_info->sessionid,
-                                                        audit_info->secid);
+                                xfrm_audit_state_delete(x, 0, task_valid);
                                 return err;
                         }
                 }
@@ -585,18 +580,18 @@ xfrm_state_flush_secctx_check(struct net *net, u8 proto, struct xfrm_audit *audi
 }
 #else
 static inline int
-xfrm_state_flush_secctx_check(struct net *net, u8 proto, struct xfrm_audit *audit_info)
+xfrm_state_flush_secctx_check(struct net *net, u8 proto, bool task_valid)
 {
         return 0;
 }
 #endif
 
-int xfrm_state_flush(struct net *net, u8 proto, struct xfrm_audit *audit_info)
+int xfrm_state_flush(struct net *net, u8 proto, bool task_valid)
 {
         int i, err = 0, cnt = 0;
 
         spin_lock_bh(&net->xfrm.xfrm_state_lock);
-        err = xfrm_state_flush_secctx_check(net, proto, audit_info);
+        err = xfrm_state_flush_secctx_check(net, proto, task_valid);
         if (err)
                 goto out;
 
@@ -612,9 +607,7 @@ restart:
 
                                 err = xfrm_state_delete(x);
                                 xfrm_audit_state_delete(x, err ? 0 : 1,
-                                                        audit_info->loginuid,
-                                                        audit_info->sessionid,
-                                                        audit_info->secid);
+                                                        task_valid);
                                 xfrm_state_put(x);
                                 if (!err)
                                         cnt++;
@@ -2128,14 +2121,10 @@ out_bydst:
 
 void xfrm_state_fini(struct net *net)
 {
-        struct xfrm_audit audit_info;
         unsigned int sz;
 
         flush_work(&net->xfrm.state_hash_work);
-        audit_info.loginuid = INVALID_UID;
-        audit_info.sessionid = (unsigned int)-1;
-        audit_info.secid = 0;
-        xfrm_state_flush(net, IPSEC_PROTO_ANY, &audit_info);
+        xfrm_state_flush(net, IPSEC_PROTO_ANY, false);
         flush_work(&net->xfrm.state_gc_work);
 
         WARN_ON(!list_empty(&net->xfrm.state_all));
@@ -2198,30 +2187,28 @@ static void xfrm_audit_helper_pktinfo(struct sk_buff *skb, u16 family,
         }
 }
 
-void xfrm_audit_state_add(struct xfrm_state *x, int result,
-                          kuid_t auid, unsigned int sessionid, u32 secid)
+void xfrm_audit_state_add(struct xfrm_state *x, int result, bool task_valid)
 {
         struct audit_buffer *audit_buf;
 
         audit_buf = xfrm_audit_start("SAD-add");
         if (audit_buf == NULL)
                 return;
-        xfrm_audit_helper_usrinfo(auid, sessionid, secid, audit_buf);
+        xfrm_audit_helper_usrinfo(task_valid, audit_buf);
         xfrm_audit_helper_sainfo(x, audit_buf);
         audit_log_format(audit_buf, " res=%u", result);
         audit_log_end(audit_buf);
 }
 EXPORT_SYMBOL_GPL(xfrm_audit_state_add);
 
-void xfrm_audit_state_delete(struct xfrm_state *x, int result,
-                             kuid_t auid, unsigned int sessionid, u32 secid)
+void xfrm_audit_state_delete(struct xfrm_state *x, int result, bool task_valid)
 {
         struct audit_buffer *audit_buf;
 
         audit_buf = xfrm_audit_start("SAD-delete");
         if (audit_buf == NULL)
                 return;
-        xfrm_audit_helper_usrinfo(auid, sessionid, secid, audit_buf);
+        xfrm_audit_helper_usrinfo(task_valid, audit_buf);
         xfrm_audit_helper_sainfo(x, audit_buf);
         audit_log_format(audit_buf, " res=%u", result);
         audit_log_end(audit_buf);
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 51398ae6cda8..fd9a16a6d1de 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -597,9 +597,6 @@ static int xfrm_add_sa(struct sk_buff *skb, struct nlmsghdr *nlh,
         struct xfrm_state *x;
         int err;
         struct km_event c;
-        kuid_t loginuid = audit_get_loginuid(current);
-        unsigned int sessionid = audit_get_sessionid(current);
-        u32 sid;
 
         err = verify_newsa_info(p, attrs);
         if (err)
@@ -615,8 +612,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);
+        xfrm_audit_state_add(x, err ? 0 : 1, true);
 
         if (err < 0) {
                 x->km.state = XFRM_STATE_DEAD;
@@ -676,9 +672,6 @@ 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);
-        kuid_t loginuid = audit_get_loginuid(current);
-        unsigned int sessionid = audit_get_sessionid(current);
-        u32 sid;
 
         x = xfrm_user_state_lookup(net, p, attrs, &err);
         if (x == NULL)
@@ -703,8 +696,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_audit_state_delete(x, err ? 0 : 1, true);
         xfrm_state_put(x);
         return err;
 }
@@ -1414,9 +1406,6 @@ static int xfrm_add_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
         struct km_event c;
         int err;
         int excl;
-        kuid_t loginuid = audit_get_loginuid(current);
-        unsigned int sessionid = audit_get_sessionid(current);
-        u32 sid;
 
         err = verify_newpolicy_info(p);
         if (err)
@@ -1435,8 +1424,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);
+        xfrm_audit_policy_add(xp, err ? 0 : 1, true);
 
         if (err) {
                 security_xfrm_policy_free(xp->security);
@@ -1673,13 +1661,7 @@ static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
                                             NETLINK_CB(skb).portid);
                 }
         } else {
-                kuid_t loginuid = audit_get_loginuid(current);
-                unsigned int sessionid = audit_get_sessionid(current);
-                u32 sid;
-
-                security_task_getsecid(current, &sid);
-                xfrm_audit_policy_delete(xp, err ? 0 : 1, loginuid, sessionid,
-                                         sid);
+                xfrm_audit_policy_delete(xp, err ? 0 : 1, true);
 
                 if (err != 0)
                         goto out;
@@ -1704,13 +1686,9 @@ static int xfrm_flush_sa(struct sk_buff *skb, struct nlmsghdr *nlh,
         struct net *net = sock_net(skb->sk);
         struct km_event c;
         struct xfrm_usersa_flush *p = nlmsg_data(nlh);
-        struct xfrm_audit audit_info;
         int err;
 
-        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);
+        err = xfrm_state_flush(net, p->proto, true);
         if (err) {
                 if (err == -ESRCH) /* empty table */
                         return 0;
@@ -1894,16 +1872,12 @@ static int xfrm_flush_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
         struct km_event c;
         u8 type = XFRM_POLICY_TYPE_MAIN;
         int err;
-        struct xfrm_audit audit_info;
 
         err = copy_from_user_policy_type(&type, attrs);
         if (err)
                 return err;
 
-        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);
+        err = xfrm_policy_flush(net, type, true);
         if (err) {
                 if (err == -ESRCH) /* empty table */
                         return 0;
@@ -1969,14 +1943,8 @@ 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);
-                unsigned int 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);
-
+                xfrm_audit_policy_delete(xp, 1, true);
         } else {
                 // reset the timers here?
                 WARN(1, "Dont know what to do with soft policy expire\n");
@@ -2012,13 +1980,8 @@ static int xfrm_add_sa_expire(struct sk_buff *skb, struct nlmsghdr *nlh,
         km_state_expired(x, ue->hard, nlh->nlmsg_pid);
 
         if (ue->hard) {
-                kuid_t loginuid = audit_get_loginuid(current);
-                unsigned int 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);
+                xfrm_audit_state_delete(x, 1, true);
         }
         err = 0;
 out: