From patchwork Sun Mar 31 09:04:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: hujunwei X-Patchwork-Id: 1071516 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=huawei.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44X8hN6LrQz9sRW for ; Sun, 31 Mar 2019 20:05:40 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726873AbfCaJFb (ORCPT ); Sun, 31 Mar 2019 05:05:31 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:59738 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726710AbfCaJFa (ORCPT ); Sun, 31 Mar 2019 05:05:30 -0400 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 556E12B0468991598D8D; Sun, 31 Mar 2019 17:05:28 +0800 (CST) Received: from [127.0.0.1] (10.184.191.73) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.408.0; Sun, 31 Mar 2019 17:05:19 +0800 Subject: [PATCH v2 net] ipv6: Fix dangling pointer when ipv6 fragment From: hujunwei To: , , , , CC: , , , References: Message-ID: <9104f44b-2ce0-7be9-2fca-8b6c12abbb86@huawei.com> Date: Sun, 31 Mar 2019 17:04:29 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Originating-IP: [10.184.191.73] X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Junwei Hu 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 Reported-by: Wenhao Zhang Reported-by: syzbot+e8ce541d095e486074fc@syzkaller.appspotmail.com Reviewed-by: Zhiqiang Liu Acked-by: Martin KaFai Lau --- V1->V2: - change nexthdr_offset to unsigned int - add Reported-by: syzbot+e8ce541d095e486074fc@syzkaller.appspotmail.com  net/ipv6/ip6_output.c | 4 +++-  1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index edbd12067170..e51f3c648b09 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -601,7 +601,7 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,                  inet6_sk(skb->sk) : NULL;      struct ipv6hdr *tmp_hdr;      struct frag_hdr *fh; -    unsigned int mtu, hlen, left, len; +    unsigned int mtu, hlen, left, len, nexthdr_offset;      int hroom, troom;      __be32 frag_id;      int ptr, offset = 0, err = 0; @@ -612,6 +612,7 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,          goto fail;      hlen = err;      nexthdr = *prevhdr; +    nexthdr_offset = prevhdr - skb_network_header(skb);        mtu = ip6_skb_dst_mtu(skb);   @@ -646,6 +647,7 @@ 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);