summaryrefslogtreecommitdiffstats
path: root/net/xfrm
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2018-10-27 06:12:06 +0000
committerSteffen Klassert <steffen.klassert@secunet.com>2018-10-28 11:00:26 +0100
commit533555e5cbb6aa2d77598917871ae5b579fe724b (patch)
tree2abe71f64c428b5bfd3766899f625fdd344beab1 /net/xfrm
parent6788fac82001ed1944b5da976bcec4a7b9accf51 (diff)
downloadlinux-533555e5cbb6aa2d77598917871ae5b579fe724b.tar.gz
linux-533555e5cbb6aa2d77598917871ae5b579fe724b.tar.bz2
linux-533555e5cbb6aa2d77598917871ae5b579fe724b.zip
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: 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>
Diffstat (limited to 'net/xfrm')
-rw-r--r--net/xfrm/xfrm_output.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index 4ae87c5ce2e3..fef6b2da3c5d 100644
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -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;
}