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 B84DAA0350 for ; Mon, 21 Feb 2022 16:40:34 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B39D940DF6; Mon, 21 Feb 2022 16:40:34 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 869EF4068C for ; Mon, 21 Feb 2022 16:40:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=x1PNjm8jvQ2I16wWMiivwbkhxaF9gFwo6LMA4d8pXGw=; b=PYLvqBurOh0b6eQt0RDP6ygGkfeqpjIj81zM+3ViI4YlD2P1MhvlghmnzTmTXxjyTuFxcy 9lhQX0jQ8Mh0A5BLtPv+78kgxWcu4GOYxG5HM/iX059PPljfpV1P3smsyhyd2J3PTvlxXh k0nU4WK54KG6yoqswcwWiLTnEYhhtX8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-225-v41w6nouMCyP26CQWHnzeQ-1; Mon, 21 Feb 2022 10:40:28 -0500 X-MC-Unique: v41w6nouMCyP26CQWHnzeQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 89E451091DA2; Mon, 21 Feb 2022 15:40:27 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 79F067E131; Mon, 21 Feb 2022 15:40:26 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Chenbo Xia , dpdk stable Subject: patch 'net/virtio: fix uninitialized RSS key' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:35:01 +0000 Message-Id: <20220221153625.152324-112-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/26/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/4c4c0cf459e56886b2ae58c0cc7d64c1b7032f57 Thanks. Kevin --- >From 4c4c0cf459e56886b2ae58c0cc7d64c1b7032f57 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Sat, 8 Jan 2022 16:14:21 +0800 Subject: [PATCH] net/virtio: fix uninitialized RSS key [ upstream commit 0f7438e6d4009a52482d6a662f440ab067e63c60 ] This patch fixes an issue that uninitialized old_rss_key is used for restoring the rss_key. Coverity issue: 373866 Fixes: 0c9d66207054 ("net/virtio: support RSS") Signed-off-by: Yunjian Wang Reviewed-by: Chenbo Xia --- drivers/net/virtio/virtio_ethdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index b317649d7e..d180162abd 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -2029,5 +2029,6 @@ virtio_dev_rss_hash_update(struct rte_eth_dev *dev, return 0; restore_key: - memcpy(hw->rss_key, old_rss_key, VIRTIO_NET_RSS_KEY_SIZE); + if (rss_conf->rss_key && rss_conf->rss_key_len) + memcpy(hw->rss_key, old_rss_key, VIRTIO_NET_RSS_KEY_SIZE); restore_types: hw->rss_hash_types = old_hash_types; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:47.026749357 +0000 +++ 0112-net-virtio-fix-uninitialized-RSS-key.patch 2022-02-21 15:22:44.217704410 +0000 @@ -1 +1 @@ -From 0f7438e6d4009a52482d6a662f440ab067e63c60 Mon Sep 17 00:00:00 2001 +From 4c4c0cf459e56886b2ae58c0cc7d64c1b7032f57 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0f7438e6d4009a52482d6a662f440ab067e63c60 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org