[kernel] r13409 - dists/etch-security/linux-2.6/debian/patches/features/all/vserver

[Dann Frazier]

Author: dannf
Date: Mon Apr 13 00:41:19 2009
New Revision: 13409

Log:
adjust to apply above CVE-2009-0029 fixes

Modified:
   dists/etch-security/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.2-rc9.patch

Modified: dists/etch-security/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.2-rc9.patch
==============================================================================
--- dists/etch-security/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.2-rc9.patch	Mon Apr 13 00:31:22 2009	(r13408)
+++ dists/etch-security/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.2-rc9.patch	Mon Apr 13 00:41:19 2009	(r13409)
@@ -100,9 +100,9 @@
  			break;
  	}
  	up_read(&uts_sem);
-@@ -607,30 +612,30 @@ osf_sigstack(struct sigstack __user *uss
- asmlinkage long
- osf_sysinfo(int command, char __user *buf, long count)
+@@ -601,30 +606,30 @@ SYSCALL_DEFINE2(osf_sigstack, struct sig
+ 
+ SYSCALL_DEFINE3(osf_sysinfo, int, command, char __user *, buf, long, count)
  {
 -	static char * sysinfo_table[] = {
 -		system_utsname.sysname,
@@ -661,13 +661,13 @@
  	PTR	sys_add_key
 --- linux-2.6.18.5/arch/mips/kernel/scall64-o32.S	2006-09-20 16:57:58 +0200
 +++ linux-2.6.18.5-vs2.0.2.2-rc9/arch/mips/kernel/scall64-o32.S	2006-09-20 17:01:44 +0200
-@@ -482,7 +482,7 @@ sys_call_table:
+@@ -480,7 +480,7 @@ sys_call_table:
  	PTR	compat_sys_mq_timedreceive
  	PTR	compat_sys_mq_notify		/* 4275 */
  	PTR	compat_sys_mq_getsetattr
 -	PTR	sys_ni_syscall			/* sys_vserver */
 +	PTR	sys32_vserver
- 	PTR	sys32_waitid
+ 	PTR	sys_32_waitid
  	PTR	sys_ni_syscall			/* available, was setaltroot */
  	PTR	sys_add_key			/* 4280 */
 --- linux-2.6.18.5/arch/mips/kernel/syscall.c	2006-09-20 16:57:58 +0200
@@ -680,17 +680,17 @@
  
  #include <asm/branch.h>
  #include <asm/cachectl.h>
-@@ -231,7 +232,7 @@ out:
+@@ -238,7 +239,7 @@ out:
   */
- asmlinkage int sys_uname(struct old_utsname __user * name)
+ SYSCALL_DEFINE1(uname, struct old_utsname __user *, name)
  {
 -	if (name && !copy_to_user(name, &system_utsname, sizeof (*name)))
 +	if (name && !copy_to_user(name, vx_new_utsname(), sizeof (*name)))
  		return 0;
  	return -EFAULT;
  }
-@@ -242,21 +243,23 @@ asmlinkage int sys_uname(struct old_utsn
- asmlinkage int sys_olduname(struct oldold_utsname __user * name)
+@@ -249,21 +250,23 @@ SYSCALL_DEFINE1(uname, struct old_utsnam
+ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
  {
  	int error;
 +	struct new_utsname *ptr;