mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Fix a race condition in FASYNC handling
Changeset a238b790d5 (Call fasync()
functions without the BKL) introduced a race which could leave
file->f_flags in a state inconsistent with what the underlying
driver/filesystem believes. Revert that change, and also fix the same
races in ioctl_fioasync() and ioctl_fionbio().
This is a minimal, short-term fix; the real fix will not involve the
BKL.
Reported-by: Oleg Nesterov <[email protected]>
Cc: Andi Kleen <[email protected]>
Cc: Al Viro <[email protected]>
Cc: [email protected]
Signed-off-by: Jonathan Corbet <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
f2f1fa78a1
commit
218d11a8b0
2 changed files with 15 additions and 4 deletions
|
|
@ -19,6 +19,7 @@
|
|||
#include <linux/signal.h>
|
||||
#include <linux/rcupdate.h>
|
||||
#include <linux/pid_namespace.h>
|
||||
#include <linux/smp_lock.h>
|
||||
|
||||
#include <asm/poll.h>
|
||||
#include <asm/siginfo.h>
|
||||
|
|
@ -175,6 +176,11 @@ static int setfl(int fd, struct file * filp, unsigned long arg)
|
|||
if (error)
|
||||
return error;
|
||||
|
||||
/*
|
||||
* We still need a lock here for now to keep multiple FASYNC calls
|
||||
* from racing with each other.
|
||||
*/
|
||||
lock_kernel();
|
||||
if ((arg ^ filp->f_flags) & FASYNC) {
|
||||
if (filp->f_op && filp->f_op->fasync) {
|
||||
error = filp->f_op->fasync(fd, filp, (arg & FASYNC) != 0);
|
||||
|
|
@ -185,6 +191,7 @@ static int setfl(int fd, struct file * filp, unsigned long arg)
|
|||
|
||||
filp->f_flags = (arg & SETFL_MASK) | (filp->f_flags & ~SETFL_MASK);
|
||||
out:
|
||||
unlock_kernel();
|
||||
return error;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue