From: wangyunjian <wangyunjian@huawei•com>
To: "Michael S. Tsirkin" <mst@redhat•com>
Cc: "kuba@kernel•org" <kuba@kernel•org>,
"davem@davemloft•net" <davem@davemloft•net>,
"netdev@vger•kernel.org" <netdev@vger•kernel.org>,
"jasowang@redhat•com" <jasowang@redhat•com>,
dingxiaoxiong <dingxiaoxiong@huawei•com>
Subject: RE: [PATCH net] virtio_net: check virtqueue_add_sgs() return value
Date: Tue, 6 Jul 2021 03:16:33 +0000 [thread overview]
Message-ID: <ab0eec15304f498c8e25c28ec081b89e@huawei.com> (raw)
In-Reply-To: <20210705140505-mutt-send-email-mst@kernel.org>
> -----Original Message-----
> From: Michael S. Tsirkin [mailto:mst@redhat•com]
> Sent: Tuesday, July 6, 2021 2:08 AM
> To: wangyunjian <wangyunjian@huawei•com>
> Cc: kuba@kernel•org; davem@davemloft•net; netdev@vger•kernel.org;
> jasowang@redhat•com; dingxiaoxiong <dingxiaoxiong@huawei•com>
> Subject: Re: [PATCH net] virtio_net: check virtqueue_add_sgs() return value
>
> On Mon, Jul 05, 2021 at 09:53:39PM +0800, wangyunjian wrote:
> > From: Yunjian Wang <wangyunjian@huawei•com>
> >
> > As virtqueue_add_sgs() can fail, we should check the return value.
> >
> > Addresses-Coverity-ID: 1464439 ("Unchecked return value")
> > Fixes: a7c58146cf9a ("virtio_net: don't crash if virtqueue is
> > broken.")
>
> What does this have to do with it?
It's this commit that removes the check.
So delete this fix tag?
>
> > Signed-off-by: Yunjian Wang <wangyunjian@huawei•com>
> > ---
> > drivers/net/virtio_net.c | 5 ++++-
> > 1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index
> > b0b81458ca94..2b852578551e 100644
> > --- a/drivers/net/virtio_net.c
> > +++ b/drivers/net/virtio_net.c
> > @@ -1743,6 +1743,7 @@ static bool virtnet_send_command(struct
> > virtnet_info *vi, u8 class, u8 cmd, {
> > struct scatterlist *sgs[4], hdr, stat;
> > unsigned out_num = 0, tmp;
> > + int ret;
> >
> > /* Caller should know better */
> > BUG_ON(!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ)); @@
> > -1762,7 +1763,9 @@ static bool virtnet_send_command(struct virtnet_info
> *vi, u8 class, u8 cmd,
> > sgs[out_num] = &stat;
> >
> > BUG_ON(out_num + 1 > ARRAY_SIZE(sgs));
> > - virtqueue_add_sgs(vi->cvq, sgs, out_num, 1, vi, GFP_ATOMIC);
> > + ret = virtqueue_add_sgs(vi->cvq, sgs, out_num, 1, vi, GFP_ATOMIC);
> > + if (ret < 0)
> > + return false;
>
> and maybe dev_warn here. these things should not happen.
OK, I will add it in next version.
Thanks
Yunjian
>
>
> >
> > if (unlikely(!virtqueue_kick(vi->cvq)))
> > return vi->ctrl->status == VIRTIO_NET_OK;
> > --
> > 2.23.0
prev parent reply other threads:[~2021-07-06 3:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-05 13:53 [PATCH net] virtio_net: check virtqueue_add_sgs() return value wangyunjian
2021-07-05 18:08 ` Michael S. Tsirkin
2021-07-06 3:16 ` wangyunjian [this message]
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=ab0eec15304f498c8e25c28ec081b89e@huawei.com \
--to=wangyunjian@huawei$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=dingxiaoxiong@huawei$(echo .)com \
--cc=jasowang@redhat$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=mst@redhat$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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