From: "Michael S. Tsirkin" <mst@redhat•com>
To: wangyunjian <wangyunjian@huawei•com>
Cc: kuba@kernel•org, davem@davemloft•net, netdev@vger•kernel.org,
jasowang@redhat•com, dingxiaoxiong@huawei•com
Subject: Re: [PATCH net] virtio_net: check virtqueue_add_sgs() return value
Date: Mon, 5 Jul 2021 14:08:22 -0400 [thread overview]
Message-ID: <20210705140505-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <63453491987be2b31062449bd59224faca9f546a.1625486802.git.wangyunjian@huawei.com>
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?
> 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.
>
> if (unlikely(!virtqueue_kick(vi->cvq)))
> return vi->ctrl->status == VIRTIO_NET_OK;
> --
> 2.23.0
next prev parent reply other threads:[~2021-07-05 18:08 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 [this message]
2021-07-06 3:16 ` wangyunjian
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=20210705140505-mutt-send-email-mst@kernel.org \
--to=mst@redhat$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=dingxiaoxiong@huawei$(echo .)com \
--cc=jasowang@redhat$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=wangyunjian@huawei$(echo .)com \
/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