From patchwork Mon Oct 24 11:30:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8831 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp431415wru; Mon, 24 Oct 2022 05:43:42 -0700 (PDT) X-Google-Smtp-Source: AMsMyM65jZcv7oiUd35kypSn9GKgCjIcZahiZWZLdzMI9oFhzJTFJR/zX/BqGFFXDrdwrR/lkaxF X-Received: by 2002:a17:90a:e7d0:b0:20c:169f:7503 with SMTP id kb16-20020a17090ae7d000b0020c169f7503mr73298963pjb.175.1666615421788; Mon, 24 Oct 2022 05:43:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666615421; cv=none; d=google.com; s=arc-20160816; b=tsVCon/K/uRDI3GHguonTQgT2bWtCtCMdF8sGzbNP48poUp7b1xukMwZfamtX73I3C HvEsx6NKgrQLAOse6xXGcWsEZrqbFaEyGCxPYbPRXejgjNsCgGhk7+PHmpQtiZyoCdQi k90Mp6rK5gW2qEGthqYza0lvp9EatIUgW84ojd0MxFCQRzWm0g53Mkn5UL9Lhr/2v6+7 7208d9k7w6SNdE9kSAEyXPj0JgXhmK1XgVOLOcCDH2/m8ZLeKppnerIs4FIcB6iETDFr xGHD3XyhyW7vWNfXezcIQaMV9yA/sR50Ygkc1pKbcViLfbKU/p5MO1/N6Ge0j80W+vTf sY1w== 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=uvz2uGnkhI/XA/+rL47HaVnw6hiLofWrRrRrAXjdOD0=; b=VEkM+WTxsLNnT4EQ+RhDaLvHlv7NWkx+KGkXeH2XjtoHGH0Icak4npRNjSdfgnWm16 n0lriQOek2MCg3UH0B5F6Iq8p6Kxioe+k6N44yUTCIfqNpS8TizSvpguzYeZs4QXtHOc SEVkaRTIB16KJ26fkpAN+VRafQn2GDqmIuKHRHffetxvxCyOo38ydCxDE/Gs5DEkhroi e7guL+fj1BmAwcIdZnNUyJRDKK7eUwCgAE19SdGkZzA/yUzjcOn0wehVCrpDfd0JB4YA XpUCmNRlFizpk8uDsjpLu9dFSTpGnijvKRIGZXWqzjk+x95MElbN39EQ0nNyhkk0lfdF SsMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=dMA79c2t; 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 oc1-20020a17090b1c0100b0020ad6d218cdsi11256690pjb.3.2022.10.24.05.43.27; Mon, 24 Oct 2022 05:43:41 -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=dMA79c2t; 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 S234423AbiJXMfC (ORCPT + 99 others); Mon, 24 Oct 2022 08:35:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234231AbiJXM3l (ORCPT ); Mon, 24 Oct 2022 08:29:41 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96FC023BEC; Mon, 24 Oct 2022 05:03:56 -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 ams.source.kernel.org (Postfix) with ESMTPS id 8FEBDB811A3; Mon, 24 Oct 2022 11:49:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EBB4AC433D6; Mon, 24 Oct 2022 11:49:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612176; bh=IT+ZuMJ69P+nAjLoBJUvmEOjP20rG6UnYzu9ZDnddCQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dMA79c2tYlg2QaDwQm9Pi+Vmwsf8UOaKZoYsNfkDqopQKBNeeHWPTXgb7fry00Yft trAbNCBZBmwlTkio3aO4faqnAvArWa1BCExzUEwSMB3l1K3GXtf5IqYlnsNe1TZdz+ z1SpOrln1S+gCYJlfBHhXknVOymbm0io2zLQlAUM= 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 4.14 097/210] bnx2x: fix potential memory leak in bnx2x_tpa_stop() Date: Mon, 24 Oct 2022 13:30:14 +0200 Message-Id: <20221024113000.171390852@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@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?1747572932683567299?= X-GMAIL-MSGID: =?utf-8?q?1747572932683567299?= 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 8c111def8185..96478d79243d 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c @@ -787,6 +787,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