summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorVegard Nossum <vegard.nossum@oracle.com>2016-07-27 08:03:18 +0200
committerSteffen Klassert <steffen.klassert@secunet.com>2016-07-27 13:07:46 +0200
commit73efc3245fd3edb3632d82a3a9c5d5d975a02efc (patch)
treeec00302b933d8acb1f5b96317e9d75a6f593060f /net
parent1ba5bf993c6a3142e18e68ea6452b347f9cb5635 (diff)
downloadlinux-73efc3245fd3edb3632d82a3a9c5d5d975a02efc.tar.gz
linux-73efc3245fd3edb3632d82a3a9c5d5d975a02efc.tar.bz2
linux-73efc3245fd3edb3632d82a3a9c5d5d975a02efc.zip
xfrm: get rid of incorrect WARN
AFAICT this message is just printed whenever input validation fails. This is a normal failure and we shouldn't be dumping the stack over it. Looks like it was originally a printk that was maybe incorrectly upgraded to a WARN: commit 62db5cfd70b1ef53aa21f144a806fe3b78c84fab Author: stephen hemminger <shemminger@vyatta.com> Date: Wed May 12 06:37:06 2010 +0000 xfrm: add severity to printk Cc: Stephen Hemminger <stephen@networkplumber.org> Cc: Steffen Klassert <steffen.klassert@secunet.com> Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net')
-rw-r--r--net/xfrm/xfrm_user.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 4fb04ced5867..1a4f142dd50a 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -2117,7 +2117,7 @@ static int xfrm_add_acquire(struct sk_buff *skb, struct nlmsghdr *nlh,
err = verify_newpolicy_info(&ua->policy);
if (err)
- goto bad_policy;
+ goto free_state;
/* build an XP */
xp = xfrm_policy_construct(net, &ua->policy, attrs, &err);
@@ -2149,8 +2149,6 @@ static int xfrm_add_acquire(struct sk_buff *skb, struct nlmsghdr *nlh,
return 0;
-bad_policy:
- WARN(1, "BAD policy passed\n");
free_state:
kfree(x);
nomem: