From patchwork Mon Sep 21 16:30:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 309378 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=unavailable 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 1211BC43466 for ; Mon, 21 Sep 2020 16:52:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BA12220874 for ; Mon, 21 Sep 2020 16:52:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600707175; bh=ro2qPl3JyNEcXWbAMsGi15K3G8uSvms1vnNQP3Kc3co=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=q4csxL+/GVZapsUyBUcKy2FdFjpQGET4yGEW6jNfME9kRX0ruMXNQ1j9YampQHgQi O3LI52TqKCM63ophHSlgg+LO3Fm+C9NAfTsaU9rN63Vfl8cwPnyDJ6OWErDb8Q/OHv c3S1marna4CpWoix3FrEB+COWgBvKe7hFH03m8Xg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728384AbgIUQst (ORCPT ); Mon, 21 Sep 2020 12:48:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:55844 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728015AbgIUQsX (ORCPT ); Mon, 21 Sep 2020 12:48:23 -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 64C36238D7; Mon, 21 Sep 2020 16:48:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600706903; bh=ro2qPl3JyNEcXWbAMsGi15K3G8uSvms1vnNQP3Kc3co=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1S3beF0wZsima6UhhbwiyH2Y/Kjm5/nZflBRPeZODaEfKjZeDGrV1oD60xpwje+8l /FFUaOzxTAdSwxB1Vj47vPUh6erZcz1XpjCryeDCsvSyvKuzvyK7ZDXPNllkcVlL1u McvoimRhMvPRP0iUVNjgoJUw2F1ketNdxAqJvv98= 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 5.4 05/72] net: handle the return value of pskb_carve_frag_list() correctly Date: Mon, 21 Sep 2020 18:30:44 +0200 Message-Id: <20200921163122.137196350@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200921163121.870386357@linuxfoundation.org> References: <20200921163121.870386357@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@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 @@ -5882,9 +5882,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);