diff options
Diffstat (limited to 'net/netlabel/netlabel_mgmt.c')
-rw-r--r-- | net/netlabel/netlabel_mgmt.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/net/netlabel/netlabel_mgmt.c b/net/netlabel/netlabel_mgmt.c index 8626c9f678e..0ac314f18ad 100644 --- a/net/netlabel/netlabel_mgmt.c +++ b/net/netlabel/netlabel_mgmt.c | |||
@@ -108,7 +108,7 @@ static int netlbl_mgmt_add(struct sk_buff *skb, struct genl_info *info) | |||
108 | 108 | ||
109 | switch (entry->type) { | 109 | switch (entry->type) { |
110 | case NETLBL_NLTYPE_UNLABELED: | 110 | case NETLBL_NLTYPE_UNLABELED: |
111 | ret_val = netlbl_domhsh_add(entry); | 111 | ret_val = netlbl_domhsh_add(entry, NETLINK_CB(skb).sid); |
112 | break; | 112 | break; |
113 | case NETLBL_NLTYPE_CIPSOV4: | 113 | case NETLBL_NLTYPE_CIPSOV4: |
114 | if (!info->attrs[NLBL_MGMT_A_CV4DOI]) | 114 | if (!info->attrs[NLBL_MGMT_A_CV4DOI]) |
@@ -125,7 +125,7 @@ static int netlbl_mgmt_add(struct sk_buff *skb, struct genl_info *info) | |||
125 | rcu_read_unlock(); | 125 | rcu_read_unlock(); |
126 | goto add_failure; | 126 | goto add_failure; |
127 | } | 127 | } |
128 | ret_val = netlbl_domhsh_add(entry); | 128 | ret_val = netlbl_domhsh_add(entry, NETLINK_CB(skb).sid); |
129 | rcu_read_unlock(); | 129 | rcu_read_unlock(); |
130 | break; | 130 | break; |
131 | default: | 131 | default: |
@@ -161,7 +161,7 @@ static int netlbl_mgmt_remove(struct sk_buff *skb, struct genl_info *info) | |||
161 | return -EINVAL; | 161 | return -EINVAL; |
162 | 162 | ||
163 | domain = nla_data(info->attrs[NLBL_MGMT_A_DOMAIN]); | 163 | domain = nla_data(info->attrs[NLBL_MGMT_A_DOMAIN]); |
164 | return netlbl_domhsh_remove(domain); | 164 | return netlbl_domhsh_remove(domain, NETLINK_CB(skb).sid); |
165 | } | 165 | } |
166 | 166 | ||
167 | /** | 167 | /** |
@@ -277,7 +277,8 @@ static int netlbl_mgmt_adddef(struct sk_buff *skb, struct genl_info *info) | |||
277 | 277 | ||
278 | switch (entry->type) { | 278 | switch (entry->type) { |
279 | case NETLBL_NLTYPE_UNLABELED: | 279 | case NETLBL_NLTYPE_UNLABELED: |
280 | ret_val = netlbl_domhsh_add_default(entry); | 280 | ret_val = netlbl_domhsh_add_default(entry, |
281 | NETLINK_CB(skb).sid); | ||
281 | break; | 282 | break; |
282 | case NETLBL_NLTYPE_CIPSOV4: | 283 | case NETLBL_NLTYPE_CIPSOV4: |
283 | if (!info->attrs[NLBL_MGMT_A_CV4DOI]) | 284 | if (!info->attrs[NLBL_MGMT_A_CV4DOI]) |
@@ -294,7 +295,8 @@ static int netlbl_mgmt_adddef(struct sk_buff *skb, struct genl_info *info) | |||
294 | rcu_read_unlock(); | 295 | rcu_read_unlock(); |
295 | goto adddef_failure; | 296 | goto adddef_failure; |
296 | } | 297 | } |
297 | ret_val = netlbl_domhsh_add_default(entry); | 298 | ret_val = netlbl_domhsh_add_default(entry, |
299 | NETLINK_CB(skb).sid); | ||
298 | rcu_read_unlock(); | 300 | rcu_read_unlock(); |
299 | break; | 301 | break; |
300 | default: | 302 | default: |
@@ -322,7 +324,7 @@ adddef_failure: | |||
322 | */ | 324 | */ |
323 | static int netlbl_mgmt_removedef(struct sk_buff *skb, struct genl_info *info) | 325 | static int netlbl_mgmt_removedef(struct sk_buff *skb, struct genl_info *info) |
324 | { | 326 | { |
325 | return netlbl_domhsh_remove_default(); | 327 | return netlbl_domhsh_remove_default(NETLINK_CB(skb).sid); |
326 | } | 328 | } |
327 | 329 | ||
328 | /** | 330 | /** |