* [PATCH] vsock/virtio: annotate 'the_virtio_vsock' RCU pointer
@ 2020-07-10 12:12 Stefano Garzarella
2020-07-13 9:28 ` Stefan Hajnoczi
2020-07-13 10:54 ` Michael S. Tsirkin
0 siblings, 2 replies; 5+ messages in thread
From: Stefano Garzarella @ 2020-07-10 12:12 UTC (permalink / raw)
To: davem
Cc: Stefano Garzarella, Stefan Hajnoczi, virtualization,
Michael S. Tsirkin, linux-kernel, netdev, Jakub Kicinski, kvm
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 <mst@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] vsock/virtio: annotate 'the_virtio_vsock' RCU pointer
2020-07-10 12:12 [PATCH] vsock/virtio: annotate 'the_virtio_vsock' RCU pointer Stefano Garzarella
@ 2020-07-13 9:28 ` Stefan Hajnoczi
2020-07-13 10:54 ` Michael S. Tsirkin
1 sibling, 0 replies; 5+ messages in thread
From: Stefan Hajnoczi @ 2020-07-13 9:28 UTC (permalink / raw)
To: Stefano Garzarella
Cc: davem, virtualization, Michael S. Tsirkin, linux-kernel, netdev,
Jakub Kicinski, kvm
[-- Attachment #1: Type: text/plain, Size: 2421 bytes --]
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 <mst@redhat.com>
> Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
> ---
> net/vmw_vsock/virtio_transport.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] vsock/virtio: annotate 'the_virtio_vsock' RCU pointer
2020-07-10 12:12 [PATCH] vsock/virtio: annotate 'the_virtio_vsock' RCU pointer Stefano Garzarella
2020-07-13 9:28 ` Stefan Hajnoczi
@ 2020-07-13 10:54 ` Michael S. Tsirkin
2020-07-15 14:34 ` Stefano Garzarella
1 sibling, 1 reply; 5+ messages in thread
From: Michael S. Tsirkin @ 2020-07-13 10:54 UTC (permalink / raw)
To: Stefano Garzarella
Cc: davem, Stefan Hajnoczi, virtualization, linux-kernel, netdev,
Jakub Kicinski, kvm
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 <mst@redhat.com>
> Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] vsock/virtio: annotate 'the_virtio_vsock' RCU pointer
2020-07-13 10:54 ` Michael S. Tsirkin
@ 2020-07-15 14:34 ` Stefano Garzarella
2020-07-16 0:49 ` Jakub Kicinski
0 siblings, 1 reply; 5+ messages in thread
From: Stefano Garzarella @ 2020-07-15 14:34 UTC (permalink / raw)
To: Michael S. Tsirkin, davem
Cc: davem, Stefan Hajnoczi, virtualization, linux-kernel, netdev,
Jakub Kicinski, kvm
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 <mst@redhat.com>
> > Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
>
>
> Acked-by: Michael S. Tsirkin <mst@redhat.com>
>
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] vsock/virtio: annotate 'the_virtio_vsock' RCU pointer
2020-07-15 14:34 ` Stefano Garzarella
@ 2020-07-16 0:49 ` Jakub Kicinski
0 siblings, 0 replies; 5+ messages in thread
From: Jakub Kicinski @ 2020-07-16 0:49 UTC (permalink / raw)
To: Stefano Garzarella
Cc: Michael S. Tsirkin, davem, Stefan Hajnoczi, virtualization,
linux-kernel, netdev, kvm
On Wed, 15 Jul 2020 16:34:46 +0200 Stefano Garzarella wrote:
> > Acked-by: Michael S. Tsirkin <mst@redhat.com>
> >
> > 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!
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-07-16 0:49 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-10 12:12 [PATCH] vsock/virtio: annotate 'the_virtio_vsock' RCU pointer Stefano Garzarella
2020-07-13 9:28 ` Stefan Hajnoczi
2020-07-13 10:54 ` Michael S. Tsirkin
2020-07-15 14:34 ` Stefano Garzarella
2020-07-16 0:49 ` Jakub Kicinski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).