From patchwork Fri Nov 25 07:45:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ziyang Xuan X-Patchwork-Id: 25869 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3835122wrr; Thu, 24 Nov 2022 23:50:50 -0800 (PST) X-Google-Smtp-Source: AA0mqf686j1d18eeWHw0watV3lBZ/VjZ6EexPi+LCsWV7FmcaWvGqn/ARU+KtUvpc6Z1j3DJzklW X-Received: by 2002:a17:906:36d2:b0:7ae:9c7b:4d5c with SMTP id b18-20020a17090636d200b007ae9c7b4d5cmr29843138ejc.598.1669362650179; Thu, 24 Nov 2022 23:50:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669362650; cv=none; d=google.com; s=arc-20160816; b=mp33AEyxay7PElkUQ3Nibw91k5c5Wbyf6bZg8CMfAsBoLeZwIj/+WvrWDp6wde8aHg MMILvycuHu2h+gDCDnIuhReA1C2ccY+YUgWai1OC/+fy9VEq/Hb7U4mgrQcujo+XHPyf Bw1klZJQpMc/dchgCIZuaUJZxWsCAcR8t8YmAERisT+HoaVMHDc7P5zHAGw3U3t3MYUI lVS7cAFx6f0hDt4vSuMQSDHoAdwzZiFAG2OCBYK5h6/xzg+ru+nSs6ltTfCzvyK9mJGX hWa9CkVSKsH1orbIYoudo09h71DVnEFUvh4qmZe0phwe8bIKysLtvA2YE/aN1LSGEq6O tK0A== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=utU1i7epSHSKxUXo4J7TBTpiec02A9F+RuIbuiz1zlM=; b=U/NpHN/viZieBsN3qZfflL4+GYB0Gp5RZQ+AVCbdXHPGqPxNkR0X3sQw8qGGdkoK2w AWPxdPpwcRKPCh9SYKeqYgqgFN7hJBnQFYMRhRKN/L7DLqAjyKGWDvoMkA4zzOJKWAI0 6EJBX6A9aA5QzgskP9fcZrylxewoKj+VOoi/ic6s3bNKkKGhVJZJcuvxvx5FAc+zPwjY ACy0Og09AOhMFjv4GCRTXMZq7I6sX385UiB8aKn9QG6e4RMl4qDs3ctv4mUoAAdTlSpk N8ETozAJ1NB72aO8fn/Uc8trBERiVDaOX9M3AiRN4FgaKrUL3hc7bPWdL82e9z0sEEri 7lvw== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v15-20020a17090606cf00b007baa6e22741si2066234ejb.557.2022.11.24.23.50.26; Thu, 24 Nov 2022 23:50:50 -0800 (PST) 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 S229653AbiKYHph (ORCPT + 99 others); Fri, 25 Nov 2022 02:45:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229476AbiKYHpg (ORCPT ); Fri, 25 Nov 2022 02:45:36 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A67622EF07; Thu, 24 Nov 2022 23:45:35 -0800 (PST) Received: from canpemm500006.china.huawei.com (unknown [172.30.72.55]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4NJRdz5jMPzJnwM; Fri, 25 Nov 2022 15:42:15 +0800 (CST) Received: from localhost.localdomain (10.175.104.82) by canpemm500006.china.huawei.com (7.192.105.130) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 25 Nov 2022 15:45:33 +0800 From: Ziyang Xuan To: , , , , , , , , CC: Subject: [PATCH net 1/2] octeontx2-pf: Fix potential memory leak in otx2_init_tc() Date: Fri, 25 Nov 2022 15:45:30 +0800 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.175.104.82] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500006.china.huawei.com (7.192.105.130) 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750453610258932155?= X-GMAIL-MSGID: =?utf-8?q?1750453610258932155?= In otx2_init_tc(), if rhashtable_init() failed, it does not free tc->tc_entries_bitmap which is allocated in otx2_tc_alloc_ent_bitmap(). Fixes: 2e2a8126ffac ("octeontx2-pf: Unify flow management variables") Signed-off-by: Ziyang Xuan --- drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c index e64318c110fd..6a01ab1a6e6f 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c @@ -1134,7 +1134,12 @@ int otx2_init_tc(struct otx2_nic *nic) return err; tc->flow_ht_params = tc_flow_ht_params; - return rhashtable_init(&tc->flow_table, &tc->flow_ht_params); + err = rhashtable_init(&tc->flow_table, &tc->flow_ht_params); + if (err) { + kfree(tc->tc_entries_bitmap); + tc->tc_entries_bitmap = NULL; + } + return err; } EXPORT_SYMBOL(otx2_init_tc); From patchwork Fri Nov 25 07:45:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ziyang Xuan X-Patchwork-Id: 25870 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3835236wrr; Thu, 24 Nov 2022 23:51:08 -0800 (PST) X-Google-Smtp-Source: AA0mqf4GeE+NYIGp6mTUBDbgToDdAVYp3ZgLWJFASPbfYS/xmSs1OMCPLzOKLbmCtHjWsdmgJBch X-Received: by 2002:aa7:cc93:0:b0:462:6b8e:1ddb with SMTP id p19-20020aa7cc93000000b004626b8e1ddbmr32854040edt.276.1669362667883; Thu, 24 Nov 2022 23:51:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669362667; cv=none; d=google.com; s=arc-20160816; b=vgICFofQh9nggoy4A29UjaNOd4DMjA3cnoUJHzeV2DE8jaX8InoncgXPWPiWvaCbxp YP/AEIj5lbwbL+QUjcD48iTEoMyLLZX8BsM1B0SD8611HOZGWAfTm4htIaYp84L9572R phG7eTDn6xrhKOjG0dGYQGb7qvZ4ZVtLfRyrNiboqG0gFUKEx7Ryd2OxdA0cXEGRY4nD 5rInDLMfP4Yf3tzZ+or3DZ4+8VGK0GAlL5Xkke6tkQdvwgISd5iu6rAlTHxgGze0aDR4 0k7LYUYJp/VR8ZceO+ly0J2vMx4RQxJL70SiphIh6DBHbEUfbgDKsqXiWUXby8rL/9AO GM4Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=PrzDgDZopwC9XNcysEL4fsooZp/6hfBDRWV6LFo8mfM=; b=au3z76bfeUpSpApz5aX87YiRLRv/niRfaF9cRrWz5K3fu0sbJYdF9pOaxVcQSlaPuq H92aVA1rQQES5vJuwoC4zuQH5xaWLeqv9pOcugdR2phj42MIMARngOCZ/7+6qfQJRTjD 4kS1dGqJJB0hWe/P0TsWG8FOAOh7UNs3qyZVPECOgJpNMymGP7kr8HUE3y+in0xKhjSv ReL7S2DSThHJm3a9IuMNZkrUMzP/QkdWCA8bEhaxdKabIfc3LI/cj3/iWlQTYQ7X/fqd 8VF+rUY2my3pKkPn/y4qkoJ1SbjmwmiUeTTU5nFHKs3pdYCxHCDWZR4eUaq37A+3f7KQ CVtQ== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dr4-20020a170907720400b0078db8fe2834si2683930ejc.245.2022.11.24.23.50.44; Thu, 24 Nov 2022 23:51:07 -0800 (PST) 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 S229668AbiKYHp6 (ORCPT + 99 others); Fri, 25 Nov 2022 02:45:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229758AbiKYHpx (ORCPT ); Fri, 25 Nov 2022 02:45:53 -0500 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0DCF2F03F; Thu, 24 Nov 2022 23:45:52 -0800 (PST) Received: from canpemm500006.china.huawei.com (unknown [172.30.72.56]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4NJRjS6j9nz15Mr5; Fri, 25 Nov 2022 15:45:16 +0800 (CST) Received: from localhost.localdomain (10.175.104.82) by canpemm500006.china.huawei.com (7.192.105.130) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 25 Nov 2022 15:45:49 +0800 From: Ziyang Xuan To: , , , , , , , , CC: Subject: [PATCH net 2/2] octeontx2-pf: Fix a potential double free in otx2_sq_free_sqbs() Date: Fri, 25 Nov 2022 15:45:46 +0800 Message-ID: <047b210eb3b3a2e26703d8b0570a0a017789c169.1669361183.git.william.xuanziyang@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.175.104.82] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To canpemm500006.china.huawei.com (7.192.105.130) 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750453628735078185?= X-GMAIL-MSGID: =?utf-8?q?1750453628735078185?= otx2_sq_free_sqbs() will be called twice when goto "err_free_nix_queues" label in otx2_init_hw_resources(). The first calling is within otx2_free_sq_res() at "err_free_nix_queues" label, and the second calling is at later "err_free_sq_ptrs" label. In otx2_sq_free_sqbs(), If sq->sqb_ptrs[i] is not 0, the memory page it points to will be freed, and sq->sqb_ptrs[i] do not be assigned 0 after memory page be freed. If otx2_sq_free_sqbs() is called twice, the memory page pointed by sq->sqb_ptrs[i] will be freeed twice. To fix the bug, assign 0 to sq->sqb_ptrs[i] after memory page be freed. Fixes: caa2da34fd25 ("octeontx2-pf: Initialize and config queues") Signed-off-by: Ziyang Xuan --- drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c index 9e10e7471b88..5a25fe51d102 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c @@ -1146,6 +1146,7 @@ void otx2_sq_free_sqbs(struct otx2_nic *pfvf) DMA_FROM_DEVICE, DMA_ATTR_SKIP_CPU_SYNC); put_page(virt_to_page(phys_to_virt(pa))); + sq->sqb_ptrs[sqb] = 0; } sq->sqb_count = 0; }