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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, 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 D8E01C433E3 for ; Mon, 17 Aug 2020 19:21:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BE1FA20658 for ; Mon, 17 Aug 2020 19:21:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597692083; bh=2boSfK9bHD5PLFVLB3Ss/OblrzeBZ8rKAEyrZ1ImRb0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pgZ4Ktr5R1nkatnu7DDMNO+xG6MhYkDUfZXQFpLjhXUZheZR2UCL/+n6741rW+Cz5 lXG8TFIN8GAjIWtiXMZk/eqHZn9XVL8kCHVNkZi73Yb1MS71fl21Fl3gBdlhhP0gKv ynrgBD7/lkEvI7FwOUekggqiF0Mjs72FvvW+uk7k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389214AbgHQTVT (ORCPT ); Mon, 17 Aug 2020 15:21:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:42868 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730499AbgHQPg0 (ORCPT ); Mon, 17 Aug 2020 11:36:26 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 E584620789; Mon, 17 Aug 2020 15:36:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597678586; bh=2boSfK9bHD5PLFVLB3Ss/OblrzeBZ8rKAEyrZ1ImRb0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Elyeb9gD3DhPGD7oDdQeV3RptEOpwuw/c+tgJGTKc15nB8yQxgyg6IGHQkFAQiEZL AWO0RsTTCBAZwIQyNT2W+9scvoCkJ8lGtyBjmucq0JbVW/5l+MEYr2rMl83bigOp+k TmOy06DbWlewc2pZWr/xEt+dR9fzXvNNMDsMKc/8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lorenzo Bianconi , Matteo Croce , "David S. Miller" , Sasha Levin Subject: [PATCH 5.8 355/464] net: mvpp2: fix memory leak in mvpp2_rx Date: Mon, 17 Aug 2020 17:15:08 +0200 Message-Id: <20200817143850.771658088@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143833.737102804@linuxfoundation.org> References: <20200817143833.737102804@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lorenzo Bianconi [ Upstream commit d6526926de7397a97308780911565e31a6b67b59 ] Release skb memory in mvpp2_rx() if mvpp2_rx_refill routine fails Fixes: b5015854674b ("net: mvpp2: fix refilling BM pools in RX path") Signed-off-by: Lorenzo Bianconi Acked-by: Matteo Croce Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index 24f4d8e0da989..ee72397813d41 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -2981,6 +2981,7 @@ static int mvpp2_rx(struct mvpp2_port *port, struct napi_struct *napi, err = mvpp2_rx_refill(port, bm_pool, pool); if (err) { netdev_err(port->dev, "failed to refill BM pools\n"); + dev_kfree_skb_any(skb); goto err_drop_frame; } -- 2.25.1