2020-07-10 12:15:34

by Stefano Garzarella

[permalink] [raw]

Subject: [PATCH] vsock/virtio: annotate 'the_virtio_vsock' RCU pointer

---

Commit 0deab087b16a ("vsock/virtio: use RCU to avoid use-after-free
on the_virtio_vsock") starts to use RCU to protect 'the_virtio_vsock'
pointer, but we forgot to annotate it.

This patch adds the annotation to fix the following sparse errors:

net/vmw_vsock/virtio_transport.c:73:17: error: incompatible types in comparison expression (different address spaces):
net/vmw_vsock/virtio_transport.c:73:17: struct virtio_vsock [noderef] __rcu *
net/vmw_vsock/virtio_transport.c:73:17: struct virtio_vsock *
net/vmw_vsock/virtio_transport.c:171:17: error: incompatible types in comparison expression (different address spaces):
net/vmw_vsock/virtio_transport.c:171:17: struct virtio_vsock [noderef] __rcu *
net/vmw_vsock/virtio_transport.c:171:17: struct virtio_vsock *
net/vmw_vsock/virtio_transport.c:207:17: error: incompatible types in comparison expression (different address spaces):
net/vmw_vsock/virtio_transport.c:207:17: struct virtio_vsock [noderef] __rcu *
net/vmw_vsock/virtio_transport.c:207:17: struct virtio_vsock *
net/vmw_vsock/virtio_transport.c:561:13: error: incompatible types in comparison expression (different address spaces):
net/vmw_vsock/virtio_transport.c:561:13: struct virtio_vsock [noderef] __rcu *
net/vmw_vsock/virtio_transport.c:561:13: struct virtio_vsock *
net/vmw_vsock/virtio_transport.c:612:9: error: incompatible types in comparison expression (different address spaces):
net/vmw_vsock/virtio_transport.c:612:9: struct virtio_vsock [noderef] __rcu *
net/vmw_vsock/virtio_transport.c:612:9: struct virtio_vsock *
net/vmw_vsock/virtio_transport.c:631:9: error: incompatible types in comparison expression (different address spaces):
net/vmw_vsock/virtio_transport.c:631:9: struct virtio_vsock [noderef] __rcu *
net/vmw_vsock/virtio_transport.c:631:9: struct virtio_vsock *

Fixes: 0deab087b16a ("vsock/virtio: use RCU to avoid use-after-free on the_virtio_vsock")
Reported-by: Michael S. Tsirkin <[email protected]>
Signed-off-by: Stefano Garzarella <[email protected]>
---
net/vmw_vsock/virtio_transport.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c
index dfbaf6bd8b1c..2700a63ab095 100644
--- a/net/vmw_vsock/virtio_transport.c
+++ b/net/vmw_vsock/virtio_transport.c
@@ -22,7 +22,7 @@
#include <net/af_vsock.h>

static struct workqueue_struct *virtio_vsock_workqueue;
-static struct virtio_vsock *the_virtio_vsock;
+static struct virtio_vsock __rcu *the_virtio_vsock;
static DEFINE_MUTEX(the_virtio_vsock_mutex); /* protects the_virtio_vsock */

struct virtio_vsock {
--
2.26.2

2020-07-13 09:29:27

by Stefan Hajnoczi

[permalink] [raw]

Subject: Re: [PATCH] vsock/virtio: annotate 'the_virtio_vsock' RCU pointer

---

On Fri, Jul 10, 2020 at 02:12:43PM +0200, Stefano Garzarella wrote:
> Commit 0deab087b16a ("vsock/virtio: use RCU to avoid use-after-free
> on the_virtio_vsock") starts to use RCU to protect 'the_virtio_vsock'
> pointer, but we forgot to annotate it.
>
> This patch adds the annotation to fix the following sparse errors:
>
> net/vmw_vsock/virtio_transport.c:73:17: error: incompatible types in comparison expression (different address spaces):
> net/vmw_vsock/virtio_transport.c:73:17: struct virtio_vsock [noderef] __rcu *
> net/vmw_vsock/virtio_transport.c:73:17: struct virtio_vsock *
> net/vmw_vsock/virtio_transport.c:171:17: error: incompatible types in comparison expression (different address spaces):
> net/vmw_vsock/virtio_transport.c:171:17: struct virtio_vsock [noderef] __rcu *
> net/vmw_vsock/virtio_transport.c:171:17: struct virtio_vsock *
> net/vmw_vsock/virtio_transport.c:207:17: error: incompatible types in comparison expression (different address spaces):
> net/vmw_vsock/virtio_transport.c:207:17: struct virtio_vsock [noderef] __rcu *
> net/vmw_vsock/virtio_transport.c:207:17: struct virtio_vsock *
> net/vmw_vsock/virtio_transport.c:561:13: error: incompatible types in comparison expression (different address spaces):
> net/vmw_vsock/virtio_transport.c:561:13: struct virtio_vsock [noderef] __rcu *
> net/vmw_vsock/virtio_transport.c:561:13: struct virtio_vsock *
> net/vmw_vsock/virtio_transport.c:612:9: error: incompatible types in comparison expression (different address spaces):
> net/vmw_vsock/virtio_transport.c:612:9: struct virtio_vsock [noderef] __rcu *
> net/vmw_vsock/virtio_transport.c:612:9: struct virtio_vsock *
> net/vmw_vsock/virtio_transport.c:631:9: error: incompatible types in comparison expression (different address spaces):
> net/vmw_vsock/virtio_transport.c:631:9: struct virtio_vsock [noderef] __rcu *
> net/vmw_vsock/virtio_transport.c:631:9: struct virtio_vsock *
>
> Fixes: 0deab087b16a ("vsock/virtio: use RCU to avoid use-after-free on the_virtio_vsock")
> Reported-by: Michael S. Tsirkin <[email protected]>
> Signed-off-by: Stefano Garzarella <[email protected]>
> ---
> net/vmw_vsock/virtio_transport.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Stefan Hajnoczi <[email protected]>

---

Attachments:

(No filename) (2.36 kB)
signature.asc (499.00 B)
Download all attachments

2020-07-13 10:57:36

by Michael S. Tsirkin

[permalink] [raw]

Subject: Re: [PATCH] vsock/virtio: annotate 'the_virtio_vsock' RCU pointer

---

On Fri, Jul 10, 2020 at 02:12:43PM +0200, Stefano Garzarella wrote:
> Commit 0deab087b16a ("vsock/virtio: use RCU to avoid use-after-free
> on the_virtio_vsock") starts to use RCU to protect 'the_virtio_vsock'
> pointer, but we forgot to annotate it.
>
> This patch adds the annotation to fix the following sparse errors:
>
> net/vmw_vsock/virtio_transport.c:73:17: error: incompatible types in comparison expression (different address spaces):
> net/vmw_vsock/virtio_transport.c:73:17: struct virtio_vsock [noderef] __rcu *
> net/vmw_vsock/virtio_transport.c:73:17: struct virtio_vsock *
> net/vmw_vsock/virtio_transport.c:171:17: error: incompatible types in comparison expression (different address spaces):
> net/vmw_vsock/virtio_transport.c:171:17: struct virtio_vsock [noderef] __rcu *
> net/vmw_vsock/virtio_transport.c:171:17: struct virtio_vsock *
> net/vmw_vsock/virtio_transport.c:207:17: error: incompatible types in comparison expression (different address spaces):
> net/vmw_vsock/virtio_transport.c:207:17: struct virtio_vsock [noderef] __rcu *
> net/vmw_vsock/virtio_transport.c:207:17: struct virtio_vsock *
> net/vmw_vsock/virtio_transport.c:561:13: error: incompatible types in comparison expression (different address spaces):
> net/vmw_vsock/virtio_transport.c:561:13: struct virtio_vsock [noderef] __rcu *
> net/vmw_vsock/virtio_transport.c:561:13: struct virtio_vsock *
> net/vmw_vsock/virtio_transport.c:612:9: error: incompatible types in comparison expression (different address spaces):
> net/vmw_vsock/virtio_transport.c:612:9: struct virtio_vsock [noderef] __rcu *
> net/vmw_vsock/virtio_transport.c:612:9: struct virtio_vsock *
> net/vmw_vsock/virtio_transport.c:631:9: error: incompatible types in comparison expression (different address spaces):
> net/vmw_vsock/virtio_transport.c:631:9: struct virtio_vsock [noderef] __rcu *
> net/vmw_vsock/virtio_transport.c:631:9: struct virtio_vsock *
>
> Fixes: 0deab087b16a ("vsock/virtio: use RCU to avoid use-after-free on the_virtio_vsock")
> Reported-by: Michael S. Tsirkin <[email protected]>
> Signed-off-by: Stefano Garzarella <[email protected]>


Acked-by: Michael S. Tsirkin <[email protected]>

who's merging this? Dave?

> ---
> net/vmw_vsock/virtio_transport.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c
> index dfbaf6bd8b1c..2700a63ab095 100644
> --- a/net/vmw_vsock/virtio_transport.c
> +++ b/net/vmw_vsock/virtio_transport.c
> @@ -22,7 +22,7 @@
> #include <net/af_vsock.h>
>
> static struct workqueue_struct *virtio_vsock_workqueue;
> -static struct virtio_vsock *the_virtio_vsock;
> +static struct virtio_vsock __rcu *the_virtio_vsock;
> static DEFINE_MUTEX(the_virtio_vsock_mutex); /* protects the_virtio_vsock */
>
> struct virtio_vsock {
> --
> 2.26.2

2020-07-15 15:09:56

by Stefano Garzarella

[permalink] [raw]

Subject: Re: [PATCH] vsock/virtio: annotate 'the_virtio_vsock' RCU pointer

---

On Mon, Jul 13, 2020 at 06:54:43AM -0400, Michael S. Tsirkin wrote:
> On Fri, Jul 10, 2020 at 02:12:43PM +0200, Stefano Garzarella wrote:
> > Commit 0deab087b16a ("vsock/virtio: use RCU to avoid use-after-free
> > on the_virtio_vsock") starts to use RCU to protect 'the_virtio_vsock'
> > pointer, but we forgot to annotate it.
> >
> > This patch adds the annotation to fix the following sparse errors:
> >
> > net/vmw_vsock/virtio_transport.c:73:17: error: incompatible types in comparison expression (different address spaces):
> > net/vmw_vsock/virtio_transport.c:73:17: struct virtio_vsock [noderef] __rcu *
> > net/vmw_vsock/virtio_transport.c:73:17: struct virtio_vsock *
> > net/vmw_vsock/virtio_transport.c:171:17: error: incompatible types in comparison expression (different address spaces):
> > net/vmw_vsock/virtio_transport.c:171:17: struct virtio_vsock [noderef] __rcu *
> > net/vmw_vsock/virtio_transport.c:171:17: struct virtio_vsock *
> > net/vmw_vsock/virtio_transport.c:207:17: error: incompatible types in comparison expression (different address spaces):
> > net/vmw_vsock/virtio_transport.c:207:17: struct virtio_vsock [noderef] __rcu *
> > net/vmw_vsock/virtio_transport.c:207:17: struct virtio_vsock *
> > net/vmw_vsock/virtio_transport.c:561:13: error: incompatible types in comparison expression (different address spaces):
> > net/vmw_vsock/virtio_transport.c:561:13: struct virtio_vsock [noderef] __rcu *
> > net/vmw_vsock/virtio_transport.c:561:13: struct virtio_vsock *
> > net/vmw_vsock/virtio_transport.c:612:9: error: incompatible types in comparison expression (different address spaces):
> > net/vmw_vsock/virtio_transport.c:612:9: struct virtio_vsock [noderef] __rcu *
> > net/vmw_vsock/virtio_transport.c:612:9: struct virtio_vsock *
> > net/vmw_vsock/virtio_transport.c:631:9: error: incompatible types in comparison expression (different address spaces):
> > net/vmw_vsock/virtio_transport.c:631:9: struct virtio_vsock [noderef] __rcu *
> > net/vmw_vsock/virtio_transport.c:631:9: struct virtio_vsock *
> >
> > Fixes: 0deab087b16a ("vsock/virtio: use RCU to avoid use-after-free on the_virtio_vsock")
> > Reported-by: Michael S. Tsirkin <[email protected]>
> > Signed-off-by: Stefano Garzarella <[email protected]>
>
>
> Acked-by: Michael S. Tsirkin <[email protected]>
>
> who's merging this? Dave?

I think so, but I forgot the 'net' tag :-(

I'll wait to see if Dave will queue this, otherwise I'll resend with
the 'net' tag.

Thanks,
Stefano

2020-07-16 00:50:33

by Jakub Kicinski

[permalink] [raw]

Subject: Re: [PATCH] vsock/virtio: annotate 'the_virtio_vsock' RCU pointer

---

On Wed, 15 Jul 2020 16:34:46 +0200 Stefano Garzarella wrote:
> > Acked-by: Michael S. Tsirkin <[email protected]>
> >
> > who's merging this? Dave?
>
> I think so, but I forgot the 'net' tag :-(
>
> I'll wait to see if Dave will queue this, otherwise I'll resend with
> the 'net' tag.

Applied to net now, thanks!