From patchwork Thu Oct 13 17:52:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 2190 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp409507wrs; Thu, 13 Oct 2022 11:04:56 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5YOZOWtGdQAluhsEQatIMciPDnNfvi5IvTeJ0rQH3swhjQPMNjdVbg/YY/W5yOk5jZ4XMC X-Received: by 2002:a17:902:8542:b0:179:eb8d:f41d with SMTP id d2-20020a170902854200b00179eb8df41dmr896401plo.62.1665684296032; Thu, 13 Oct 2022 11:04:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665684296; cv=none; d=google.com; s=arc-20160816; b=AI2hMQZaOdW5jDWQdoACXuYiocJGza7GJwTVpBlxukTbYx5vhuo5CyvvsB6GSNvEw0 OcC45aaQZ74ytFU78e0dOfd25IWM0BKXaKKFmLKmpiFr2WWVaCQ3whoIPdnSS4Y5BDpx dAbOlDplBP/04CS0lSjSRS6NZ+XqDObxMvLbEQwfR0p6B4VKG2Rhy1Sdk5BVgcPpWLfY pVEn9P78P10Us8j3APYfPfn3YhB5zTTnMZf6zOxCl8xOnydKxW3rziE4T4p9YRf/QABy uuuJgbPYBuYGZ2CyProTLMar4Ocbdbz9vAoOq5AKvuuE/tcCTAi6wNlFAW4/BA1fYmYt 1rfg== 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=t69iP3hjaEXm17ZYj9LjReHrA+h9I00WJJjN4zDwJ4Y=; b=enf+x3IOmsIggv0dapyW5oQO6GbiNCDcPyhVEd7+j7SG/HO9dyhBqBFeMM3tunhmnr lVGLbrmT2DwKkea6RB7AS41HoodIwp029G5FbvVTpmH5GZ/Tck4Tw+u8L0PPY/DQokPa Aqs/jVbpyf3BI9SBf0EPdHoOghxf0x7zYXvSJtUBXONso3TscS2nklLFumlblVMYy3bb dLnmM20sK2QLkmOXj6hitZw3BuS1zjStldJUVwupX3RJWEGnZBFXz2+KC/5B3ORBf+C6 jemPo/gBaKIAYczjf5/g6Pd2StU3FMmIwXoTmFerbR7snX6WrQjHWBbGSjLwBEThYkfn /Cjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Df9A2ro4; 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 q24-20020a635c18000000b0043945685064si96347pgb.26.2022.10.13.11.04.43; Thu, 13 Oct 2022 11:04:56 -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=Df9A2ro4; 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 S230506AbiJMSDQ (ORCPT + 99 others); Thu, 13 Oct 2022 14:03:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230417AbiJMSCr (ORCPT ); Thu, 13 Oct 2022 14:02:47 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AB4716F428; Thu, 13 Oct 2022 11:02:31 -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 E902D6190F; Thu, 13 Oct 2022 17:55:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E4E75C433C1; Thu, 13 Oct 2022 17:55:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665683718; bh=O05FW3w/LggRXO4vo3CZH9qAGGAoImGTQJbu+UYiAMQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Df9A2ro4mjvHXfyXncteogJZ1KoDIfpGWc0buQ4RAMX2STuTxX5PFgqFUTOO/dFmS qhyEJuKNdSi+PHPo2zSL53LLVrvMsKBLWjQ87sSxbOAF4YeMyGgTiQaaVS8B1oPFdw GFlC02FjoQn1GCrqeXB3EUPheQK74gOqFQhgJtbk= 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.10 26/54] net: atlantic: fix potential memory leak in aq_ndev_close() Date: Thu, 13 Oct 2022 19:52:20 +0200 Message-Id: <20221013175147.992299917@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221013175147.337501757@linuxfoundation.org> References: <20221013175147.337501757@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 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?1746596576552985743?= X-GMAIL-MSGID: =?utf-8?q?1746596576552985743?= From: Jianglei Nie [ Upstream commit 65e5d27df61283e5390f04b09dc79cd832f95607 ] If aq_nic_stop() fails, aq_ndev_close() returns err without calling aq_nic_deinit() to release the relevant memory and resource, which will lead to a memory leak. We can fix it by deleting the if condition judgment and goto statement to call aq_nic_deinit() directly after aq_nic_stop() to fix the memory leak. Signed-off-by: Jianglei Nie Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/aquantia/atlantic/aq_main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_main.c b/drivers/net/ethernet/aquantia/atlantic/aq_main.c index 4af0cd9530de..ff245f75fa3d 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_main.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_main.c @@ -89,11 +89,8 @@ static int aq_ndev_close(struct net_device *ndev) int err = 0; err = aq_nic_stop(aq_nic); - if (err < 0) - goto err_exit; aq_nic_deinit(aq_nic, true); -err_exit: return err; }