[dpdk-dev] [PATCH 0/2] Fix Coverity issues for virtio-pci and vhost-user msg

[dpdk-dev] [PATCH 0/2] Fix Coverity issues for virtio-pci and vhost-user msg

[Tiwei Bie]

Tiwei Bie (2):
  net/virtio: fix unchecked return value
  vhost: remove unneeded null pointer check

 drivers/net/virtio/virtio_pci.c | 10 ++++++++--
 lib/librte_vhost/vhost_user.c   |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

-- 
2.19.1

[dpdk-dev] [PATCH 1/2] net/virtio: fix unchecked return value

[Tiwei Bie]

Coverity issue: 302861
Fixes: 6ba1f63b5ab0 ("virtio: support specification 1.0")

Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
---
This patch can't be backported because it depends on the
API change introduced by below commit in this release.

commit e8d435f1f3a1 ("bus/pci: harmonize return value of config read")

 drivers/net/virtio/virtio_pci.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
index 21110cd69..c8883c32e 100644
--- a/drivers/net/virtio/virtio_pci.c
+++ b/drivers/net/virtio/virtio_pci.c
@@ -614,9 +614,15 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw)
 			hw->common_cfg = get_cfg_addr(dev, &cap);
 			break;
 		case VIRTIO_PCI_CAP_NOTIFY_CFG:
-			rte_pci_read_config(dev, &hw->notify_off_multiplier,
+			ret = rte_pci_read_config(dev,
+					&hw->notify_off_multiplier,
 					4, pos + sizeof(cap));
-			hw->notify_base = get_cfg_addr(dev, &cap);
+			if (ret != 4)
+				PMD_INIT_LOG(DEBUG,
+					"failed to read notify_off_multiplier, ret %d",
+					ret);
+			else
+				hw->notify_base = get_cfg_addr(dev, &cap);
 			break;
 		case VIRTIO_PCI_CAP_DEVICE_CFG:
 			hw->dev_cfg = get_cfg_addr(dev, &cap);
-- 
2.19.1

[dpdk-dev] [PATCH 2/2] vhost: remove unneeded null pointer check

[Tiwei Bie]

The caller will guarantee that msg won't be null. Remove
the unneeded null pointer check which caused a Coverity
warning.

Coverity issue: 323484
Fixes: 8f972312b8f4 ("vhost: support vhost-user")
Cc: stable@dpdk.org

Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
---
 lib/librte_vhost/vhost_user.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index cc154f312..3ea64eba6 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -1732,7 +1732,7 @@ read_vhost_message(int sockfd, struct VhostUserMsg *msg)
 	if (ret <= 0)
 		return ret;
 
-	if (msg && msg->size) {
+	if (msg->size) {
 		if (msg->size > sizeof(msg->payload)) {
 			RTE_LOG(ERR, VHOST_CONFIG,
 				"invalid msg size: %d\n", msg->size);
-- 
2.19.1

Re: [dpdk-dev] [PATCH 1/2] net/virtio: fix unchecked return value

[Maxime Coquelin]

On 11/7/18 10:01 AM, Tiwei Bie wrote:
> Coverity issue: 302861
> Fixes: 6ba1f63b5ab0 ("virtio: support specification 1.0")
> 
> Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
> ---
> This patch can't be backported because it depends on the
> API change introduced by below commit in this release.
> 
> commit e8d435f1f3a1 ("bus/pci: harmonize return value of config read")
> 
>   drivers/net/virtio/virtio_pci.c | 10 ++++++++--
>   1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
> index 21110cd69..c8883c32e 100644
> --- a/drivers/net/virtio/virtio_pci.c
> +++ b/drivers/net/virtio/virtio_pci.c
> @@ -614,9 +614,15 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw)
>   			hw->common_cfg = get_cfg_addr(dev, &cap);
>   			break;
>   		case VIRTIO_PCI_CAP_NOTIFY_CFG:
> -			rte_pci_read_config(dev, &hw->notify_off_multiplier,
> +			ret = rte_pci_read_config(dev,
> +					&hw->notify_off_multiplier,
>   					4, pos + sizeof(cap));
> -			hw->notify_base = get_cfg_addr(dev, &cap);
> +			if (ret != 4)
> +				PMD_INIT_LOG(DEBUG,
> +					"failed to read notify_off_multiplier, ret %d",
> +					ret);
> +			else
> +				hw->notify_base = get_cfg_addr(dev, &cap);
>   			break;
>   		case VIRTIO_PCI_CAP_DEVICE_CFG:
>   			hw->dev_cfg = get_cfg_addr(dev, &cap);
> 

Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

Thanks,
Maxime

Re: [dpdk-dev] [PATCH 2/2] vhost: remove unneeded null pointer check

[Maxime Coquelin]

On 11/7/18 10:01 AM, Tiwei Bie wrote:
> The caller will guarantee that msg won't be null. Remove
> the unneeded null pointer check which caused a Coverity
> warning.
> 
> Coverity issue: 323484
> Fixes: 8f972312b8f4 ("vhost: support vhost-user")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
> ---
>   lib/librte_vhost/vhost_user.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
> index cc154f312..3ea64eba6 100644
> --- a/lib/librte_vhost/vhost_user.c
> +++ b/lib/librte_vhost/vhost_user.c
> @@ -1732,7 +1732,7 @@ read_vhost_message(int sockfd, struct VhostUserMsg *msg)
>   	if (ret <= 0)
>   		return ret;
>   
> -	if (msg && msg->size) {
> +	if (msg->size) {
>   		if (msg->size > sizeof(msg->payload)) {
>   			RTE_LOG(ERR, VHOST_CONFIG,
>   				"invalid msg size: %d\n", msg->size);
> 

Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

Thanks,
Maxime

Re: [dpdk-dev] [PATCH 0/2] Fix Coverity issues for virtio-pci and vhost-user msg

[Maxime Coquelin]

On 11/7/18 10:01 AM, Tiwei Bie wrote:
> Tiwei Bie (2):
>    net/virtio: fix unchecked return value
>    vhost: remove unneeded null pointer check
> 
>   drivers/net/virtio/virtio_pci.c | 10 ++++++++--
>   lib/librte_vhost/vhost_user.c   |  2 +-
>   2 files changed, 9 insertions(+), 3 deletions(-)
> 


Applied to dpdk-next-virtio/master

Thanks,
Maxime