rpms/kernel/F-12 kernel.spec, 1.1839, 1.1840 linux-2.6.31-copy_from_user-bounds.patch, 1.1, 1.2

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16121

Modified Files:
	kernel.spec linux-2.6.31-copy_from_user-bounds.patch 
Log Message:
* Tue Sep 29 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-54
- Fix broken capabilties that stopped dbus working due to copy from user
  fixups.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1839
retrieving revision 1.1840
diff -u -p -r1.1839 -r1.1840
--- kernel.spec	29 Sep 2009 03:21:19 -0000	1.1839
+++ kernel.spec	29 Sep 2009 08:26:12 -0000	1.1840
@@ -2074,6 +2074,10 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 29 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-54
+- Fix broken capabilties that stopped dbus working due to copy from user
+  fixups.
+
 * Tue Sep 29 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-53
 - drm-next-4c57edba4.patch: fix r600 dri1 memory leak and r600 bugs
 

linux-2.6.31-copy_from_user-bounds.patch:
 b/arch/x86/include/asm/uaccess_32.h               |   19 ++++++++
 b/arch/x86/include/asm/uaccess_64.h               |   19 ++++++++
 b/arch/x86/kernel/x8664_ksyms_64.c                |    2 
 b/arch/x86/lib/copy_user_64.S                     |    4 -
 b/arch/x86/lib/usercopy_32.c                      |    4 -
 b/drivers/acpi/proc.c                             |    4 -
 b/drivers/acpi/video.c                            |   20 ++++++---
 b/drivers/char/nvram.c                            |   12 ++++-
 b/fs/cifs/cifs_debug.c                            |   10 ++--
 b/include/linux/compiler-gcc4.h                   |    2 
 b/include/linux/compiler.h                        |    8 +--
 b/kernel/capability.c                             |   11 ++---
 b/mm/migrate.c                                    |   47 ++++++++++++++++++++--
 b/net/socket.c                                    |    9 ++--
 b/net/wireless/wext.c                             |   11 ++---
 linux-2.6.31.noarch/arch/x86/kernel/cpu/mtrr/if.c |   21 ++++++---
 16 files changed, 152 insertions(+), 51 deletions(-)

Index: linux-2.6.31-copy_from_user-bounds.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/linux-2.6.31-copy_from_user-bounds.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6.31-copy_from_user-bounds.patch	28 Sep 2009 21:01:12 -0000	1.1
+++ linux-2.6.31-copy_from_user-bounds.patch	29 Sep 2009 08:26:13 -0000	1.2
@@ -1163,7 +1163,7 @@ index 4e17041..204f11f 100644
 -	if (copy_from_user(&kdata, data,
 -			   tocopy * sizeof(struct __user_cap_data_struct)))
 +	copybytes = tocopy * sizeof(struct __user_cap_data_struct);
-+	if (copybytes > _KERNEL_CAPABILITY_U32S)
++	if (copybytes > (_KERNEL_CAPABILITY_U32S * sizeof(u32)))
 +		return -EFAULT;
 +
 +	if (copy_from_user(&kdata, data, copybytes))