[kernel] r12958 - dists/etch-security/linux-2.6/debian/patches/bugfix/all/CVE-2009-0029

[Dann Frazier]

Author: dannf
Date: Mon Mar  2 06:33:31 2009
New Revision: 12958

Log:
add missing SyS_ftruncate64

Modified:
   dists/etch-security/linux-2.6/debian/patches/bugfix/all/CVE-2009-0029/0010-System-call-wrapper-special-cases.patch

Modified: dists/etch-security/linux-2.6/debian/patches/bugfix/all/CVE-2009-0029/0010-System-call-wrapper-special-cases.patch
==============================================================================
--- dists/etch-security/linux-2.6/debian/patches/bugfix/all/CVE-2009-0029/0010-System-call-wrapper-special-cases.patch	(original)
+++ dists/etch-security/linux-2.6/debian/patches/bugfix/all/CVE-2009-0029/0010-System-call-wrapper-special-cases.patch	Mon Mar  2 06:33:31 2009
@@ -21,8 +21,8 @@
 Backported to Debian's 2.6.18 by dann frazier <dannf at debian.org>
 
 diff -urpN a/fs/dcookies.c b/fs/dcookies.c
---- a/fs/dcookies.c	2006-09-19 21:42:06.000000000 -0600
-+++ b/fs/dcookies.c	2009-01-28 23:43:16.000000000 -0700
+--- a/fs/dcookies.c	2006-09-20 05:42:06.000000000 +0200
++++ b/fs/dcookies.c	2009-03-02 07:08:24.000000000 +0100
 @@ -142,7 +142,7 @@ out:
  /* And here is where the userspace process can look up the cookie value
   * to retrieve the path.
@@ -48,9 +48,9 @@
  static int dcookie_init(void)
  {
 diff -urpN a/fs/open.c b/fs/open.c
---- a/fs/open.c	2009-01-28 23:42:25.000000000 -0700
-+++ b/fs/open.c	2009-01-29 00:00:14.000000000 -0700
-@@ -342,19 +342,26 @@ asmlinkage long sys_ftruncate(unsigned i
+--- a/fs/open.c	2009-03-02 07:06:38.000000000 +0100
++++ b/fs/open.c	2009-03-02 07:13:41.000000000 +0100
+@@ -342,19 +342,33 @@ asmlinkage long sys_ftruncate(unsigned i
  
  /* LFS versions of truncate are only needed on 32 bit machines */
  #if BITS_PER_LONG == 32
@@ -75,22 +75,20 @@
  	prevent_tail_call(ret);
  	return ret;
  }
--#endif
++#ifdef CONFIG_HAVE_SYSCALL_WRAPPERS
++asmlinkage long SyS_ftruncate64(long fd, loff_t length)
++{
++	return SYSC_ftruncate64((unsigned int) fd, length);
++}
++SYSCALL_ALIAS(sys_ftruncate64, SyS_ftruncate64);
+ #endif
 +#endif /* BITS_PER_LONG == 32 */
  
  #ifdef __ARCH_WANT_SYS_UTIME
  
-@@ -418,7 +425,6 @@ dput_and_out:
- out:
- 	return error;
- }
--
- #endif
- 
- /* If times==NULL, set access and modification to current time,
 diff -urpN a/fs/read_write.c b/fs/read_write.c
---- a/fs/read_write.c	2009-01-28 23:42:26.000000000 -0700
-+++ b/fs/read_write.c	2009-01-28 23:43:16.000000000 -0700
+--- a/fs/read_write.c	2009-03-02 07:06:39.000000000 +0100
++++ b/fs/read_write.c	2009-03-02 07:08:24.000000000 +0100
 @@ -374,8 +374,8 @@ asmlinkage long sys_write(unsigned int f
  	return ret;
  }
@@ -138,8 +136,8 @@
  /*
   * Reduce an iovec's length in-place.  Return the resulting number of segments
 diff -urpN a/fs/sync.c b/fs/sync.c
---- a/fs/sync.c	2006-09-19 21:42:06.000000000 -0600
-+++ b/fs/sync.c	2009-01-28 23:57:14.000000000 -0700
+--- a/fs/sync.c	2006-09-20 05:42:06.000000000 +0200
++++ b/fs/sync.c	2009-03-02 07:16:55.000000000 +0100
 @@ -60,8 +60,8 @@
   * already-instantiated disk blocks, there are no guarantees here that the data
   * will be available after a crash.
@@ -168,8 +166,8 @@
  /*
   * `endbyte' is inclusive
 diff -urpN a/ipc/sem.c b/ipc/sem.c
---- a/ipc/sem.c	2006-09-19 21:42:06.000000000 -0600
-+++ b/ipc/sem.c	2009-01-28 23:43:16.000000000 -0700
+--- a/ipc/sem.c	2006-09-20 05:42:06.000000000 +0200
++++ b/ipc/sem.c	2009-03-02 07:08:24.000000000 +0100
 @@ -868,7 +868,7 @@ out_unlock:
  	return err;
  }
@@ -194,8 +192,8 @@
  static inline void lock_semundo(void)
  {
 diff -urpN a/mm/fadvise.c b/mm/fadvise.c
---- a/mm/fadvise.c	2006-09-19 21:42:06.000000000 -0600
-+++ b/mm/fadvise.c	2009-01-28 23:43:16.000000000 -0700
+--- a/mm/fadvise.c	2006-09-20 05:42:06.000000000 +0200
++++ b/mm/fadvise.c	2009-03-02 07:08:24.000000000 +0100
 @@ -24,7 +24,7 @@
   * POSIX_FADV_WILLNEED could set PG_Referenced, and POSIX_FADV_NOREUSE could
   * deactivate the pages and clear PG_Referenced.
@@ -234,8 +232,8 @@
  
  #endif
 diff -urpN a/mm/filemap.c b/mm/filemap.c
---- a/mm/filemap.c	2009-01-28 23:42:26.000000000 -0700
-+++ b/mm/filemap.c	2009-01-28 23:43:16.000000000 -0700
+--- a/mm/filemap.c	2009-03-02 07:06:39.000000000 +0100
++++ b/mm/filemap.c	2009-03-02 07:08:24.000000000 +0100
 @@ -1285,7 +1285,7 @@ do_readahead(struct address_space *mappi
  	return 0;
  }