diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2008-01-10 04:20:52 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-02-01 14:04:59 -0500 |
commit | 0c11b9428f619ab377c92eff2f160a834a6585dd (patch) | |
tree | 35b573715ad5730a77d067486838345132771a7a /net/key/af_key.c | |
parent | 24e1c13c93cbdd05e4b7ea921c0050b036555adc (diff) |
[PATCH] switch audit_get_loginuid() to task_struct *
all callers pass something->audit_context
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/key/af_key.c')
-rw-r--r-- | net/key/af_key.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c index 16b72b5570c3..45c3c27d279a 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c | |||
@@ -1466,7 +1466,7 @@ static int pfkey_add(struct sock *sk, struct sk_buff *skb, struct sadb_msg *hdr, | |||
1466 | err = xfrm_state_update(x); | 1466 | err = xfrm_state_update(x); |
1467 | 1467 | ||
1468 | xfrm_audit_state_add(x, err ? 0 : 1, | 1468 | xfrm_audit_state_add(x, err ? 0 : 1, |
1469 | audit_get_loginuid(current->audit_context), 0); | 1469 | audit_get_loginuid(current), 0); |
1470 | 1470 | ||
1471 | if (err < 0) { | 1471 | if (err < 0) { |
1472 | x->km.state = XFRM_STATE_DEAD; | 1472 | x->km.state = XFRM_STATE_DEAD; |
@@ -1520,7 +1520,7 @@ static int pfkey_delete(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h | |||
1520 | km_state_notify(x, &c); | 1520 | km_state_notify(x, &c); |
1521 | out: | 1521 | out: |
1522 | xfrm_audit_state_delete(x, err ? 0 : 1, | 1522 | xfrm_audit_state_delete(x, err ? 0 : 1, |
1523 | audit_get_loginuid(current->audit_context), 0); | 1523 | audit_get_loginuid(current), 0); |
1524 | xfrm_state_put(x); | 1524 | xfrm_state_put(x); |
1525 | 1525 | ||
1526 | return err; | 1526 | return err; |
@@ -1695,7 +1695,7 @@ static int pfkey_flush(struct sock *sk, struct sk_buff *skb, struct sadb_msg *hd | |||
1695 | if (proto == 0) | 1695 | if (proto == 0) |
1696 | return -EINVAL; | 1696 | return -EINVAL; |
1697 | 1697 | ||
1698 | audit_info.loginuid = audit_get_loginuid(current->audit_context); | 1698 | audit_info.loginuid = audit_get_loginuid(current); |
1699 | audit_info.secid = 0; | 1699 | audit_info.secid = 0; |
1700 | err = xfrm_state_flush(proto, &audit_info); | 1700 | err = xfrm_state_flush(proto, &audit_info); |
1701 | if (err) | 1701 | if (err) |
@@ -2273,7 +2273,7 @@ static int pfkey_spdadd(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h | |||
2273 | hdr->sadb_msg_type != SADB_X_SPDUPDATE); | 2273 | hdr->sadb_msg_type != SADB_X_SPDUPDATE); |
2274 | 2274 | ||
2275 | xfrm_audit_policy_add(xp, err ? 0 : 1, | 2275 | xfrm_audit_policy_add(xp, err ? 0 : 1, |
2276 | audit_get_loginuid(current->audit_context), 0); | 2276 | audit_get_loginuid(current), 0); |
2277 | 2277 | ||
2278 | if (err) | 2278 | if (err) |
2279 | goto out; | 2279 | goto out; |
@@ -2356,7 +2356,7 @@ static int pfkey_spddelete(struct sock *sk, struct sk_buff *skb, struct sadb_msg | |||
2356 | return -ENOENT; | 2356 | return -ENOENT; |
2357 | 2357 | ||
2358 | xfrm_audit_policy_delete(xp, err ? 0 : 1, | 2358 | xfrm_audit_policy_delete(xp, err ? 0 : 1, |
2359 | audit_get_loginuid(current->audit_context), 0); | 2359 | audit_get_loginuid(current), 0); |
2360 | 2360 | ||
2361 | if (err) | 2361 | if (err) |
2362 | goto out; | 2362 | goto out; |
@@ -2617,7 +2617,7 @@ static int pfkey_spdget(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h | |||
2617 | 2617 | ||
2618 | if (delete) { | 2618 | if (delete) { |
2619 | xfrm_audit_policy_delete(xp, err ? 0 : 1, | 2619 | xfrm_audit_policy_delete(xp, err ? 0 : 1, |
2620 | audit_get_loginuid(current->audit_context), 0); | 2620 | audit_get_loginuid(current), 0); |
2621 | 2621 | ||
2622 | if (err) | 2622 | if (err) |
2623 | goto out; | 2623 | goto out; |
@@ -2694,7 +2694,7 @@ static int pfkey_spdflush(struct sock *sk, struct sk_buff *skb, struct sadb_msg | |||
2694 | struct xfrm_audit audit_info; | 2694 | struct xfrm_audit audit_info; |
2695 | int err; | 2695 | int err; |
2696 | 2696 | ||
2697 | audit_info.loginuid = audit_get_loginuid(current->audit_context); | 2697 | audit_info.loginuid = audit_get_loginuid(current); |
2698 | audit_info.secid = 0; | 2698 | audit_info.secid = 0; |
2699 | err = xfrm_policy_flush(XFRM_POLICY_TYPE_MAIN, &audit_info); | 2699 | err = xfrm_policy_flush(XFRM_POLICY_TYPE_MAIN, &audit_info); |
2700 | if (err) | 2700 | if (err) |