Skip to contentSkip to conversation

Patch "tools/virtio: fix READ_ONCE()" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jan 13, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

tools/virtio: fix READ_ONCE()

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
tools-virtio-fix-read_once.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 5da889c795b1fbefc9d8f058b54717ab8ab17891 Mon Sep 17 00:00:00 2001

From: Mark Rutland <[email protected]>
Date: Thu, 24 Nov 2016 10:25:12 +0000
Subject: tools/virtio: fix READ_ONCE()

From: Mark Rutland <[email protected]>

commit 5da889c795b1fbefc9d8f058b54717ab8ab17891 upstream.

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")
Cc Jason Wang <[email protected]>
Cc Michael S. Tsirkin <[email protected]>
---
 tools/virtio/linux/compiler.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/virtio/linux/compiler.h +1 -1
@@ -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

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/tools-virtio-fix-read_once.patch queue-4.9/bus-arm-ccn-prevent-hotplug-callback-leak.patch