netdev - Re: [PATCH net 1/7] virtio_net: Don't enable NAPI when interface is down

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <6f315078-fbe1-07fc-e645-08a25d6c34c0@redhat.com>
Date:   Thu, 17 Jan 2019 20:38:20 +0800
From:   Jason Wang <jasowang@...hat.com>
To:     Toshiaki Makita <makita.toshiaki@....ntt.co.jp>,
        "David S. Miller" <davem@...emloft.net>,
        "Michael S. Tsirkin" <mst@...hat.com>
Cc:     netdev@...r.kernel.org, virtualization@...ts.linux-foundation.org
Subject: Re: [PATCH net 1/7] virtio_net: Don't enable NAPI when interface is
 down


On 2019/1/17 下午7:20, Toshiaki Makita wrote:
> Commit 4e09ff536284 ("virtio-net: disable NAPI only when enabled during
> XDP set") tried to fix inappropriate NAPI enabling/disabling when
> !netif_running(), but was not complete.
>
> On error path virtio_net could enable NAPI even when !netif_running().
> This can cause enabling NAPI twice on virtnet_open(), which would
> trigger BUG_ON() in napi_enable().
>
> Fixes: 4941d472bf95b ("virtio-net: do not reset during XDP set")
> Signed-off-by: Toshiaki Makita <makita.toshiaki@....ntt.co.jp>
> ---
>   drivers/net/virtio_net.c | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index 0237250..a08da9e 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -2430,8 +2430,10 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog,
>   	return 0;
>   
>   err:
> -	for (i = 0; i < vi->max_queue_pairs; i++)
> -		virtnet_napi_enable(vi->rq[i].vq, &vi->rq[i].napi);
> +	if (netif_running(dev)) {
> +		for (i = 0; i < vi->max_queue_pairs; i++)
> +			virtnet_napi_enable(vi->rq[i].vq, &vi->rq[i].napi);
> +	}
>   	if (prog)
>   		bpf_prog_sub(prog, vi->max_queue_pairs - 1);
>   	return err;


Acked-by: Jason Wang <jasowang@...hat.com>