From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 24CAEA0096 for ; Wed, 8 May 2019 12:16:19 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1C9F437AF; Wed, 8 May 2019 12:16:19 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 4D51E37AF for ; Wed, 8 May 2019 12:16:17 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AFE243079B63; Wed, 8 May 2019 10:16:16 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-210.ams2.redhat.com [10.36.117.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 446351A267; Wed, 8 May 2019 10:16:15 +0000 (UTC) From: Kevin Traynor To: Chenbo Xia Cc: Rami Rosen , Jens Freimann , Tiwei Bie , dpdk stable Date: Wed, 8 May 2019 11:14:57 +0100 Message-Id: <20190508101534.8984-15-ktraynor@redhat.com> In-Reply-To: <20190508101534.8984-1-ktraynor@redhat.com> References: <20190508101534.8984-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Wed, 08 May 2019 10:16:16 +0000 (UTC) Subject: [dpdk-stable] patch 'net/virtio-user: fix return value check' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 LTS release 18.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/13/19. 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/fed050b4454806c62077fbf51b7a00fc1f8eea34 Thanks. Kevin Traynor --- >From fed050b4454806c62077fbf51b7a00fc1f8eea34 Mon Sep 17 00:00:00 2001 From: Chenbo Xia Date: Wed, 10 Apr 2019 02:44:05 +0000 Subject: [PATCH] net/virtio-user: fix return value check [ upstream commit 1e9868885f2ed388e827e8ce27d4b690c9b2fb90 ] Fix unchecked return value for fcntl. Coverity issue: 277210 Fixes: bd8f50a45d0f ("net/virtio-user: support server mode") Signed-off-by: Chenbo Xia Acked-by: Rami Rosen Reviewed-by: Jens Freimann Reviewed-by: Tiwei Bie --- drivers/net/virtio/virtio_user/vhost_user.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_user/vhost_user.c b/drivers/net/virtio/virtio_user/vhost_user.c index 2c6eba0a6..0a88d5957 100644 --- a/drivers/net/virtio/virtio_user/vhost_user.c +++ b/drivers/net/virtio/virtio_user/vhost_user.c @@ -394,5 +394,8 @@ virtio_user_start_server(struct virtio_user_dev *dev, struct sockaddr_un *un) flag = fcntl(fd, F_GETFL); - fcntl(fd, F_SETFL, flag | O_NONBLOCK); + if (fcntl(fd, F_SETFL, flag | O_NONBLOCK) < 0) { + PMD_DRV_LOG(ERR, "fcntl failed, %s", strerror(errno)); + return -1; + } return 0; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-08 11:05:06.618319331 +0100 +++ 0015-net-virtio-user-fix-return-value-check.patch 2019-05-08 11:05:05.790933577 +0100 @@ -1 +1 @@ -From 1e9868885f2ed388e827e8ce27d4b690c9b2fb90 Mon Sep 17 00:00:00 2001 +From fed050b4454806c62077fbf51b7a00fc1f8eea34 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1e9868885f2ed388e827e8ce27d4b690c9b2fb90 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 827a48ad6..4b74bd2d8 100644 +index 2c6eba0a6..0a88d5957 100644 @@ -24 +25 @@ -@@ -395,5 +395,8 @@ virtio_user_start_server(struct virtio_user_dev *dev, struct sockaddr_un *un) +@@ -394,5 +394,8 @@ virtio_user_start_server(struct virtio_user_dev *dev, struct sockaddr_un *un)