Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c13da21c authored by Cong Wang's avatar Cong Wang Committed by David S. Miller
Browse files

tun: avoid calling xdp_rxq_info_unreg() twice 



Similarly to tx ring, xdp_rxq_info is only registered
when !tfile->detached, so we need to avoid calling
xdp_rxq_info_unreg() twice too. The helper tun_cleanup_tx_ring()
already checks for this properly, so it is correct to put
xdp_rxq_info_unreg() just inside there.

Reported-by: default avatar <syzbot+1c788d7ce0f0888f1d7f@syzkaller.appspotmail.com>
Fixes: 8565d26b ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net"

)
Cc: Jason Wang <jasowang@redhat.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 208e0b17

drivers/net/tun.c

+0 −2
Original line number Diff line number Diff line
@@ -774,14 +774,12 @@ static void tun_detach_all(struct net_device *dev) 
		tun_napi_del(tun, tfile);

		/* Drop read queue */

		tun_queue_purge(tfile);

		xdp_rxq_info_unreg(&tfile->xdp_rxq);

		sock_put(&tfile->sk);

		tun_cleanup_tx_ring(tfile);

	}

	list_for_each_entry_safe(tfile, tmp, &tun->disabled, next) {

		tun_enable_queue(tfile);

		tun_queue_purge(tfile);

		xdp_rxq_info_unreg(&tfile->xdp_rxq);

		sock_put(&tfile->sk);

		tun_cleanup_tx_ring(tfile);

	}