Skip to content

Commit 8175dbf

Browse files
edumazetkuba-moo
authored andcommitted
mISDN: annotate data-race around dev->work
dev->work can re read locklessly in mISDN_read() and mISDN_poll(). Add READ_ONCE()/WRITE_ONCE() annotations. BUG: KCSAN: data-race in mISDN_ioctl / mISDN_read write to 0xffff88812d848280 of 4 bytes by task 10864 on cpu 1: misdn_add_timer drivers/isdn/mISDN/timerdev.c:175 [inline] mISDN_ioctl+0x2fb/0x550 drivers/isdn/mISDN/timerdev.c:233 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:597 [inline] __se_sys_ioctl+0xce/0x140 fs/ioctl.c:583 __x64_sys_ioctl+0x43/0x50 fs/ioctl.c:583 x64_sys_call+0x14b0/0x3000 arch/x86/include/generated/asm/syscalls_64.h:17 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xd8/0x2c0 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f read to 0xffff88812d848280 of 4 bytes by task 10857 on cpu 0: mISDN_read+0x1f2/0x470 drivers/isdn/mISDN/timerdev.c:112 do_loop_readv_writev fs/read_write.c:847 [inline] vfs_readv+0x3fb/0x690 fs/read_write.c:1020 do_readv+0xe7/0x210 fs/read_write.c:1080 __do_sys_readv fs/read_write.c:1165 [inline] __se_sys_readv fs/read_write.c:1162 [inline] __x64_sys_readv+0x45/0x50 fs/read_write.c:1162 x64_sys_call+0x2831/0x3000 arch/x86/include/generated/asm/syscalls_64.h:20 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xd8/0x2c0 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f value changed: 0x00000000 -> 0x00000001 Fixes: 1b2b03f ("Add mISDN core files") Reported-by: syzbot <syzkaller@googlegroups.com> Signed-off-by: Eric Dumazet <edumazet@google.com> Link: https://patch.msgid.link/20260118132528.2349573-1-edumazet@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 3d778e6 commit 8175dbf

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

drivers/isdn/mISDN/timerdev.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,14 @@ mISDN_read(struct file *filep, char __user *buf, size_t count, loff_t *off)
109109
spin_unlock_irq(&dev->lock);
110110
if (filep->f_flags & O_NONBLOCK)
111111
return -EAGAIN;
112-
wait_event_interruptible(dev->wait, (dev->work ||
112+
wait_event_interruptible(dev->wait, (READ_ONCE(dev->work) ||
113113
!list_empty(list)));
114114
if (signal_pending(current))
115115
return -ERESTARTSYS;
116116
spin_lock_irq(&dev->lock);
117117
}
118118
if (dev->work)
119-
dev->work = 0;
119+
WRITE_ONCE(dev->work, 0);
120120
if (!list_empty(list)) {
121121
timer = list_first_entry(list, struct mISDNtimer, list);
122122
list_del(&timer->list);
@@ -141,13 +141,16 @@ mISDN_poll(struct file *filep, poll_table *wait)
141141
if (*debug & DEBUG_TIMER)
142142
printk(KERN_DEBUG "%s(%p, %p)\n", __func__, filep, wait);
143143
if (dev) {
144+
u32 work;
145+
144146
poll_wait(filep, &dev->wait, wait);
145147
mask = 0;
146-
if (dev->work || !list_empty(&dev->expired))
148+
work = READ_ONCE(dev->work);
149+
if (work || !list_empty(&dev->expired))
147150
mask |= (EPOLLIN | EPOLLRDNORM);
148151
if (*debug & DEBUG_TIMER)
149152
printk(KERN_DEBUG "%s work(%d) empty(%d)\n", __func__,
150-
dev->work, list_empty(&dev->expired));
153+
work, list_empty(&dev->expired));
151154
}
152155
return mask;
153156
}
@@ -172,7 +175,7 @@ misdn_add_timer(struct mISDNtimerdev *dev, int timeout)
172175
struct mISDNtimer *timer;
173176

174177
if (!timeout) {
175-
dev->work = 1;
178+
WRITE_ONCE(dev->work, 1);
176179
wake_up_interruptible(&dev->wait);
177180
id = 0;
178181
} else {

0 commit comments

Comments
 (0)