| Message ID | 1540620726-100678-1-git-send-email-weiyongjun1@huawei.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | xfrm: Fix error return code in xfrm_output_one() | expand |
On Sat, Oct 27, 2018 at 06:12:06AM +0000, Wei Yongjun wrote: > 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> Applied, thanks a lot!
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c index 4ae87c5c..fef6b2d 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; }
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> --- net/xfrm/xfrm_output.c | 1 + 1 file changed, 1 insertion(+)