From patchwork Mon Oct 24 11:29:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9349 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp467057wru; Mon, 24 Oct 2022 06:56:35 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5uyvTgJsPbaCsxMI1DSM4d1AiDx8QmlOmiY2NjCRoYsLi4Shc9GFY+AIdOednncxlh572K X-Received: by 2002:a17:90a:1197:b0:212:cfa7:8388 with SMTP id e23-20020a17090a119700b00212cfa78388mr20004861pja.4.1666619795263; Mon, 24 Oct 2022 06:56:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666619795; cv=none; d=google.com; s=arc-20160816; b=o86gYK0fq2atBJ/h5yzZNWa9u4+rby3jKDcX3yCfJV7mQwU8m1zIbGgW8J+qCq2Gy+ aSwO99KgjlN5ffyu7ZeKrvE6SLL5KLPVMXoPm7RKzi+oreuYGaHPO10JZRDT0AOekRx8 pL8r6RlX41pvMM+ASck6sgIb9lZKmZiwv6pw3TvUseAYqVggeGtBPIkDl8LPgbkocBB6 Aa9LMYk1u/zlGT3U6wiDm4boVq2mgPXKcR3QmD4g5MJyVi9jFkbD6J0qFY61LnWk4P5i x1MhkHFfhVCSeBS1POnfyCMSKLHnSnnGU+l553+zHLBVDdF/l9esuI1UlzM6000ifuzp isew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fw8iFZPatKPxg2sFnKktRfdQpQkSO8PILpvSCERDDM0=; b=AntO/bgGFXIhHkHgL1pLFPrBU1YuRrpnXjE+HF7zoZf+Wqr4fa8wImQNSNJ6q/cGsV 8qu1gfFlww1Cz3Q68EhK2t5ETpAdQ195P/wJ12cioH9jgOjgK20MDUgbHv2rI8nYof4d e/pXXI/uYXtnsUFb6OwQ/Nl3ATP9GnukKNjIF9fbXFV5iV5fUq1zYW2SNf1OjcPCoPAH btk/tmQzcIAhgxJIgTfDbbwjzxpoJDF1npkbl8c9Ura0OJ5ZbVXJD1vuFA063KH7U76i AtztWTte7Yus+jISRACWXTomZnyqqmJemXHoJXV2f4WQ8jEP/V+mJsPCNtv2jx0nAn+5 ngqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="fCF/EhKv"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m3-20020a056a00080300b00535d7265923si38730944pfk.377.2022.10.24.06.56.21; Mon, 24 Oct 2022 06:56:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="fCF/EhKv"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236781AbiJXN4D (ORCPT + 99 others); Mon, 24 Oct 2022 09:56:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236769AbiJXNyE (ORCPT ); Mon, 24 Oct 2022 09:54:04 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 803B4BCBA2; Mon, 24 Oct 2022 05:43:42 -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 C6F9661252; Mon, 24 Oct 2022 12:43:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE16BC433C1; Mon, 24 Oct 2022 12:43:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615395; bh=FDJj57zct8g34Bx1kgQb5O2g5HvH0eUpe2PeLXP760g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fCF/EhKv1tA56lw9pQCnIEbqTCLWvL7DOD3DZ6lZlI/8KlPEmtHu2ZSTOytJkcpX/ 3ddcd1IjS9TCmHIleLBD+IoAeOkI8sabjWYzLq7Mn14uZulruZwkE0URhYEF919HyV jWi74y8T4s0rv9hVzZrS5Ywrhy7bm+MPbOxTttVc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jianglei Nie , "David S. Miller" , Sasha Levin Subject: [PATCH 5.15 203/530] bnx2x: fix potential memory leak in bnx2x_tpa_stop() Date: Mon, 24 Oct 2022 13:29:07 +0200 Message-Id: <20221024113054.252297412@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747577518481051569?= X-GMAIL-MSGID: =?utf-8?q?1747577518481051569?= From: Jianglei Nie [ Upstream commit b43f9acbb8942b05252be83ac25a81cec70cc192 ] bnx2x_tpa_stop() allocates a memory chunk from new_data with bnx2x_frag_alloc(). The new_data should be freed when gets some error. But when "pad + len > fp->rx_buf_size" is true, bnx2x_tpa_stop() returns without releasing the new_data, which will lead to a memory leak. We should free the new_data with bnx2x_frag_free() when "pad + len > fp->rx_buf_size" is true. Fixes: 07b0f00964def8af9321cfd6c4a7e84f6362f728 ("bnx2x: fix possible panic under memory stress") Signed-off-by: Jianglei Nie Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index 198e041d8410..4f669e7c7558 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c @@ -788,6 +788,7 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp, BNX2X_ERR("skb_put is about to fail... pad %d len %d rx_buf_size %d\n", pad, len, fp->rx_buf_size); bnx2x_panic(); + bnx2x_frag_free(fp, new_data); return; } #endif