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=-11.2 required=3.0 tests=BAYES_00,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 84F9FC43465 for ; Mon, 21 Sep 2020 16:35:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3E120206DC for ; Mon, 21 Sep 2020 16:35:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600706133; bh=s1CN8NiTuVeOtQkil4T0RiTnIYYFRLx0tWVRHZgcBQo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MerUGyNqHlrditKNRT2cfR4bRd+D30hdW9XQl78ZbpHIv7CXhDV2vDdTB5L5J8IxP 2J9wDvJ5OhGIvZLYUjFai733Fp9f+vmxBn0I6T71+3RERMWlL0q5O177cnu5TKPUru rrghbxxBWKTwWQfGQCl2lTVGhAifdk6iEmOJKZRk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728870AbgIUQfc (ORCPT ); Mon, 21 Sep 2020 12:35:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:34632 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728522AbgIUQf1 (ORCPT ); Mon, 21 Sep 2020 12:35:27 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 70A9423998; Mon, 21 Sep 2020 16:35:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600706126; bh=s1CN8NiTuVeOtQkil4T0RiTnIYYFRLx0tWVRHZgcBQo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QR67cTioSRmlxwPAKRUEMYWVdRiBK2Bmss/NbvpVf9WMVW/xjAKnMkmRiyWFdzX2s CAsh7qWfYF5C87+380VouEVE9kGV5ifaXfZ3WcO1gSQcxd8niu04FFoUde6OXJo/MO LmWcRTli9P78EH741sZ8u4NS0DdPH5BI1fZNsgek= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Miaohe Lin , "David S. Miller" Subject: [PATCH 4.9 48/70] net: handle the return value of pskb_carve_frag_list() correctly Date: Mon, 21 Sep 2020 18:27:48 +0200 Message-Id: <20200921162037.312330516@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200921162035.136047591@linuxfoundation.org> References: <20200921162035.136047591@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Miaohe Lin commit eabe861881a733fc84f286f4d5a1ffaddd4f526f upstream. pskb_carve_frag_list() may return -ENOMEM in pskb_carve_inside_nonlinear(). we should handle this correctly or we would get wrong sk_buff. Fixes: 6fa01ccd8830 ("skbuff: Add pskb_extract() helper function") Signed-off-by: Miaohe Lin Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/core/skbuff.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4990,9 +4990,13 @@ static int pskb_carve_inside_nonlinear(s if (skb_has_frag_list(skb)) skb_clone_fraglist(skb); - if (k == 0) { - /* split line is in frag list */ - pskb_carve_frag_list(skb, shinfo, off - pos, gfp_mask); + /* split line is in frag list */ + if (k == 0 && pskb_carve_frag_list(skb, shinfo, off - pos, gfp_mask)) { + /* skb_frag_unref() is not needed here as shinfo->nr_frags = 0. */ + if (skb_has_frag_list(skb)) + kfree_skb_list(skb_shinfo(skb)->frag_list); + kfree(data); + return -ENOMEM; } skb_release_data(skb);