[dpdk-stable] patch 'net/virtio-user: check tap system call setting' has been queued to LTS release 18.11.10

Kevin Traynor ktraynor at redhat.com
Fri Aug 28 12:13:00 CEST 2020


Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/20. 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-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/55ae014f27fedb44ce5cd05f0427a09fb93d96f3

Thanks.

Kevin.

---
>From 55ae014f27fedb44ce5cd05f0427a09fb93d96f3 Mon Sep 17 00:00:00 2001
From: Chenbo Xia <chenbo.xia at intel.com>
Date: Wed, 29 Jul 2020 13:12:30 +0000
Subject: [PATCH] net/virtio-user: check tap system call setting

[ upstream commit 570ee25677d8634e99d2120b363f2dd4948d5bac ]

Setting the flags of tapfd may fail and the return value
should be checked.

Coverity issue: 140739
Fixes: e3b434818bbb ("net/virtio-user: support kernel vhost")

Signed-off-by: Chenbo Xia <chenbo.xia at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 drivers/net/virtio/virtio_user/vhost_kernel_tap.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/virtio/virtio_user/vhost_kernel_tap.c b/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
index e95cd9da4c..cdfbd4be7a 100644
--- a/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
+++ b/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
@@ -129,5 +129,8 @@ vhost_kernel_open_tap(char **p_ifname, int hdr_size, int req_mq,
 	}
 
-	fcntl(tapfd, F_SETFL, O_NONBLOCK);
+	if (fcntl(tapfd, F_SETFL, O_NONBLOCK) < 0) {
+		PMD_DRV_LOG(ERR, "fcntl tapfd failed: %s", strerror(errno));
+		goto error;
+	}
 
 	if (ioctl(tapfd, TUNSETVNETHDRSZ, &hdr_size) < 0) {
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.741264575 +0100
+++ 0034-net-virtio-user-check-tap-system-call-setting.patch	2020-08-28 11:03:25.985955928 +0100
@@ -1 +1 @@
-From 570ee25677d8634e99d2120b363f2dd4948d5bac Mon Sep 17 00:00:00 2001
+From 55ae014f27fedb44ce5cd05f0427a09fb93d96f3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 570ee25677d8634e99d2120b363f2dd4948d5bac ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 2fa4f0d661..acddefa33d 100644
+index e95cd9da4c..cdfbd4be7a 100644



More information about the stable mailing list