* [dpdk-dev] [PATCH] net/virtio-user: check fd flags getting failure
@ 2022-01-08 7:52 Yunjian Wang
2022-01-17 3:22 ` Xia, Chenbo
2022-01-27 5:26 ` Xia, Chenbo
0 siblings, 2 replies; 3+ messages in thread
From: Yunjian Wang @ 2022-01-08 7:52 UTC (permalink / raw)
To: dev
Cc: maxime.coquelin, chenbo.xia, dingxiaoxiong, xudingke,
Yunjian Wang, stable
The function fcntl() could return errors,
the return value need to be checked.
Fixes: 6a84c37e3975 ("net/virtio-user: add vhost-user adapter layer")
Cc: stable@dpdk.org
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
---
drivers/net/virtio/virtio_user/vhost_user.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/virtio/virtio_user/vhost_user.c b/drivers/net/virtio/virtio_user/vhost_user.c
index cc830a660f..0a39393c45 100644
--- a/drivers/net/virtio/virtio_user/vhost_user.c
+++ b/drivers/net/virtio/virtio_user/vhost_user.c
@@ -840,8 +840,10 @@ vhost_user_setup(struct virtio_user_dev *dev)
}
flag = fcntl(fd, F_GETFD);
- if (fcntl(fd, F_SETFD, flag | FD_CLOEXEC) < 0)
- PMD_DRV_LOG(WARNING, "fcntl failed, %s", strerror(errno));
+ if (flag == -1)
+ PMD_DRV_LOG(WARNING, "fcntl get fd failed, %s", strerror(errno));
+ else if (fcntl(fd, F_SETFD, flag | FD_CLOEXEC) < 0)
+ PMD_DRV_LOG(WARNING, "fcntl set fd failed, %s", strerror(errno));
memset(&un, 0, sizeof(un));
un.sun_family = AF_UNIX;
--
2.27.0
^ permalink raw reply [flat|nested] 3+ messages in thread* RE: [dpdk-dev] [PATCH] net/virtio-user: check fd flags getting failure
2022-01-08 7:52 [dpdk-dev] [PATCH] net/virtio-user: check fd flags getting failure Yunjian Wang
@ 2022-01-17 3:22 ` Xia, Chenbo
2022-01-27 5:26 ` Xia, Chenbo
1 sibling, 0 replies; 3+ messages in thread
From: Xia, Chenbo @ 2022-01-17 3:22 UTC (permalink / raw)
To: Yunjian Wang, dev; +Cc: maxime.coquelin, dingxiaoxiong, xudingke, stable
> -----Original Message-----
> From: Yunjian Wang <wangyunjian@huawei.com>
> Sent: Saturday, January 8, 2022 3:53 PM
> To: dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> dingxiaoxiong@huawei.com; xudingke@huawei.com; Yunjian Wang
> <wangyunjian@huawei.com>; stable@dpdk.org
> Subject: [dpdk-dev] [PATCH] net/virtio-user: check fd flags getting failure
>
> The function fcntl() could return errors,
> the return value need to be checked.
>
> Fixes: 6a84c37e3975 ("net/virtio-user: add vhost-user adapter layer")
> Cc: stable@dpdk.org
>
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> ---
> drivers/net/virtio/virtio_user/vhost_user.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/virtio/virtio_user/vhost_user.c
> b/drivers/net/virtio/virtio_user/vhost_user.c
> index cc830a660f..0a39393c45 100644
> --- a/drivers/net/virtio/virtio_user/vhost_user.c
> +++ b/drivers/net/virtio/virtio_user/vhost_user.c
> @@ -840,8 +840,10 @@ vhost_user_setup(struct virtio_user_dev *dev)
> }
>
> flag = fcntl(fd, F_GETFD);
> - if (fcntl(fd, F_SETFD, flag | FD_CLOEXEC) < 0)
> - PMD_DRV_LOG(WARNING, "fcntl failed, %s", strerror(errno));
> + if (flag == -1)
> + PMD_DRV_LOG(WARNING, "fcntl get fd failed, %s", strerror(errno));
> + else if (fcntl(fd, F_SETFD, flag | FD_CLOEXEC) < 0)
> + PMD_DRV_LOG(WARNING, "fcntl set fd failed, %s", strerror(errno));
>
> memset(&un, 0, sizeof(un));
> un.sun_family = AF_UNIX;
> --
> 2.27.0
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* RE: [dpdk-dev] [PATCH] net/virtio-user: check fd flags getting failure
2022-01-08 7:52 [dpdk-dev] [PATCH] net/virtio-user: check fd flags getting failure Yunjian Wang
2022-01-17 3:22 ` Xia, Chenbo
@ 2022-01-27 5:26 ` Xia, Chenbo
1 sibling, 0 replies; 3+ messages in thread
From: Xia, Chenbo @ 2022-01-27 5:26 UTC (permalink / raw)
To: Yunjian Wang, dev; +Cc: maxime.coquelin, dingxiaoxiong, xudingke, stable
> -----Original Message-----
> From: Yunjian Wang <wangyunjian@huawei.com>
> Sent: Saturday, January 8, 2022 3:53 PM
> To: dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> dingxiaoxiong@huawei.com; xudingke@huawei.com; Yunjian Wang
> <wangyunjian@huawei.com>; stable@dpdk.org
> Subject: [dpdk-dev] [PATCH] net/virtio-user: check fd flags getting failure
>
> The function fcntl() could return errors,
> the return value need to be checked.
>
> Fixes: 6a84c37e3975 ("net/virtio-user: add vhost-user adapter layer")
> Cc: stable@dpdk.org
>
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> ---
> drivers/net/virtio/virtio_user/vhost_user.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/virtio/virtio_user/vhost_user.c
> b/drivers/net/virtio/virtio_user/vhost_user.c
> index cc830a660f..0a39393c45 100644
> --- a/drivers/net/virtio/virtio_user/vhost_user.c
> +++ b/drivers/net/virtio/virtio_user/vhost_user.c
> @@ -840,8 +840,10 @@ vhost_user_setup(struct virtio_user_dev *dev)
> }
>
> flag = fcntl(fd, F_GETFD);
> - if (fcntl(fd, F_SETFD, flag | FD_CLOEXEC) < 0)
> - PMD_DRV_LOG(WARNING, "fcntl failed, %s", strerror(errno));
> + if (flag == -1)
> + PMD_DRV_LOG(WARNING, "fcntl get fd failed, %s", strerror(errno));
> + else if (fcntl(fd, F_SETFD, flag | FD_CLOEXEC) < 0)
> + PMD_DRV_LOG(WARNING, "fcntl set fd failed, %s", strerror(errno));
>
> memset(&un, 0, sizeof(un));
> un.sun_family = AF_UNIX;
> --
> 2.27.0
Applied to next-virtio/main with headline fixed (fd -> FD).
Thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-01-27 5:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-08 7:52 [dpdk-dev] [PATCH] net/virtio-user: check fd flags getting failure Yunjian Wang
2022-01-17 3:22 ` Xia, Chenbo
2022-01-27 5:26 ` Xia, Chenbo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).