Commit aef21785 authored Dec 13, 2007 by Herbert Xu Committed by David S. Miller Jan 28, 2008

[IPSEC]: Fix zero return value in xfrm_lookup on error

Further testing shows that my ICMP relookup patch can cause xfrm_lookup
to return zero on error which isn't very nice since it leads to the caller
dying on null pointer dereference. The bug is due to not setting err
to ENOENT just before we leave xfrm_lookup in case of no policy.

This patch moves the err setting to where it should be.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent cf86314c

net/xfrm/xfrm_policy.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1469,8 +1469,6 @@ restart:
		goto dropdst;
		}

		err = -ENOENT;

		if (!policy) {
		/* To accelerate a bit... */
		if ((dst_orig->flags & DST_NOXFRM) \|\|
		@@ -1492,6 +1490,7 @@ restart:
		npols ++;
		xfrm_nr += pols[0]->xfrm_nr;

		err = -ENOENT;
		if ((flags & XFRM_LOOKUP_ICMP) && !(policy->flags & XFRM_POLICY_ICMP))
		goto error;

		@@ -1657,6 +1656,7 @@ dropdst:
		return err;

		nopol:
		err = -ENOENT;
		if (flags & XFRM_LOOKUP_ICMP)
		goto dropdst;
		return 0;

Admin message