From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF276C2BB1D for ; Tue, 7 Apr 2020 10:27:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C6AE22078A for ; Tue, 7 Apr 2020 10:27:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586255222; bh=863H0lNEbWwXgJwKX0fahP5LlX1HDAvX7TR8emyqTo4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qxvHofFS//eMxDJTArBqm4lySLXwPurJc7pecClW2SYVdQKwHZ803YSYr+qUNQD88 LdBh84FR+ZNRjdCZKu8mLovatZYcet1o4Isdwmrf7yqKF9tYyPZ91a6pLDm5F50nFC zIEivvjsDa8Og/wWkFI1E2jpFZyEEWEq0LaIVagY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729257AbgDGK1A (ORCPT ); Tue, 7 Apr 2020 06:27:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:39172 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729258AbgDGK0z (ORCPT ); Tue, 7 Apr 2020 06:26:55 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 887B220644; Tue, 7 Apr 2020 10:26:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586255215; bh=863H0lNEbWwXgJwKX0fahP5LlX1HDAvX7TR8emyqTo4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FuqlILqtd1XA0PV9wCPuLUwt07y+7AGnlqExfwu1ROb22F2F0ULbne0/EQSiZDUoJ smZSwGD0FzqoTVZOeX+PV4KU9/TDdZNtlGjBoE66JAOloEcQyhg2rAWL1zskDTHyij nZeUivWX68TwtzbkzDhYQaPxaXyIiqQ5GPl4iU8I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Steffen Klassert , Xiumei Mu , Xin Long , Florian Westphal , "David S. Miller" Subject: [PATCH 5.6 07/29] net: fix fraglist segmentation reference count leak Date: Tue, 7 Apr 2020 12:22:04 +0200 Message-Id: <20200407101452.878711199@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200407101452.046058399@linuxfoundation.org> References: <20200407101452.046058399@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Florian Westphal [ Upstream commit cf673ed0e057a2dd68d930c6d7e30d53c70c5789 ] Xin Long says: On udp rx path udp_rcv_segment() may do segment where the frag skbs will get the header copied from the head skb in skb_segment_list() by calling __copy_skb_header(), which could overwrite the frag skbs' extensions by __skb_ext_copy() and cause a leak. This issue was found after loading esp_offload where a sec path ext is set in the skb. Fix this by discarding head state of the fraglist skb before replacing its contents. Fixes: 3a1296a38d0cf62 ("net: Support GRO/GSO fraglist chaining.") Cc: Steffen Klassert Reported-by: Xiumei Mu Tested-by: Xin Long Signed-off-by: Florian Westphal Acked-by: Steffen Klassert Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/core/skbuff.c | 1 + 1 file changed, 1 insertion(+) --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -3668,6 +3668,7 @@ struct sk_buff *skb_segment_list(struct skb_push(nskb, -skb_network_offset(nskb) + offset); + skb_release_head_state(nskb); __copy_skb_header(nskb, skb); skb_headers_offset_update(nskb, skb_headroom(nskb) - skb_headroom(skb));