diff options
| author | Wei Yongjun <weiyongjun1@huawei.com> | 2018-10-27 06:12:06 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-13 10:00:57 +0100 |
| commit | bf2b044bc820cf1d6fa74ff77b09c33886a01568 (patch) | |
| tree | c8fd2682ed02058f979132aee62a71ab9af96a55 /net/xfrm | |
| parent | 7932e14f9fec2dca602b6e213445eb9bc5c6c4c6 (diff) | |
| download | linux-stable-bf2b044bc820cf1d6fa74ff77b09c33886a01568.tar.gz linux-stable-bf2b044bc820cf1d6fa74ff77b09c33886a01568.tar.bz2 linux-stable-bf2b044bc820cf1d6fa74ff77b09c33886a01568.zip | |
xfrm: Fix error return code in xfrm_output_one()
[ Upstream commit 533555e5cbb6aa2d77598917871ae5b579fe724b ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/xfrm')
| -rw-r--r-- | net/xfrm/xfrm_output.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c index c47660fba498..b226b230e8bf 100644 --- a/net/xfrm/xfrm_output.c +++ b/net/xfrm/xfrm_output.c @@ -103,6 +103,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; } |