patches for DPDK stable branches
 help / color / Atom feed
* [dpdk-stable] [dpdk-dev] [PATCH v2] net/virtio-user: fix return value of tap offload sets not checked
@ 2020-01-09 12:18 Yunjian Wang
  2020-01-13  2:16 ` Tiwei Bie
  0 siblings, 1 reply; 3+ messages in thread
From: Yunjian Wang @ 2020-01-09 12:18 UTC (permalink / raw)
  To: dev, tiwei.bie, maxime.coquelin, zhihong.wang
  Cc: xudingke, Yunjian Wang, stable

The function vhost_kernel_tap_set_offload() could return errors,
the return value need to be checked. And there is no need to fail
when error is -ENOTSUP.

Fixes: 1db4d2330bc8 ("net/virtio-user: check negotiated features before set")
Cc: stable@dpdk.org

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
---
v2:
 * No need to fail when error is -ENOTSUP.
---
 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 76bf75423..2a0c2106d 100644
--- a/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
+++ b/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
@@ -66,6 +66,7 @@ vhost_kernel_open_tap(char **p_ifname, int hdr_size, int req_mq,
 	int sndbuf = INT_MAX;
 	struct ifreq ifr;
 	int tapfd;
+	int ret;
 
 	/* TODO:
 	 * 1. verify we can get/set vnet_hdr_len, tap_probe_vnet_hdr_len
@@ -131,7 +132,9 @@ vhost_kernel_open_tap(char **p_ifname, int hdr_size, int req_mq,
 		goto error;
 	}
 
-	vhost_kernel_tap_set_offload(tapfd, features);
+	ret = vhost_kernel_tap_set_offload(tapfd, features);
+	if (ret < 0 && ret != ENOTSUP)
+		goto error;
 
 	memset(&ifr, 0, sizeof(ifr));
 	ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
-- 
2.19.1



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dpdk-stable] [dpdk-dev] [PATCH v2] net/virtio-user: fix return value of tap offload sets not checked
  2020-01-09 12:18 [dpdk-stable] [dpdk-dev] [PATCH v2] net/virtio-user: fix return value of tap offload sets not checked Yunjian Wang
@ 2020-01-13  2:16 ` Tiwei Bie
  2020-01-13  7:26   ` wangyunjian
  0 siblings, 1 reply; 3+ messages in thread
From: Tiwei Bie @ 2020-01-13  2:16 UTC (permalink / raw)
  To: Yunjian Wang; +Cc: dev, maxime.coquelin, zhihong.wang, xudingke, stable

On Thu, Jan 09, 2020 at 08:18:24PM +0800, Yunjian Wang wrote:
> The function vhost_kernel_tap_set_offload() could return errors,
> the return value need to be checked. And there is no need to fail
> when error is -ENOTSUP.
> 
> Fixes: 1db4d2330bc8 ("net/virtio-user: check negotiated features before set")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> ---
> v2:
>  * No need to fail when error is -ENOTSUP.
> ---
>  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 76bf75423..2a0c2106d 100644
> --- a/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
> +++ b/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
> @@ -66,6 +66,7 @@ vhost_kernel_open_tap(char **p_ifname, int hdr_size, int req_mq,
>  	int sndbuf = INT_MAX;
>  	struct ifreq ifr;
>  	int tapfd;
> +	int ret;
>  
>  	/* TODO:
>  	 * 1. verify we can get/set vnet_hdr_len, tap_probe_vnet_hdr_len
> @@ -131,7 +132,9 @@ vhost_kernel_open_tap(char **p_ifname, int hdr_size, int req_mq,
>  		goto error;
>  	}
>  
> -	vhost_kernel_tap_set_offload(tapfd, features);
> +	ret = vhost_kernel_tap_set_offload(tapfd, features);
> +	if (ret < 0 && ret != ENOTSUP)

s/ENOTSUP/-ENOTSUP/

> +		goto error;
>  
>  	memset(&ifr, 0, sizeof(ifr));
>  	ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
> -- 
> 2.19.1
> 
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dpdk-stable] [dpdk-dev] [PATCH v2] net/virtio-user: fix return value of tap offload sets not checked
  2020-01-13  2:16 ` Tiwei Bie
@ 2020-01-13  7:26   ` wangyunjian
  0 siblings, 0 replies; 3+ messages in thread
From: wangyunjian @ 2020-01-13  7:26 UTC (permalink / raw)
  To: Tiwei Bie; +Cc: dev, maxime.coquelin, zhihong.wang, xudingke, stable

> -----Original Message-----
> From: Tiwei Bie [mailto:tiwei.bie@intel.com]
> Sent: Monday, January 13, 2020 10:16 AM
> To: wangyunjian <wangyunjian@huawei.com>
> Cc: dev@dpdk.org; maxime.coquelin@redhat.com; zhihong.wang@intel.com;
> xudingke <xudingke@huawei.com>; stable@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v2] net/virtio-user: fix return value of tap offload
> sets not checked
> 
> On Thu, Jan 09, 2020 at 08:18:24PM +0800, Yunjian Wang wrote:
> > The function vhost_kernel_tap_set_offload() could return errors, the
> > return value need to be checked. And there is no need to fail when
> > error is -ENOTSUP.
> >
> > Fixes: 1db4d2330bc8 ("net/virtio-user: check negotiated features
> > before set")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> > ---
> > v2:
> >  * No need to fail when error is -ENOTSUP.
> > ---
> >  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 76bf75423..2a0c2106d 100644
> > --- a/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
> > +++ b/drivers/net/virtio/virtio_user/vhost_kernel_tap.c
> > @@ -66,6 +66,7 @@ vhost_kernel_open_tap(char **p_ifname, int hdr_size,
> int req_mq,
> >  	int sndbuf = INT_MAX;
> >  	struct ifreq ifr;
> >  	int tapfd;
> > +	int ret;
> >
> >  	/* TODO:
> >  	 * 1. verify we can get/set vnet_hdr_len, tap_probe_vnet_hdr_len @@
> > -131,7 +132,9 @@ vhost_kernel_open_tap(char **p_ifname, int hdr_size, int
> req_mq,
> >  		goto error;
> >  	}
> >
> > -	vhost_kernel_tap_set_offload(tapfd, features);
> > +	ret = vhost_kernel_tap_set_offload(tapfd, features);
> > +	if (ret < 0 && ret != ENOTSUP)
> 
> s/ENOTSUP/-ENOTSUP/

Thanks, I will fix it in v3.

Yunjian

> 
> > +		goto error;
> >
> >  	memset(&ifr, 0, sizeof(ifr));
> >  	ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
> > --
> > 2.19.1
> >
> >

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-09 12:18 [dpdk-stable] [dpdk-dev] [PATCH v2] net/virtio-user: fix return value of tap offload sets not checked Yunjian Wang
2020-01-13  2:16 ` Tiwei Bie
2020-01-13  7:26   ` wangyunjian

patches for DPDK stable branches

Archives are clonable:
	git clone --mirror http://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ http://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable


Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/ public-inbox