]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
eventpoll: Annotate data-race of busy_poll_usecs
authorMartin Karsten <mkarsten@uwaterloo.ca>
Tue, 6 Aug 2024 12:33:01 +0000 (12:33 +0000)
committerChristian Brauner <brauner@kernel.org>
Fri, 30 Aug 2024 06:22:34 +0000 (08:22 +0200)
A struct eventpoll's busy_poll_usecs field can be modified via a user
ioctl at any time. All reads of this field should be annotated with
READ_ONCE.

Fixes: 85455c795c07 ("eventpoll: support busy poll per epoll instance")
Cc: stable@vger.kernel.org
Signed-off-by: Martin Karsten <mkarsten@uwaterloo.ca>
Link: https://lore.kernel.org/r/20240806123301.167557-1-jdamato@fastly.com
Reviewed-by: Joe Damato <jdamato@fastly.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>
fs/eventpoll.c

index 6c0a1e9715ea2083ec4030baafa5bb56778483f5..145f5349c612e289d2f38d09c502877cfc5c9153 100644 (file)
@@ -420,7 +420,7 @@ static bool busy_loop_ep_timeout(unsigned long start_time,
 
 static bool ep_busy_loop_on(struct eventpoll *ep)
 {
-       return !!ep->busy_poll_usecs || net_busy_loop_on();
+       return !!READ_ONCE(ep->busy_poll_usecs) || net_busy_loop_on();
 }
 
 static bool ep_busy_loop_end(void *p, unsigned long start_time)