xfrm: Fix error return code in xfrm_output_one()
authorWei Yongjun <weiyongjun1@huawei.com>
Sat, 27 Oct 2018 06:12:06 +0000 (06:12 +0000)
committerSteffen Klassert <steffen.klassert@secunet.com>
Sun, 28 Oct 2018 10:00:26 +0000 (11:00 +0100)
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: 9e1437937807 ("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>
net/xfrm/xfrm_output.c

index 4ae87c5..fef6b2d 100644 (file)
@@ -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;
                }