diff mbox

[dpdk-dev,1/4] net/virtio-user: fix return value not checked

Message ID 1467191137-65087-2-git-send-email-jianfeng.tan@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Yuanhan Liu
Headers

Commit Message

Jianfeng Tan June 29, 2016, 9:05 a.m. UTC 
  When return values of function calls are not checked, Coverity will
report errors like:

    if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_PATH) == 1)
    >>>     CID 127477:    (CHECKED_RETURN)
    >>>     Calling "rte_kvargs_process" without checking return value
            (as is done elsewhere 25 out of 30 times).
         		rte_kvargs_process(kvlist, VIRTIO_USER_ARG_PATH,
         				   &get_string_arg, &path);

Coverity issue: 127344, 127478

Fixes: ce2eabdd43ec ("net/virtio-user: add virtual device")
Fixes: 6a84c37e3975 ("net/virtio-user: add vhost-user adapter layer")

Signed-off-by: Jianfeng Tan <jianfeng.tan@intel.com>
---
 drivers/net/virtio/virtio_user/vhost_user.c |  3 +-
 drivers/net/virtio/virtio_user_ethdev.c     | 57 ++++++++++++++++++++++-------
 2 files changed, 45 insertions(+), 15 deletions(-)

Comments

Yuanhan Liu July 1, 2016, 2:15 a.m. UTC | #1 
On Wed, Jun 29, 2016 at 09:05:33AM +0000, Jianfeng Tan wrote:
> -	if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_CQ_NUM) == 1)
> -		rte_kvargs_process(kvlist, VIRTIO_USER_ARG_CQ_NUM,
> -				   &get_integer_arg, &cq);
> +	if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_CQ_NUM) == 1) {
> +		ret = rte_kvargs_process(kvlist, VIRTIO_USER_ARG_CQ_NUM,
> +					 &get_integer_arg, &cq);
> +		if (ret < 0) {
> +			PMD_INIT_LOG(ERR, "error to parse %s",
> +				     VIRTIO_USER_ARG_CQ_NUM);
> +			goto end;
> +		}
> +	}
>  	else if (queues > 1)

Above 2 lines should be in one line. Fixed, and series applied to
dpdk-next-virtio.

Thanks.

	--yliu
Jianfeng Tan July 5, 2016, 10:14 a.m. UTC | #2 
Hi Yuanhan,

> -----Original Message-----
> From: Yuanhan Liu [mailto:yuanhan.liu@linux.intel.com]
> Sent: Friday, July 1, 2016 10:16 AM
> To: Tan, Jianfeng
> Cc: dev@dpdk.org; Xie, Huawei; Mcnamara, John
> Subject: Re: [PATCH 1/4] net/virtio-user: fix return value not checked
> 
> On Wed, Jun 29, 2016 at 09:05:33AM +0000, Jianfeng Tan wrote:
> > -	if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_CQ_NUM) == 1)
> > -		rte_kvargs_process(kvlist, VIRTIO_USER_ARG_CQ_NUM,
> > -				   &get_integer_arg, &cq);
> > +	if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_CQ_NUM) == 1) {
> > +		ret = rte_kvargs_process(kvlist,
> VIRTIO_USER_ARG_CQ_NUM,
> > +					 &get_integer_arg, &cq);
> > +		if (ret < 0) {
> > +			PMD_INIT_LOG(ERR, "error to parse %s",
> > +				     VIRTIO_USER_ARG_CQ_NUM);
> > +			goto end;
> > +		}
> > +	}
> >  	else if (queues > 1)
> 
> Above 2 lines should be in one line. Fixed, and series applied to
> dpdk-next-virtio.

Thanks.

But there's another problem in the commit log: the Coverity defect ID should be "127477, 127478"  instead of "127344, 127478". Can you please help make it right?

Thanks,
Jianfeng

> 
> Thanks.
> 
> 	--yliu
Yuanhan Liu July 5, 2016, 11:31 a.m. UTC | #3 
On Tue, Jul 05, 2016 at 10:14:28AM +0000, Tan, Jianfeng wrote:
> > On Wed, Jun 29, 2016 at 09:05:33AM +0000, Jianfeng Tan wrote:
> > > -	if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_CQ_NUM) == 1)
> > > -		rte_kvargs_process(kvlist, VIRTIO_USER_ARG_CQ_NUM,
> > > -				   &get_integer_arg, &cq);
> > > +	if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_CQ_NUM) == 1) {
> > > +		ret = rte_kvargs_process(kvlist,
> > VIRTIO_USER_ARG_CQ_NUM,
> > > +					 &get_integer_arg, &cq);
> > > +		if (ret < 0) {
> > > +			PMD_INIT_LOG(ERR, "error to parse %s",
> > > +				     VIRTIO_USER_ARG_CQ_NUM);
> > > +			goto end;
> > > +		}
> > > +	}
> > >  	else if (queues > 1)
> > 
> > Above 2 lines should be in one line. Fixed, and series applied to
> > dpdk-next-virtio.
> 
> Thanks.
> 
> But there's another problem in the commit log: the Coverity defect ID should be "127477, 127478"  instead of "127344, 127478". Can you please help make it right?

Done.

	--yliu
diff mbox

Patch

diff --git a/drivers/net/virtio/virtio_user/vhost_user.c b/drivers/net/virtio/virtio_user/vhost_user.c
index a2b0687..a159ece 100644
--- a/drivers/net/virtio/virtio_user/vhost_user.c
+++ b/drivers/net/virtio/virtio_user/vhost_user.c
@@ -392,7 +392,8 @@  vhost_user_setup(const char *path)
 	}
 
 	flag = fcntl(fd, F_GETFD);
-	fcntl(fd, F_SETFD, flag | FD_CLOEXEC);
+	if (fcntl(fd, F_SETFD, flag | FD_CLOEXEC) < 0)
+		PMD_DRV_LOG(WARNING, "fcntl failed, %s", strerror(errno));
 
 	memset(&un, 0, sizeof(un));
 	un.sun_family = AF_UNIX;
diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
index 5ab2471..8429b2e 100644
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -343,29 +343,58 @@  virtio_user_pmd_devinit(const char *name, const char *params)
 	}
 
 	if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_PATH) == 1)
-		rte_kvargs_process(kvlist, VIRTIO_USER_ARG_PATH,
-				   &get_string_arg, &path);
+		ret = rte_kvargs_process(kvlist, VIRTIO_USER_ARG_PATH,
+					 &get_string_arg, &path);
+		if (ret < 0) {
+			PMD_INIT_LOG(ERR, "error to parse %s",
+				     VIRTIO_USER_ARG_PATH);
+			goto end;
+		}
 	else {
 		PMD_INIT_LOG(ERR, "arg %s is mandatory for virtio-user\n",
 			  VIRTIO_USER_ARG_QUEUE_SIZE);
 		goto end;
 	}
 
-	if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_MAC) == 1)
-		rte_kvargs_process(kvlist, VIRTIO_USER_ARG_MAC,
-				   &get_string_arg, &mac_addr);
+	if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_MAC) == 1) {
+		ret = rte_kvargs_process(kvlist, VIRTIO_USER_ARG_MAC,
+					 &get_string_arg, &mac_addr);
+		if (ret < 0) {
+			PMD_INIT_LOG(ERR, "error to parse %s",
+				     VIRTIO_USER_ARG_MAC);
+			goto end;
+		}
+	}
 
-	if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_QUEUE_SIZE) == 1)
-		rte_kvargs_process(kvlist, VIRTIO_USER_ARG_QUEUE_SIZE,
-				   &get_integer_arg, &queue_size);
+	if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_QUEUE_SIZE) == 1) {
+		ret = rte_kvargs_process(kvlist, VIRTIO_USER_ARG_QUEUE_SIZE,
+					 &get_integer_arg, &queue_size);
+		if (ret < 0) {
+			PMD_INIT_LOG(ERR, "error to parse %s",
+				     VIRTIO_USER_ARG_QUEUE_SIZE);
+			goto end;
+		}
+	}
 
-	if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_QUEUES_NUM) == 1)
-		rte_kvargs_process(kvlist, VIRTIO_USER_ARG_QUEUES_NUM,
-				   &get_integer_arg, &queues);
+	if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_QUEUES_NUM) == 1) {
+		ret = rte_kvargs_process(kvlist, VIRTIO_USER_ARG_QUEUES_NUM,
+					 &get_integer_arg, &queues);
+		if (ret < 0) {
+			PMD_INIT_LOG(ERR, "error to parse %s",
+				     VIRTIO_USER_ARG_QUEUES_NUM);
+			goto end;
+		}
+	}
 
-	if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_CQ_NUM) == 1)
-		rte_kvargs_process(kvlist, VIRTIO_USER_ARG_CQ_NUM,
-				   &get_integer_arg, &cq);
+	if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_CQ_NUM) == 1) {
+		ret = rte_kvargs_process(kvlist, VIRTIO_USER_ARG_CQ_NUM,
+					 &get_integer_arg, &cq);
+		if (ret < 0) {
+			PMD_INIT_LOG(ERR, "error to parse %s",
+				     VIRTIO_USER_ARG_CQ_NUM);
+			goto end;
+		}
+	}
 	else if (queues > 1)
 		cq = 1;