netlabel: remove unused parameter in netlbl_netlink_auditinfo()

loginuid/sessionid/secid have been read from 'current' instead of struct
netlink_skb_parms, the parameter 'skb' seems no longer needed.

Fixes: c53fa1ed92cd ("netlink: kill loginuid/sessionid/sid members from struct netlink_skb_parms")
Signed-off-by: Zheng Yejian <zhengyejian1@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/netlabel/netlabel_calipso.c b/net/netlabel/netlabel_calipso.c
index f28c8947c730e829bd6ede326b946640989e7865..91a19c3ea1a365a871dcf6a617e7f301bf5f899e 100644 (file)
--- a/net/netlabel/netlabel_calipso.c
+++ b/net/netlabel/netlabel_calipso.c
@@ -105,7 +105,7 @@ static int netlbl_calipso_add(struct sk_buff *skb, struct genl_info *info)
            !info->attrs[NLBL_CALIPSO_A_MTYPE])
                return -EINVAL;
 
-       netlbl_netlink_auditinfo(skb, &audit_info);
+       netlbl_netlink_auditinfo(&audit_info);
        switch (nla_get_u32(info->attrs[NLBL_CALIPSO_A_MTYPE])) {
        case CALIPSO_MAP_PASS:
                ret_val = netlbl_calipso_add_pass(info, &audit_info);
@@ -287,7 +287,7 @@ static int netlbl_calipso_remove(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[NLBL_CALIPSO_A_DOI])
                return -EINVAL;
 
-       netlbl_netlink_auditinfo(skb, &audit_info);
+       netlbl_netlink_auditinfo(&audit_info);
        cb_arg.doi = nla_get_u32(info->attrs[NLBL_CALIPSO_A_DOI]);
        cb_arg.audit_info = &audit_info;
        ret_val = netlbl_domhsh_walk(&skip_bkt, &skip_chain,

diff --git a/net/netlabel/netlabel_cipso_v4.c b/net/netlabel/netlabel_cipso_v4.c
index 4f50a64315cf0f8663d6f70116e5d0eb7e3d9264..baf235721c43f365c58645de42e8af13b787fe37 100644 (file)
--- a/net/netlabel/netlabel_cipso_v4.c
+++ b/net/netlabel/netlabel_cipso_v4.c
@@ -410,7 +410,7 @@ static int netlbl_cipsov4_add(struct sk_buff *skb, struct genl_info *info)
            !info->attrs[NLBL_CIPSOV4_A_MTYPE])
                return -EINVAL;
 
-       netlbl_netlink_auditinfo(skb, &audit_info);
+       netlbl_netlink_auditinfo(&audit_info);
        switch (nla_get_u32(info->attrs[NLBL_CIPSOV4_A_MTYPE])) {
        case CIPSO_V4_MAP_TRANS:
                ret_val = netlbl_cipsov4_add_std(info, &audit_info);
@@ -709,7 +709,7 @@ static int netlbl_cipsov4_remove(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[NLBL_CIPSOV4_A_DOI])
                return -EINVAL;
 
-       netlbl_netlink_auditinfo(skb, &audit_info);
+       netlbl_netlink_auditinfo(&audit_info);
        cb_arg.doi = nla_get_u32(info->attrs[NLBL_CIPSOV4_A_DOI]);
        cb_arg.audit_info = &audit_info;
        ret_val = netlbl_domhsh_walk(&skip_bkt, &skip_chain,

diff --git a/net/netlabel/netlabel_mgmt.c b/net/netlabel/netlabel_mgmt.c
index ca52f5085989914c1025d3bc0452ab3ad75fe0dc..e664ab990941b45886cfbda1bce9dac0a6c49e8c 100644 (file)
--- a/net/netlabel/netlabel_mgmt.c
+++ b/net/netlabel/netlabel_mgmt.c
@@ -434,7 +434,7 @@ static int netlbl_mgmt_add(struct sk_buff *skb, struct genl_info *info)
             (info->attrs[NLBL_MGMT_A_IPV6MASK] != NULL)))
                return -EINVAL;
 
-       netlbl_netlink_auditinfo(skb, &audit_info);
+       netlbl_netlink_auditinfo(&audit_info);
 
        return netlbl_mgmt_add_common(info, &audit_info);
 }
@@ -457,7 +457,7 @@ static int netlbl_mgmt_remove(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[NLBL_MGMT_A_DOMAIN])
                return -EINVAL;
 
-       netlbl_netlink_auditinfo(skb, &audit_info);
+       netlbl_netlink_auditinfo(&audit_info);
 
        domain = nla_data(info->attrs[NLBL_MGMT_A_DOMAIN]);
        return netlbl_domhsh_remove(domain, AF_UNSPEC, &audit_info);
@@ -557,7 +557,7 @@ static int netlbl_mgmt_adddef(struct sk_buff *skb, struct genl_info *info)
             (info->attrs[NLBL_MGMT_A_IPV6MASK] != NULL)))
                return -EINVAL;
 
-       netlbl_netlink_auditinfo(skb, &audit_info);
+       netlbl_netlink_auditinfo(&audit_info);
 
        return netlbl_mgmt_add_common(info, &audit_info);
 }
@@ -576,7 +576,7 @@ static int netlbl_mgmt_removedef(struct sk_buff *skb, struct genl_info *info)
 {
        struct netlbl_audit audit_info;
 
-       netlbl_netlink_auditinfo(skb, &audit_info);
+       netlbl_netlink_auditinfo(&audit_info);
 
        return netlbl_domhsh_remove_default(AF_UNSPEC, &audit_info);
 }

diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c
index 3e6ac9b790b15f1cd20c664d71ac21615adf7efa..2483df0bbd7c799c3cbd5cf0a2ff910948478e1d 100644 (file)
--- a/net/netlabel/netlabel_unlabeled.c
+++ b/net/netlabel/netlabel_unlabeled.c
@@ -814,7 +814,7 @@ static int netlbl_unlabel_accept(struct sk_buff *skb, struct genl_info *info)
        if (info->attrs[NLBL_UNLABEL_A_ACPTFLG]) {
                value = nla_get_u8(info->attrs[NLBL_UNLABEL_A_ACPTFLG]);
                if (value == 1 || value == 0) {
-                       netlbl_netlink_auditinfo(skb, &audit_info);
+                       netlbl_netlink_auditinfo(&audit_info);
                        netlbl_unlabel_acceptflg_set(value, &audit_info);
                        return 0;
                }
@@ -897,7 +897,7 @@ static int netlbl_unlabel_staticadd(struct sk_buff *skb,
               !info->attrs[NLBL_UNLABEL_A_IPV6MASK])))
                return -EINVAL;
 
-       netlbl_netlink_auditinfo(skb, &audit_info);
+       netlbl_netlink_auditinfo(&audit_info);
 
        ret_val = netlbl_unlabel_addrinfo_get(info, &addr, &mask, &addr_len);
        if (ret_val != 0)
@@ -947,7 +947,7 @@ static int netlbl_unlabel_staticadddef(struct sk_buff *skb,
               !info->attrs[NLBL_UNLABEL_A_IPV6MASK])))
                return -EINVAL;
 
-       netlbl_netlink_auditinfo(skb, &audit_info);
+       netlbl_netlink_auditinfo(&audit_info);
 
        ret_val = netlbl_unlabel_addrinfo_get(info, &addr, &mask, &addr_len);
        if (ret_val != 0)
@@ -994,7 +994,7 @@ static int netlbl_unlabel_staticremove(struct sk_buff *skb,
               !info->attrs[NLBL_UNLABEL_A_IPV6MASK])))
                return -EINVAL;
 
-       netlbl_netlink_auditinfo(skb, &audit_info);
+       netlbl_netlink_auditinfo(&audit_info);
 
        ret_val = netlbl_unlabel_addrinfo_get(info, &addr, &mask, &addr_len);
        if (ret_val != 0)
@@ -1034,7 +1034,7 @@ static int netlbl_unlabel_staticremovedef(struct sk_buff *skb,
               !info->attrs[NLBL_UNLABEL_A_IPV6MASK])))
                return -EINVAL;
 
-       netlbl_netlink_auditinfo(skb, &audit_info);
+       netlbl_netlink_auditinfo(&audit_info);
 
        ret_val = netlbl_unlabel_addrinfo_get(info, &addr, &mask, &addr_len);
        if (ret_val != 0)

diff --git a/net/netlabel/netlabel_user.h b/net/netlabel/netlabel_user.h
index b9ba8112b3c524fd940c0220772f003c076399fc..6190cbf94bf0d3125d020dc6c7d6b69c1ef134e1 100644 (file)
--- a/net/netlabel/netlabel_user.h
+++ b/net/netlabel/netlabel_user.h
@@ -28,11 +28,9 @@
 
 /**
  * netlbl_netlink_auditinfo - Fetch the audit information from a NETLINK msg
- * @skb: the packet
  * @audit_info: NetLabel audit information
  */
-static inline void netlbl_netlink_auditinfo(struct sk_buff *skb,
-                                           struct netlbl_audit *audit_info)
+static inline void netlbl_netlink_auditinfo(struct netlbl_audit *audit_info)
 {
        security_task_getsecid_subj(current, &audit_info->secid);
        audit_info->loginuid = audit_get_loginuid(current);