another .27 patch

diff --git a/review-2.6.27/fnctl-f_modown-should-call-write_lock_irqsave-restore.patch b/review-2.6.27/fnctl-f_modown-should-call-write_lock_irqsave-restore.patch
new file mode 100644 (file)
index 0000000..4b74167
--- /dev/null
+++ b/review-2.6.27/fnctl-f_modown-should-call-write_lock_irqsave-restore.patch
@@ -0,0 +1,47 @@
+From b04da8bfdfbbd79544cab2fadfdc12e87eb01600 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@suse.de>
+Date: Tue, 26 Jan 2010 15:04:02 -0800
+Subject: fnctl: f_modown should call write_lock_irqsave/restore
+
+From: Greg Kroah-Hartman <gregkh@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@xmission.com>
+Cc: Al Viro <viro@ZenIV.linux.org.uk>
+Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
+Cc: Tavis Ormandy <taviso@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+---
+ fs/fcntl.c |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/fs/fcntl.c
++++ b/fs/fcntl.c
+@@ -200,7 +200,9 @@ static int setfl(int fd, struct file * f
+ static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,
+                      uid_t uid, uid_t euid, 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);
+@@ -208,7 +210,7 @@ static void f_modown(struct file *filp, 
+               filp->f_owner.uid = uid;
+               filp->f_owner.euid = 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,

diff --git a/review-2.6.27/series b/review-2.6.27/series
index dc170a65b36a71a8b9937c6c2d31b6b6b098dba6..8315b0bea889f23f96dfe7bc9603b4c71a99ede2 100644 (file)
--- a/review-2.6.27/series
+++ b/review-2.6.27/series
@@ -9,3 +9,4 @@ usb-ehci-fix-handling-of-unusual-interrupt-intervals.patch
 usb-ehci-uhci-fix-race-between-root-hub-suspend-and-port-resume.patch
 ipc-ns-fix-memory-leak-idr.patch
 kvm-s390-fix-potential-array-overrun-in-intercept-handling.patch
+fnctl-f_modown-should-call-write_lock_irqsave-restore.patch