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 E8CEFA0524 for ; Thu, 4 Feb 2021 12:34:59 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E24ED24072B; Thu, 4 Feb 2021 12:34:59 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id D5FFF24072B for ; Thu, 4 Feb 2021 12:34:58 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7cuR-0005AJ-Mr; Thu, 04 Feb 2021 11:34:51 +0000 From: Christian Ehrhardt To: Jiawei Zhu Cc: Chenbo Xia , Maxime Coquelin , dpdk stable Date: Thu, 4 Feb 2021 12:28:08 +0100 Message-Id: <20210204112954.2488123-33-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/virtio-user: fix run closing stdin and close callfd' has been queued to stable release 19.11.7 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.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 02/06/21. 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/1b89a970cade3b88d13386fb07b6c14175bc918b Thanks. Christian Ehrhardt --- >From 1b89a970cade3b88d13386fb07b6c14175bc918b Mon Sep 17 00:00:00 2001 From: Jiawei Zhu Date: Sat, 12 Dec 2020 00:53:18 +0800 Subject: [PATCH] net/virtio-user: fix run closing stdin and close callfd [ upstream commit 97ed740c3498afab4162cb85492cd3109e21c604 ] When i < VIRTIO_MAX_VIRTQUEUES and j == i, dev->callfds[i] and dev->kickfds[i] are default 0. So it will close(0), close the standard input (stdin). And when the code fails in kickfd creation, it will leaves one callfd not closed. Fixes: e6e7ad8b3024 ("net/virtio-user: move eventfd open/close into init/uninit") Cc: stable@dpdk.org: Signed-off-by: Jiawei Zhu Reviewed-by: Chenbo Xia Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_user/virtio_user_dev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c index 1c6b26f8d3..ad5d2f3bf8 100644 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c @@ -263,6 +263,7 @@ virtio_user_dev_init_notify(struct virtio_user_dev *dev) } kickfd = eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK); if (kickfd < 0) { + close(callfd); PMD_DRV_LOG(ERR, "kickfd error, %s", strerror(errno)); break; } @@ -271,7 +272,7 @@ virtio_user_dev_init_notify(struct virtio_user_dev *dev) } if (i < VIRTIO_MAX_VIRTQUEUES) { - for (j = 0; j <= i; ++j) { + for (j = 0; j < i; ++j) { close(dev->callfds[j]); close(dev->kickfds[j]); } -- 2.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:29.516790121 +0100 +++ 0033-net-virtio-user-fix-run-closing-stdin-and-close-call.patch 2021-02-04 12:04:27.926789628 +0100 @@ -1 +1 @@ -From 97ed740c3498afab4162cb85492cd3109e21c604 Mon Sep 17 00:00:00 2001 +From 1b89a970cade3b88d13386fb07b6c14175bc918b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 97ed740c3498afab4162cb85492cd3109e21c604 ] + @@ -24 +26 @@ -index 053f0267ca..e1cbad0d90 100644 +index 1c6b26f8d3..ad5d2f3bf8 100644 @@ -27 +29 @@ -@@ -276,6 +276,7 @@ virtio_user_dev_init_notify(struct virtio_user_dev *dev) +@@ -263,6 +263,7 @@ virtio_user_dev_init_notify(struct virtio_user_dev *dev) @@ -35 +37 @@ -@@ -284,7 +285,7 @@ virtio_user_dev_init_notify(struct virtio_user_dev *dev) +@@ -271,7 +272,7 @@ virtio_user_dev_init_notify(struct virtio_user_dev *dev)