xfrm: get rid of another incorrect WARN
authorVegard Nossum <vegard.nossum@oracle.com>
Wed, 27 Jul 2016 06:44:15 +0000 (08:44 +0200)
committerSteffen Klassert <steffen.klassert@secunet.com>
Wed, 27 Jul 2016 11:09:00 +0000 (13:09 +0200)
During fuzzing I regularly run into this WARN(). According to Herbert Xu,
this "certainly shouldn't be a WARN, it probably shouldn't print anything
either".

Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
net/xfrm/xfrm_user.c

index 1a4f142dd50aeed9eee96b3006708be2dcf5d533..cb65d916a345d1e45547cd81c0d86b2068c58bce 100644 (file)
@@ -2051,9 +2051,6 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh,
        if (up->hard) {
                xfrm_policy_delete(xp, p->dir);
                xfrm_audit_policy_delete(xp, 1, true);
-       } else {
-               // reset the timers here?
-               WARN(1, "Don't know what to do with soft policy expire\n");
        }
        km_policy_expired(xp, p->dir, up->hard, nlh->nlmsg_pid);