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

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

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

Thanks.

Luca Boccassi

---
>From e769b739306fd5f8c69e205d0145bc6cd0e200a3 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 2fa4f0d66..acddefa33 100644
--- a/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
+++ b/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
@@ -128,7 +128,10 @@ vhost_kernel_open_tap(char **p_ifname, int hdr_size, int req_mq,
 		goto error;
 	}
 
-	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) {
 		PMD_DRV_LOG(ERR, "TUNSETVNETHDRSZ failed: %s", strerror(errno));
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-06 10:53:17.109640479 +0100
+++ 0034-net-virtio-user-check-tap-system-call-setting.patch	2020-08-06 10:53:15.828597956 +0100
@@ -1,14 +1,15 @@
-From 570ee25677d8634e99d2120b363f2dd4948d5bac Mon Sep 17 00:00:00 2001
+From e769b739306fd5f8c69e205d0145bc6cd0e200a3 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")
-Cc: stable at dpdk.org
 
 Signed-off-by: Chenbo Xia <chenbo.xia at intel.com>
 Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>