From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A3A4BA00C2 for ; Thu, 3 Nov 2022 10:31:20 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A00DD40694; Thu, 3 Nov 2022 10:31:20 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id 70A2740693 for ; Thu, 3 Nov 2022 10:31:19 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id o4so1722574wrq.6 for ; Thu, 03 Nov 2022 02:31:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=siJhIoh2aRDyM1HYDAc0s+Y9BGf839VMV9nsLorhqFQ=; b=nvMRhcI/5YelsPHBn35/Vnr1+B+zTh3Y3fEsR8CTFO/zhrNgw9Ito6gv5apaCTZDte W2qYCTC8bN6NfLdg8EWyQ8dXl3OxcLJkuWugkft0VFwLtdJD+MDuq8FnldNidSjK0T/N eZA/9ZvMQjhCcfJC9ZxFD3n2/3kVj0kIotmK4CFHoiRdgnEIGk3mwdqQnSMZoGQyQDjC WIGuI++sw/67e0wBHizfPZGB5fkZ8T/mvY3aFmluqChysHEJA+kvURfjcOqn9GRS1rTv hkjSiRiWZKrBKTX76T8uEpDNdb1BEpA3F6XrkuodApEfeqH64rEJkGkL2g9vZACZ2W2d ixTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=siJhIoh2aRDyM1HYDAc0s+Y9BGf839VMV9nsLorhqFQ=; b=2ZvkYEgQzlhMODJaT3ZyAUDfdpWbyRMwAoBE7xM3/sQCwJzPI0vM9O2naT00Z9sF+u M4cKprA78Zv3kd+8UImNQ35vEvWSuUI76h3c+E8ZYGsAz4iIi/4KcJN39naoJmkwop9R HOEdl2AnM0EahiftAqCeeonq9XtwPdJLIGTuCrOXXD9FnKg/d+1R9e0KsVHcit89Jl/N meSRCpnLW3KFk9Nc1bUxCLxzbt7rlNYt42KgMUH9e6+cdAfoJnQl4BK2r/eLj4wT/Ip+ XggtHVLuItHVqK/MBPPrRnHDozN28lSGlxoXDTe5zkW4/B5DwHBnYLfge61FXVkzaHu9 2Ndg== X-Gm-Message-State: ACrzQf34xYy0mQ1ls2NIH5YpzB4KSqHT6pI9vfq+XHraiD+JG8F0i8Jx P4mmgw5LRCAeDktVGVpYgog= X-Google-Smtp-Source: AMsMyM5CyGZhNM4emNpREd9N8citnU7lM+d+VnLuwn6aunOeSvDhhjUd5eoV4xUeOSrq0SgH50/ZVA== X-Received: by 2002:adf:fdce:0:b0:236:f543:2fd9 with SMTP id i14-20020adffdce000000b00236f5432fd9mr4250596wrs.511.1667467879158; Thu, 03 Nov 2022 02:31:19 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id p16-20020a056000019000b0023538fb27c1sm318648wrx.85.2022.11.03.02.31.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:31:18 -0700 (PDT) From: luca.boccassi@gmail.com To: Mao YingMing Cc: Somnath Kotur , Ajit Khaparde , dpdk stable Subject: patch 'net/bnxt: fix null pointer dereference in LED config' has been queued to stable release 20.11.7 Date: Thu, 3 Nov 2022 09:27:16 +0000 Message-Id: <20221103092758.1099402-58-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221103092758.1099402-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 20.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/05/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/0bf3f8ef0a20742340887646d41290ab8278ce34 Thanks. Luca Boccassi --- >From 0bf3f8ef0a20742340887646d41290ab8278ce34 Mon Sep 17 00:00:00 2001 From: Mao YingMing Date: Tue, 2 Aug 2022 12:08:17 +0800 Subject: [PATCH] net/bnxt: fix null pointer dereference in LED config [ upstream commit 4bfb499829fa2bf216e38e56aa313c1dceef6ed5 ] For VFs, bp->leds is uninitialized, check bp->leds is not null before checking for bp->leds->num_leds. segfault backtrace in trex program when use VF: 11: bnxt_hwrm_port_led_cfg (bp=0x23ffb2140, led_on=true) 10: bnxt_dev_led_on_op (dev=0x22d7780 ) 9: rte_eth_led_on (port_id=0) 8: DpdkTRexPortAttr::set_led (this=0x23b6ce0, on=true) 7: DpdkTRexPortAttr::DpdkTRexPortAttr 6: CTRexExtendedDriverBnxt::create_port_attr 5: CPhyEthIF::Create 4: CGlobalTRex::device_start 3: CGlobalTRex::Create 2: main_test 1: main Fixes: d4d5a04 ("net/bnxt: fix unnecessary memory allocation") Signed-off-by: Mao YingMing Acked-by: Somnath Kotur Acked-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_hwrm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 8b50e44fcf..bdb76e44d7 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -4409,7 +4409,7 @@ int bnxt_hwrm_port_led_cfg(struct bnxt *bp, bool led_on) uint16_t duration = 0; int rc, i; - if (!bp->leds->num_leds || BNXT_VF(bp)) + if (BNXT_VF(bp) || !bp->leds || !bp->leds->num_leds) return -EOPNOTSUPP; HWRM_PREP(&req, HWRM_PORT_LED_CFG, BNXT_USE_CHIMP_MB); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:28.912610262 +0000 +++ 0058-net-bnxt-fix-null-pointer-dereference-in-LED-config.patch 2022-11-03 09:27:25.469424299 +0000 @@ -1 +1 @@ -From 4bfb499829fa2bf216e38e56aa313c1dceef6ed5 Mon Sep 17 00:00:00 2001 +From 0bf3f8ef0a20742340887646d41290ab8278ce34 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4bfb499829fa2bf216e38e56aa313c1dceef6ed5 ] + @@ -23 +24,0 @@ -Cc: stable@dpdk.org @@ -33 +34 @@ -index 9c5257309a..51e1e2d6b3 100644 +index 8b50e44fcf..bdb76e44d7 100644 @@ -36 +37 @@ -@@ -4535,7 +4535,7 @@ int bnxt_hwrm_port_led_cfg(struct bnxt *bp, bool led_on) +@@ -4409,7 +4409,7 @@ int bnxt_hwrm_port_led_cfg(struct bnxt *bp, bool led_on)