提交 7063efd3 编写于 作者: J Jason Wang 提交者: David S. Miller

tuntap: fix use after free during release

After commit b196d88a ("tun: fix use after free for ptr_ring") we
need clean up tx ring during release(). But unfortunately, it tries to
do the cleanup blindly after socket were destroyed which will lead
another use-after-free. Fix this by doing the cleanup before dropping
the last reference of the socket in __tun_detach().
Reported-by: NAndrei Vagin <avagin@virtuozzo.com>
Acked-by: NAndrei Vagin <avagin@virtuozzo.com>
Fixes: b196d88a ("tun: fix use after free for ptr_ring")
Signed-off-by: NJason Wang <jasowang@redhat.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 fee8fb95
...@@ -729,6 +729,7 @@ static void __tun_detach(struct tun_file *tfile, bool clean) ...@@ -729,6 +729,7 @@ static void __tun_detach(struct tun_file *tfile, bool clean)
} }
if (tun) if (tun)
xdp_rxq_info_unreg(&tfile->xdp_rxq); xdp_rxq_info_unreg(&tfile->xdp_rxq);
ptr_ring_cleanup(&tfile->tx_ring, tun_ptr_free);
sock_put(&tfile->sk); sock_put(&tfile->sk);
} }
} }
...@@ -3245,7 +3246,6 @@ static int tun_chr_close(struct inode *inode, struct file *file) ...@@ -3245,7 +3246,6 @@ static int tun_chr_close(struct inode *inode, struct file *file)
struct tun_file *tfile = file->private_data; struct tun_file *tfile = file->private_data;
tun_detach(tfile, true); tun_detach(tfile, true);
ptr_ring_cleanup(&tfile->tx_ring, tun_ptr_free);
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册