patches for DPDK stable branches
 help / color / mirror / Atom feed
From: wangyunjian <wangyunjian@huawei.com>
To: Maxime Coquelin <maxime.coquelin@redhat.com>,
	Marvin Liu <yong.liu@intel.com>,
	"chenbo.xia@intel.com" <chenbo.xia@intel.com>
Cc: "dev@dpdk.org" <dev@dpdk.org>, "stable@dpdk.org" <stable@dpdk.org>
Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH] vhost: fix accessing uninitialized variables
Date: Sat, 27 Mar 2021 10:06:09 +0000	[thread overview]
Message-ID: <dc5f5132a35b4769b01f7217e1687e91@huawei.com> (raw)
In-Reply-To: <9a853981-06f8-4ab4-f6a8-322ae8629a4b@redhat.com>

> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Maxime Coquelin
> Sent: Wednesday, March 24, 2021 5:55 PM
> To: Marvin Liu <yong.liu@intel.com>; chenbo.xia@intel.com
> Cc: dev@dpdk.org; stable@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] vhost: fix accessing uninitialized variables
> 
> 
> 
> On 3/3/21 8:27 AM, Marvin Liu wrote:
> > This patch fixs coverity issue by adding initialization step before
> > using temporary virtio header.
> >
> > Coverity issue: 366181, 366123
> > Fixes: fb3815cc614d ("vhost: handle virtually non-contiguous buffers
> > in Rx-mrg")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Marvin Liu <yong.liu@intel.com>
> >
> > diff --git a/lib/librte_vhost/virtio_net.c
> > b/lib/librte_vhost/virtio_net.c index 583bf379c6..fe464b3088 100644
> > --- a/lib/librte_vhost/virtio_net.c
> > +++ b/lib/librte_vhost/virtio_net.c
> > @@ -808,9 +808,10 @@ copy_mbuf_to_desc(struct virtio_net *dev, struct
> > vhost_virtqueue *vq,
> >
> >  	hdr_mbuf = m;
> >  	hdr_addr = buf_addr;
> > -	if (unlikely(buf_len < dev->vhost_hlen))
> > +	if (unlikely(buf_len < dev->vhost_hlen)) {
> > +		memset(&tmp_hdr, 0, sizeof(struct virtio_net_hdr_mrg_rxbuf));
> >  		hdr = &tmp_hdr;
> > -	else
> > +	} else
> >  		hdr = (struct virtio_net_hdr_mrg_rxbuf *)(uintptr_t)hdr_addr;
> >
> >  	VHOST_LOG_DATA(DEBUG, "(%d) RX: num merge buffers %d\n",
> >

I think it's better to revise it in this way:

diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c
index 583bf37..ccb73b9 100644
--- a/lib/librte_vhost/virtio_net.c
+++ b/lib/librte_vhost/virtio_net.c
@@ -420,6 +420,8 @@
                        net_hdr->csum_offset = (offsetof(struct rte_sctp_hdr,
                                                cksum));
                        break;
+               default:
+                       ASSIGN_UNLESS_EQUAL(net_hdr->csum_offset, 0);
                }

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


  reply	other threads:[~2021-03-27 10:06 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-03  7:27 [dpdk-stable] " Marvin Liu
2021-03-24  9:54 ` Maxime Coquelin
2021-03-27 10:06   ` wangyunjian [this message]
2021-03-29  1:44     ` [dpdk-stable] [dpdk-dev] " Liu, Yong
2021-04-06  6:17 ` [dpdk-stable] " Xia, Chenbo
2021-04-07  2:48   ` Liu, Yong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=dc5f5132a35b4769b01f7217e1687e91@huawei.com \
    --to=wangyunjian@huawei.com \
    --cc=chenbo.xia@intel.com \
    --cc=dev@dpdk.org \
    --cc=maxime.coquelin@redhat.com \
    --cc=stable@dpdk.org \
    --cc=yong.liu@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).