Commit 6f68dc37 authored Jun 08, 2006 by David S. Miller

[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>

parent 9dadaa19

include/linux/security.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

net/xfrm/xfrm_user.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;