Prev: [32/89] USB: EHCI: fix handling of unusual interrupt intervals
Next: [54/89] hwmon: (adt7462) Wrong ADT7462_VOLT_COUNT
From: Greg KH on 30 Mar 2010 20:30
2.6.31-stable review patch. If anyone has any objections, please let us know.

------------------

From: Greg Kroah-Hartman <gregkh(a)suse.de>

commit b04da8bfdfbbd79544cab2fadfdc12e87eb01600 upstream.

Commit 703625118069f9f8960d356676662d3db5a9d116 exposed that f_modown()
should call write_lock_irqsave instead of just write_lock_irq so that
because a caller could have a spinlock held and it would not be good to
renable interrupts.

Cc: Eric W. Biederman <ebiederm(a)xmission.com>
Cc: Al Viro <viro(a)ZenIV.linux.org.uk>
Cc: Alan Cox <alan(a)lxorguk.ukuu.org.uk>
Cc: Tavis Ormandy <taviso(a)google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>
Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org>

---
fs/fcntl.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -199,7 +199,9 @@ static int setfl(int fd, struct file * f
static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,
int force)
{
- write_lock_irq(&filp->f_owner.lock);
+ unsigned long flags;
+
+ write_lock_irqsave(&filp->f_owner.lock, flags);
if (force || !filp->f_owner.pid) {
put_pid(filp->f_owner.pid);
filp->f_owner.pid = get_pid(pid);
@@ -211,7 +213,7 @@ static void f_modown(struct file *filp,
filp->f_owner.euid = cred->euid;
}
}
- write_unlock_irq(&filp->f_owner.lock);
+ write_unlock_irqrestore(&filp->f_owner.lock, flags);
}

int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [32/89] USB: EHCI: fix handling of unusual interrupt intervals
Next: [54/89] hwmon: (adt7462) Wrong ADT7462_VOLT_COUNT