Commit 533555e5 authored Oct 27, 2018 by Wei Yongjun Committed by Steffen Klassert Oct 28, 2018

xfrm: Fix error return code in xfrm_output_one()



xfrm_output_one() does not return a error code when there is
no dst_entry attached to the skb, it is still possible crash
with a NULL pointer dereference in xfrm_output_resume(). Fix
it by return error code -EHOSTUNREACH.

Fixes: 9e143793 ("xfrm: Fix NULL pointer dereference when skb_dst_force clears the dst_entry.")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

parent 6788fac8

net/xfrm/xfrm_output.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,7 @@ static int xfrm_output_one(struct sk_buff *skb, int err)
		skb_dst_force(skb);
		if (!skb_dst(skb)) {
		XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTERROR);
		err = -EHOSTUNREACH;
		goto error_nolock;
		}

Admin message