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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C03D9C65C0D for ; Tue, 30 Aug 2022 17:27:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231675AbiH3R07 (ORCPT ); Tue, 30 Aug 2022 13:26:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231620AbiH3R03 (ORCPT ); Tue, 30 Aug 2022 13:26:29 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC9E111C14D; Tue, 30 Aug 2022 10:24:26 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 002DB617A0; Tue, 30 Aug 2022 17:22:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 122A3C43140; Tue, 30 Aug 2022 17:22:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1661880168; bh=NltYM8yBpipvmbgQ7bMkNGD+BO0E+n1bKzDEVzlfdvw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uI6eZr9pB+Y2UreJ8DpnGGKitMKN0a9DDD4QSDA6TSM2Ph4c26zbuN4bSdIfFig2m WtEwyaoRNDUEj3AFLJqHlbkZz6RHXJKJ19CuwtUNIUXDmsZCIoOkyBUr67qCNKmeOl YpgESmLFFC5DZH7cBDCmDtYwNzjbtR+YMEhgQmbesg/9NiaK9Xyozgv1fJMnCbS4FF KiB/H0+u3F2+ZLKX5BXFEo08grki7SIbMaVaqEFt8arUY2CTd2KmgDFIgmDv44Ey6t IrUSp1fRrgzS/a1nhNQDgVg56cATrGhh4jtlDlKsAD2ZBxPzPIuGoohG2KjDdIjT// tIrwmb06lDDIg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: lily , "David S . Miller" , Sasha Levin , edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, asml.silence@gmail.com, imagedong@tencent.com, luiz.von.dentz@intel.com, vasily.averin@linux.dev, jk@codeconstruct.com.au, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 18/23] net/core/skbuff: Check the return value of skb_copy_bits() Date: Tue, 30 Aug 2022 13:21:35 -0400 Message-Id: <20220830172141.581086-18-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220830172141.581086-1-sashal@kernel.org> References: <20220830172141.581086-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: lily [ Upstream commit c624c58e08b15105662b9ab9be23d14a6b945a49 ] skb_copy_bits() could fail, which requires a check on the return value. Signed-off-by: Li Zhong Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/core/skbuff.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 5ebef94e14dc6..161406cd991ae 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4188,9 +4188,8 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb, SKB_GSO_CB(nskb)->csum_start = skb_headroom(nskb) + doffset; } else { - skb_copy_bits(head_skb, offset, - skb_put(nskb, len), - len); + if (skb_copy_bits(head_skb, offset, skb_put(nskb, len), len)) + goto err; } continue; } -- 2.35.1