]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
typo fix fs/compat.c
authorChris Wright <chrisw@sous-sol.org>
Tue, 16 May 2006 23:07:30 +0000 (16:07 -0700)
committerChris Wright <chrisw@sous-sol.org>
Tue, 16 May 2006 23:07:30 +0000 (16:07 -0700)
queue-2.6.16/fs-compat.c-fix-if-typo.patch [new file with mode: 0644]
queue-2.6.16/series

diff --git a/queue-2.6.16/fs-compat.c-fix-if-typo.patch b/queue-2.6.16/fs-compat.c-fix-if-typo.patch
new file mode 100644 (file)
index 0000000..f5cae29
--- /dev/null
@@ -0,0 +1,33 @@
+From stable-bounces@linux.kernel.org  Mon May 15 09:56:31 2006
+Date: Mon, 15 May 2006 09:44:27 -0700
+From: akpm@osdl.org
+To: torvalds@osdl.org
+Cc: stable@kernel.org, dwmw2@infradead.org, adobriyan@gmail.com, drepper@redhat.com
+Subject: [PATCH] fs/compat.c: fix 'if (a |= b )' typo
+
+From: Alexey Dobriyan <adobriyan@gmail.com>
+
+Mentioned by Mark Armbrust somewhere on Usenet.
+
+Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
+Cc: David Woodhouse <dwmw2@infradead.org>
+Cc: Ulrich Drepper <drepper@redhat.com>
+Cc: <stable@kernel.org>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+
+ fs/compat.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- linux-2.6.16.16.orig/fs/compat.c
++++ linux-2.6.16.16/fs/compat.c
+@@ -1901,7 +1901,7 @@ asmlinkage long compat_sys_ppoll(struct 
+       }
+       if (sigmask) {
+-              if (sigsetsize |= sizeof(compat_sigset_t))
++              if (sigsetsize != sizeof(compat_sigset_t))
+                       return -EINVAL;
+               if (copy_from_user(&ss32, sigmask, sizeof(ss32)))
+                       return -EFAULT;
index 9f2f5abad85d88054f02a0074dcda7882fc105ce..07a2b71886e52968a19e95ff3e4b6d170014098f 100644 (file)
@@ -3,3 +3,4 @@ via-rhine-zero-pad-short-packets-on-rhine-i-ethernet-cards.patch
 usb-ub-oops-in-block_uevent.patch
 fs-locks.c-Fix-sys_flock-race.patch
 smbfs-fix-slab-corruption-in-samba-error-path.patch
+fs-compat.c-fix-if-typo.patch