diff mbox

[1/3] tools/virtio: fix READ_ONCE()

Message ID 1479983114-17190-2-git-send-email-mark.rutland@arm.com
State Accepted
Commit 5da889c795b1fbefc9d8f058b54717ab8ab17891
Headers show

Commit Message

Mark Rutland Nov. 24, 2016, 10:25 a.m. UTC
The virtio tools implementation of READ_ONCE() has a single parameter called
'var', but erroneously refers to 'val' for its cast, and thus won't work unless
there's a variable of the correct type that happens to be called 'var'.

Fix this with s/var/val/, making READ_ONCE() work as expected regardless.

Fixes: a7c490333df3cff5 ("tools/virtio: use virt_xxx barriers")
Signed-off-by: Mark Rutland <mark.rutland@arm.com>

Cc: Jason Wang <jasowang@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: linux-kernel@vger.kernel.org
Cc: virtualization@lists.linux-foundation.org
---
 tools/virtio/linux/compiler.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.7.4

Comments

Cornelia Huck Nov. 24, 2016, 11:34 a.m. UTC | #1
On Thu, 24 Nov 2016 10:25:12 +0000
Mark Rutland <mark.rutland@arm.com> wrote:

> The virtio tools implementation of READ_ONCE() has a single parameter called

> 'var', but erroneously refers to 'val' for its cast, and thus won't work unless

> there's a variable of the correct type that happens to be called 'var'.

> 

> Fix this with s/var/val/, making READ_ONCE() work as expected regardless.

> 

> Fixes: a7c490333df3cff5 ("tools/virtio: use virt_xxx barriers")

> Signed-off-by: Mark Rutland <mark.rutland@arm.com>

> Cc: Jason Wang <jasowang@redhat.com>

> Cc: Michael S. Tsirkin <mst@redhat.com>

> Cc: linux-kernel@vger.kernel.org

> Cc: virtualization@lists.linux-foundation.org

> ---

>  tools/virtio/linux/compiler.h | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)


Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
diff mbox

Patch

diff --git a/tools/virtio/linux/compiler.h b/tools/virtio/linux/compiler.h
index 845960e..c9ccfd4 100644
--- a/tools/virtio/linux/compiler.h
+++ b/tools/virtio/linux/compiler.h
@@ -4,6 +4,6 @@ 
 #define WRITE_ONCE(var, val) \
 	(*((volatile typeof(val) *)(&(var))) = (val))
 
-#define READ_ONCE(var) (*((volatile typeof(val) *)(&(var))))
+#define READ_ONCE(var) (*((volatile typeof(var) *)(&(var))))
 
 #endif