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 DFC3CA0C41 for ; Tue, 30 Nov 2021 17:40:26 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D54DF410F7; Tue, 30 Nov 2021 17:40:26 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id E58EF41177 for ; Tue, 30 Nov 2021 17:40:24 +0100 (CET) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id C2F4D3FFF1 for ; Tue, 30 Nov 2021 16:40:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290424; bh=ygJBENKOXtwybDmpns4gSN3c8V393BMs3NOtlrJO98U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iwMq57H4hi6vT+lEcC6bEzMGhZsbRWF98w0M6QMSefcZX31fmlkAtv1HvAsdAcoy/ mWydWEeOwEiiXMS/9oLR0MZTtlQMMHUVWRmdfW1ydk+iqro8MTJDQiLPBQU3BhvogB aIX/u12ZTSf+hHmgctJT2GKhUj1MMjxL2o+puCMuvkGd9PfmzUSh0hTUM5u6Nlkh9K JDgztT5fjYTRSQ4+pyIoRzQiTfaU2dg03iP7nwnUw6Cke8Y1fXsr16ey4HDEJdU2SB p4kCjG5PyrujmrE53CkLm4PEdMnOW6wYP+oqqnzxDlvqUD9CsLEpvEs7GeUYgB9vhX KXMWQZAvjG7aQ== Received: by mail-ed1-f71.google.com with SMTP id l15-20020a056402124f00b003e57269ab87so17430703edw.6 for ; Tue, 30 Nov 2021 08:40:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ygJBENKOXtwybDmpns4gSN3c8V393BMs3NOtlrJO98U=; b=i9vicAGuFg+DvAcvQks65p2+mbRCBvmlv/HYx2kGY+aoxG8pQuKc+YwVZjm+O8XOtR q/lKXnfS6lzyk3/F1FuO2incYPVo5kTZT5L063VKRakKBC2gHtzmPa40Fx+v7DhFtEEr QeUv7ciI6GMmL6P73ynYi42gf5/9L5ClUxHuLApH7QNIEhxfMrU7EwzPXOoQAwuEp270 r4v27L7BhWSp4E3Yb1tjBL1oWnAPXE0VO30e5tJwgrILOygL5zSpa2BG3tdstGppUatg 78zeAH8FZ7iObWCqkGOR9nSba6DkKXWoWJ47o9krHJZ5xAJgltYc/aFv546pBsw+kxYm llqg== X-Gm-Message-State: AOAM533jUugYrMMy5oyXor6+5+BTvcfAaBLznkiaS2PKR5ZganJB+En6 HnDQO8H7uWj81xrZrPVNQBBC/AhA/8f9KnUcRkoL0hAxT9smGVOkTLJ9zKIH9PMTEDaH3EFe9nU hHQ0UXD/B49cN7ubgb1XUCC/j X-Received: by 2002:a17:907:72c9:: with SMTP id du9mr207883ejc.37.1638290424077; Tue, 30 Nov 2021 08:40:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJx29rqYW7ljHAqpL3R19sozI02FNoVyKt/ctiYCZuCUt/YwKShc36uI8fvYj3ASxvOGiX66eg== X-Received: by 2002:a17:907:72c9:: with SMTP id du9mr207865ejc.37.1638290423935; Tue, 30 Nov 2021 08:40:23 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id c7sm9711627ejd.91.2021.11.30.08.40.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:40:22 -0800 (PST) From: christian.ehrhardt@canonical.com To: Robin Zhang Cc: Christopher Pau , Beilei Xing , dpdk stable Subject: patch 'net/i40e/base: fix potentially uninitialized variables' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:34:46 +0100 Message-Id: <20211130163605.2460997-82-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.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 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/8406d53dc9b5a5c63677504a6537dbf9b0174695 Thanks. Christian Ehrhardt --- >From 8406d53dc9b5a5c63677504a6537dbf9b0174695 Mon Sep 17 00:00:00 2001 From: Robin Zhang Date: Sat, 9 Oct 2021 01:39:50 +0000 Subject: [PATCH] net/i40e/base: fix potentially uninitialized variables [ upstream commit bc99971d1021ecc85280b9b98e84c9b5f4ba008e ] The status of i40e_read_nvm_word is not checked, so variables set from this function could be used uninitialized. In this case, preserve the existing flow that does not block initialization by initializing these values from the start. Fixes: 8d6c51fcd24b ("i40e/base: get OEM version") Fixes: 2db70574247b ("net/i40e/base: limit PF/VF specific code to that driver only") Signed-off-by: Christopher Pau Signed-off-by: Robin Zhang Acked-by: Beilei Xing --- drivers/net/i40e/base/i40e_adminq.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/base/i40e_adminq.c b/drivers/net/i40e/base/i40e_adminq.c index 0c07ff0045..48f9d8071a 100644 --- a/drivers/net/i40e/base/i40e_adminq.c +++ b/drivers/net/i40e/base/i40e_adminq.c @@ -587,8 +587,10 @@ STATIC void i40e_resume_aq(struct i40e_hw *hw) enum i40e_status_code i40e_init_adminq(struct i40e_hw *hw) { #ifdef PF_DRIVER - u16 cfg_ptr, oem_hi, oem_lo; - u16 eetrack_lo, eetrack_hi; + u16 oem_hi = 0, oem_lo = 0; + u16 eetrack_hi = 0; + u16 eetrack_lo = 0; + u16 cfg_ptr = 0; #endif enum i40e_status_code ret_code; #ifdef PF_DRIVER -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:10.701500898 +0100 +++ 0082-net-i40e-base-fix-potentially-uninitialized-variable.patch 2021-11-30 16:50:05.858874029 +0100 @@ -1 +1 @@ -From bc99971d1021ecc85280b9b98e84c9b5f4ba008e Mon Sep 17 00:00:00 2001 +From 8406d53dc9b5a5c63677504a6537dbf9b0174695 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bc99971d1021ecc85280b9b98e84c9b5f4ba008e ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 38d3429e5b..27c82d9b44 100644 +index 0c07ff0045..48f9d8071a 100644 @@ -26 +27,2 @@ -@@ -652,8 +652,10 @@ enum i40e_status_code i40e_init_adminq(struct i40e_hw *hw) +@@ -587,8 +587,10 @@ STATIC void i40e_resume_aq(struct i40e_hw *hw) + enum i40e_status_code i40e_init_adminq(struct i40e_hw *hw) @@ -28,2 +30 @@ - struct i40e_adminq_info *aq = &hw->aq; - enum i40e_status_code ret_code; + #ifdef PF_DRIVER @@ -36,3 +37,3 @@ - int retry = 0; - - /* verify input for valid configuration */ + #endif + enum i40e_status_code ret_code; + #ifdef PF_DRIVER