netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: hujunwei <hujunwei4@huawei.com>
To: <davem@davemloft.net>, <kuznet@ms2.inr.ac.ru>,
	<yoshfuji@linux-ipv6.org>, <netdev@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>
Cc: <mingfangsen@huawei.com>, <liuzhiqiang26@huawei.com>,
	<zhangwenhao8@huawei.com>
Subject: [PATCH net] ipv6: Fix dangling pointer when ipv6 fragment
Date: Sat, 30 Mar 2019 15:29:32 +0800	[thread overview]
Message-ID: <cbbedd1f-3e99-85f7-86d7-d02a86d59c29@huawei.com> (raw)

From: Junwei Hu <hujunwei4@huawei.com>

At the beginning of ip6_fragment func, the prevhdr pointer is
obtained in the ip6_find_1stfragopt func.
However, all the pointers pointing into skb header may change
when calling skb_checksum_help func with
skb->ip_summed = CHECKSUM_PARTIAL condition.
The prevhdr pointe will be dangling if it is not reloaded after
calling __skb_linearize func in skb_checksum_help func.

Here, I add a variable, nexthdr_offset, to evaluate the offset,
which does not changes even after calling __skb_linearize func.

Fixes: 405c92f7a541 ("ipv6: add defensive check for CHECKSUM_PARTIAL skbs in ip_fragment")
Signed-off-by: Junwei Hu <hujunwei4@huawei.com>
Reported-by: Wenhao Zhang <zhangwenhao8@huawei.com>
Reviewed-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>

---
 net/ipv6/ip6_output.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index edbd12067170..6db3c60b3b66 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -606,12 +606,14 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,
     __be32 frag_id;
     int ptr, offset = 0, err = 0;
     u8 *prevhdr, nexthdr = 0;
+    u8 nexthdr_offset;
 
     err = ip6_find_1stfragopt(skb, &prevhdr);
     if (err < 0)
         goto fail;
     hlen = err;
     nexthdr = *prevhdr;
+    nexthdr_offset = prevhdr - skb_network_header(skb);
 
     mtu = ip6_skb_dst_mtu(skb);
 
@@ -646,6 +648,8 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,
         (err = skb_checksum_help(skb)))
         goto fail;
 
+    prevhdr = skb_network_header(skb) + nexthdr_offset;
+
     hroom = LL_RESERVED_SPACE(rt->dst.dev);
     if (skb_has_frag_list(skb)) {
         unsigned int first_len = skb_pagelen(skb);
-- 
2.19.1



             reply	other threads:[~2019-03-30  7:30 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-30  7:29 hujunwei [this message]
2019-03-30  7:48 ` [PATCH net] ipv6: Fix dangling pointer when ipv6 fragment Eric Dumazet
2019-03-30  7:57   ` Eric Dumazet
2019-03-30 12:37     ` hujunwei
2019-03-31  9:04 ` [PATCH v2 " hujunwei
2019-04-01 16:34   ` Martin Lau
2019-04-02  1:12   ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cbbedd1f-3e99-85f7-86d7-d02a86d59c29@huawei.com \
    --to=hujunwei4@huawei.com \
    --cc=davem@davemloft.net \
    --cc=kuznet@ms2.inr.ac.ru \
    --cc=linux-kernel@vger.kernel.org \
    --cc=liuzhiqiang26@huawei.com \
    --cc=mingfangsen@huawei.com \
    --cc=netdev@vger.kernel.org \
    --cc=yoshfuji@linux-ipv6.org \
    --cc=zhangwenhao8@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).