Fix double fget() in vhost_net_set_backend()
PATCH 1/1 Fix double fget() in vhost_net_set_backend()
From: Al Viro <[email protected]>
commit fb4554c2232e44d595920f4d5c66cf8f7d13f9bc upstream.
Descriptor table is a shared resource; two fget() on the same descriptor may return different struct file references. get_tap_ptr_ring() is called after we'd found (and pinned) the socket we'll be using and it tries to find the private tun/tap data structures associated with it. Redoing the lookup by the same file descriptor we'd used to get the socket is racy - we need to same struct file.
Thanks to Jason for spotting a braino in the original variant of patch - I'd missed the use of fd == -1 for disabling backend, and in that case we can end up with sock == NULL and sock != oldsock.
--- drivers/vhost/net.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/vhost/net.c +7 -8
@@ -1047,13 +1047,9 @@ static struct socket *get_raw_socket(int fd)return ERR_PTR (r); } -static struct skb_array *get_tap_skb_array (int fd) +static struct skb_array *get_tap_skb_array (struct file *file) {struct skb_array *array; -struct file *file =fget (fd); - -if (!file) -return NULL ; array =tun_get_skb_array (file);if (!IS_ERR (array)) goto out;
@@ -1062,7 +1058,6 @@ static struct skb_array *get_tap_skb_array(int fd) goto out; array =NULL ; out: -fput (file);return array; }
@@ -1143,8 +1138,12 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd)vhost_net_disable_vq (n, vq); vq->private_data = sock;vhost_net_buf_unproduce (nvq); -if (index ==VHOST_NET_VQ_RX ) - nvq->rx_array =get_tap_skb_array (fd); +if (index ==VHOST_NET_VQ_RX ) { +if (sock) + nvq->rx_array =get_tap_skb_array (sock->file); +else + nvq->rx_array =NULL ; + } r =vhost_vq_init_access (vq);if (r) goto err_used;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerQuoted 15 lines · Samuel Mendoza-Jonas
From: Al Viro <[email protected]>
commit
fb4554c2232e44d595920f4d5c66cf8f7d13f9bcupstream.Descriptor table is a shared resource; two
fget()on the same descriptor may return different struct file references.get_tap_ptr_ring()is called after we'd found (and pinned) the socket we'll be using and it tries to find the private tun/tap data structures associated with it. Redoing the lookup by the same file descriptor we'd used to get the socket is racy - we need to same struct file.Thanks to Jason for spotting a braino in the original variant of patch - I'd missed the use of fd == -1 for disabling backend, and in that case we can end up with sock == NULL and sock != oldsock.
Quoted 5 lines
Signed-off-by Jason Wang <[email protected]>Signed-off-by Al Viro <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
I did not sign off on this patch, where did that come from?
Please be more careful.
thanks,
greg k-h
Quoted 26 lines · Greg Kroah-Hartman
CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you can confirm the sender and know the content is safe.
Quoted 15 lines · Samuel Mendoza-Jonas
From: Al Viro <[email protected]>
commit
fb4554c2232e44d595920f4d5c66cf8f7d13f9bcupstream.Descriptor table is a shared resource; two
fget()on the same descriptor may return different struct file references.get_tap_ptr_ring()is called after we'd found (and pinned) the socket we'll be using and it tries to find the private tun/tap data structures associated with it. Redoing the lookup by the same file descriptor we'd used to get the socket is racy - we need to same struct file.Thanks to Jason for spotting a braino in the original variant of patch - I'd missed the use of fd == -1 for disabling backend, and in that case we can end up with sock == NULL and sock != oldsock.
Quoted 5 lines
Signed-off-by Jason Wang <[email protected]>Signed-off-by Al Viro <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 7 lines
I did not sign off on this patch, where did that come from?
Please be more careful.
thanks,
greg k-h
Ah my apologies, that must have come from the commit to the other stable branches.
Thanks,
Sam