Received: by 2002:a05:6358:16cd:b0:dc:6189:e246 with SMTP id r13csp2094493rwl; Sat, 5 Nov 2022 01:51:08 -0700 (PDT) X-Google-Smtp-Source: AMsMyM419oBvtnqI9RRvxxRSlJaO+w8vgkT7qStGsrwenXykWe93xloMHGpS9S/RQ127t7cJIFRq X-Received: by 2002:a63:db42:0:b0:45c:9c73:d72e with SMTP id x2-20020a63db42000000b0045c9c73d72emr32883846pgi.181.1667638268732; Sat, 05 Nov 2022 01:51:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667638268; cv=none; d=google.com; s=arc-20160816; b=Yk9VZlFdCeLUsMul3T+Q6zTtyfS2K7uBnXmfN3SFsuZds9zau9+/OU52OIx01JEQfk w9zO+cMxWdsDhjS4fHY8ugmwBSrwagiwCqfVEyA94yDlHSxYwLjVdu5I69Ej34FvDkq9 H2v6OYTH8jJHhzVnpFlZ1GVLQyr3GQqC58BK28aPgmYHUt5Pb0wbnK4QJCbwvAJo6yV9 yXnSgmJSE4DphsvRRKumOwgctrnte2hHJ7fd6Thq2IMzux0SjeFMWjMH/kuQh8INDrU9 slgXESC+UAPcgaE6sd39SZwoNbTJpI1VR0F4jyYSZ+7r7UCgCOXXXwF8gYnyRCZUNR8x eTGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=oGSFkFvn8ZLMrp30TjLADT3UuO+XxbuSw1VunQV85/A=; b=u7z+afbpaMy5A5I2gLTamoZ5a1QUijzLNDiQSFsX5Vqe3GDMa8udg5FrnJyuHgj8/b xDHBq0s5zdxOD1ABJXwFQV/mAmjnwmlxlYn+riSu+WSC1xguEXttjJ+LPgRdvQQZKs/5 sH0lCnTtzkL7I8v+DndpyfVtmoswY3V9J80DILiRYZAmhWWWFsnBGso/Nczcu3ypWXUJ MaISS49jsy0XW0q+n/0BAWQkOxYBE7TMafnFLPnhDPw21TW/efi4+odllvD7wHFdeEcc RjLRSDbuxatXcSkmaIT1voFdngi2Lwa0LXmLcJHh7brMnc4SXgNU+hM23Se4f8dZUvOg dPAA== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id on17-20020a17090b1d1100b00205da45d8a5si8052353pjb.124.2022.11.05.01.50.56; Sat, 05 Nov 2022 01:51:08 -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; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229536AbiKEIHw (ORCPT + 97 others); Sat, 5 Nov 2022 04:07:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229560AbiKEIHq (ORCPT ); Sat, 5 Nov 2022 04:07:46 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8FEA2B197; Sat, 5 Nov 2022 01:07:44 -0700 (PDT) Received: from canpemm500007.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N494Q5mpgzpWBQ; Sat, 5 Nov 2022 16:04:06 +0800 (CST) Received: from localhost (10.174.179.215) by canpemm500007.china.huawei.com (7.192.104.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 5 Nov 2022 16:07:42 +0800 From: YueHaibing To: , , , , , CC: , , YueHaibing Subject: [PATCH net-next 1/2] net: txgbe: Fix memleak in txgbe_calc_eeprom_checksum() Date: Sat, 5 Nov 2022 16:07:21 +0800 Message-ID: <20221105080722.20292-2-yuehaibing@huawei.com> X-Mailer: git-send-email 2.10.2.windows.1 In-Reply-To: <20221105080722.20292-1-yuehaibing@huawei.com> References: <20221105080722.20292-1-yuehaibing@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.174.179.215] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To canpemm500007.china.huawei.com (7.192.104.62) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, 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 eeprom_ptrs should be freed before returned. Fixes: 049fe5365324 ("net: txgbe: Add operations to interact with firmware") Signed-off-by: YueHaibing --- drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c index 0b1032195859..9cf5fe33118e 100644 --- a/drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c +++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c @@ -183,6 +183,7 @@ static int txgbe_calc_eeprom_checksum(struct txgbe_hw *hw, u16 *checksum) eeprom_ptrs); if (status != 0) { wx_err(wxhw, "Failed to read EEPROM image\n"); + kvfree(eeprom_ptrs); return status; } local_buffer = eeprom_ptrs; @@ -196,13 +197,13 @@ static int txgbe_calc_eeprom_checksum(struct txgbe_hw *hw, u16 *checksum) if (i != wxhw->eeprom.sw_region_offset + TXGBE_EEPROM_CHECKSUM) *checksum += local_buffer[i]; + if (eeprom_ptrs) + kvfree(eeprom_ptrs); + *checksum = TXGBE_EEPROM_SUM - *checksum; if (*checksum < 0) return -EINVAL; - if (eeprom_ptrs) - kvfree(eeprom_ptrs); - return 0; } -- 2.17.1