leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[NET]: Fix warnings after LSM-IPSEC changes.

Browse Source 
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>
This commit is contained in:
David S. Miller 2006-06-08 23:58:52 -07:00
parent 9dadaa19cb
commit 6f68dc3775
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/security.h
View File

@ -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; return 0;
} }

4
net/xfrm/xfrm_user.c
View File

@ -427,7 +427,7 @@ static int xfrm_del_sa(struct sk_buff *skb, struct nlmsghdr *nlh, void **xfrma)
if (x == NULL) if (x == NULL)
return -ESRCH; return -ESRCH;
if (err = security_xfrm_state_delete(x)) if ((err = security_xfrm_state_delete(x)) != 0)
goto out; goto out;
if (xfrm_state_kern(x)) { 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); MSG_DONTWAIT);
} }
} else { } else {
if (err = security_xfrm_policy_delete(xp)) if ((err = security_xfrm_policy_delete(xp)) != 0)
goto out; goto out;
c.data.byid = p->index; c.data.byid = p->index;
c.event = nlh->nlmsg_type; c.event = nlh->nlmsg_type;