diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-06-08 23:58:52 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-06-17 21:29:49 -0700 |
| commit | 6f68dc37759b1d6ff3b4d4a9d097605a09f8f043 (patch) | |
| tree | 7d0be960b8c0ec5b947637a0650f1c639002103a | |
| parent | 9dadaa19cb11a8db38072a92a3f95deab7a797fb (diff) | |
| download | linux-stable-6f68dc37759b1d6ff3b4d4a9d097605a09f8f043.tar.gz linux-stable-6f68dc37759b1d6ff3b4d4a9d097605a09f8f043.tar.bz2 linux-stable-6f68dc37759b1d6ff3b4d4a9d097605a09f8f043.zip | |
[NET]: Fix warnings after LSM-IPSEC changes.
Assignment used as truth value in xfrm_del_sa()
and xfrm_get_policy().
Wrong argument type declared for security_xfrm_state_delete()
when SELINUX is disabled.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/security.h | 2 | ||||
| -rw-r--r-- | net/xfrm/xfrm_user.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 14c9bd050607..4dfb1b84a9b3 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -2995,7 +2995,7 @@ static inline void security_xfrm_state_free(struct xfrm_state *x) { } -static inline int security_xfrm_state_delete(struct xfrm_policy *xp) +static inline int security_xfrm_state_delete(struct xfrm_state *x) { return 0; } diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index a3733d2db3ba..c21dc26141ea 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -427,7 +427,7 @@ static int xfrm_del_sa(struct sk_buff *skb, struct nlmsghdr *nlh, void **xfrma) if (x == NULL) return -ESRCH; - if (err = security_xfrm_state_delete(x)) + if ((err = security_xfrm_state_delete(x)) != 0) goto out; if (xfrm_state_kern(x)) { @@ -1057,7 +1057,7 @@ static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh, void **xfr MSG_DONTWAIT); } } else { - if (err = security_xfrm_policy_delete(xp)) + if ((err = security_xfrm_policy_delete(xp)) != 0) goto out; c.data.byid = p->index; c.event = nlh->nlmsg_type; |