r2667 - in trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian: . patches patches/series
Andres Salomon
dilinger-guest@costa.debian.org
Fri, 11 Mar 2005 00:51:44 +0100
Author: dilinger-guest
Date: 2005-03-11 00:51:43 +0100 (Fri, 11 Mar 2005)
New Revision: 2667
Removed:
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/105-cmsg_compat_ok_proper_cmsghdr_struct.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/106-smbfs_input_validation_and_int_checks.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/127-ia64_ptrace_corner_case.dpatch
Modified:
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-6
Log:
damnit, hate it when i do that. s/.patch/.dpatch/, and remove some
patches that were in 2.6.10-5 already.
Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog 2005-03-10 23:26:10 UTC (rev 2666)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog 2005-03-10 23:51:43 UTC (rev 2667)
@@ -118,16 +118,6 @@
uploads. This patch adds an additional check for CAP_SYS_RAWIO, as well
(Andres Salomon).
- * 105-cmsg_compat_ok_proper_cmsghdr_struct.dpatch
- [NET] CMSG_COMPAT_OK() does a sanity check using the size of a cmsghdr
- struct, when it should be using a compat_cmsghdr struct, instead. This
- fixes that (Andres Salomon).
-
- * 106-smbfs_input_validation_and_int_checks.dpatch
- [SECURITY] This patch adds various input validation and sanity checks to
- the smbfs driver; fixes include integer underflow checks in
- smb_proc_readX_data and smb_recv_trans2 (Andres Salomon).
-
* 107-xfs_finish_reclaim_always_inode.dpatch
[XFS] In xfs_finish_reclaim(), xfs_ireclaim() should always be called
(unless there's some sort of locking problem) before returning
@@ -215,9 +205,6 @@
it should be checking if baud_base<9600 if the baud_base has changed
(Andres Salomon).
- * 127-ia64_ptrace_corner_case.dpatch
- [IA64] Fix some ptrace corner cases in ia64. Nasty stuff (Andres Salomon).
-
* 129-video_cg3_screen_blanking.dpatch
[SPARC] Fix cg3 blanking; the driver was setting _ENABLE_VIDEO on POWERDOWN,
instead of unsetting it (Andres Salomon).
Deleted: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/105-cmsg_compat_ok_proper_cmsghdr_struct.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/105-cmsg_compat_ok_proper_cmsghdr_struct.dpatch 2005-03-10 23:26:10 UTC (rev 2666)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/105-cmsg_compat_ok_proper_cmsghdr_struct.dpatch 2005-03-10 23:51:43 UTC (rev 2667)
@@ -1,45 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [NET]: Fix CMSG_COMPAT_OK length check.
-## DP: Patch author: okir@suse.de
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/10 12:27:49-08:00 okir@suse.de
-# [NET]: Fix CMSG_COMPAT_OK length check.
-#
-# Need to check against struct compat_cmsghdr
-# not struct cmsghdr.
-#
-# Signed-off-by: Olaf Kirch <okir@suse.de>
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-# net/compat.c
-# 2005/01/10 12:27:28-08:00 okir@suse.de +1 -1
-# [NET]: Fix CMSG_COMPAT_OK length check.
-#
-# Need to check against struct compat_cmsghdr
-# not struct cmsghdr.
-#
-# Signed-off-by: Olaf Kirch <okir@suse.de>
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-diff -Nru a/net/compat.c b/net/compat.c
---- a/net/compat.c 2005-02-14 00:26:02 -08:00
-+++ b/net/compat.c 2005-02-14 00:26:02 -08:00
-@@ -125,7 +125,7 @@
- (struct compat_cmsghdr __user *)NULL)
-
- #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
-- ((ucmlen) >= sizeof(struct cmsghdr) && \
-+ ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
- (ucmlen) <= (unsigned long) \
- ((mhdr)->msg_controllen - \
- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
Deleted: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/106-smbfs_input_validation_and_int_checks.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/106-smbfs_input_validation_and_int_checks.dpatch 2005-03-10 23:26:10 UTC (rev 2666)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/106-smbfs_input_validation_and_int_checks.dpatch 2005-03-10 23:51:43 UTC (rev 2667)
@@ -1,153 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] smbfs fixes
-## DP: Patch author: alan@lxorguk.ukuu.org.uk
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/15 15:34:03-08:00 alan@lxorguk.ukuu.org.uk
-# [PATCH] smbfs fixes
-#
-# Fixes for various smbfs data leak bugs from Alan, Chuck Ebbert and various
-# people on various mailing lists.
-#
-# Signed-off-by: Andrew Morton <akpm@osdl.org>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# fs/smbfs/proc.c
-# 2005/01/15 14:01:58-08:00 alan@lxorguk.ukuu.org.uk +3 -3
-# smbfs fixes
-#
-# fs/smbfs/request.c
-# 2005/01/15 14:01:58-08:00 alan@lxorguk.ukuu.org.uk +33 -19
-# smbfs fixes
-#
-diff -Nru a/fs/smbfs/proc.c b/fs/smbfs/proc.c
---- a/fs/smbfs/proc.c 2005-02-14 00:46:54 -08:00
-+++ b/fs/smbfs/proc.c 2005-02-14 00:46:54 -08:00
-@@ -1427,9 +1427,9 @@
- * So we must first calculate the amount of padding used by the server.
- */
- data_off -= hdrlen;
-- if (data_off > SMB_READX_MAX_PAD) {
-- PARANOIA("offset is larger than max pad!\n");
-- PARANOIA("%d > %d\n", data_off, SMB_READX_MAX_PAD);
-+ if (data_off > SMB_READX_MAX_PAD || data_off < 0) {
-+ PARANOIA("offset is larger than SMB_READX_MAX_PAD or negative!\n");
-+ PARANOIA("%d > %d || %d < 0\n", data_off, SMB_READX_MAX_PAD, data_off);
- req->rq_rlen = req->rq_bufsize + 1;
- return;
- }
-diff -Nru a/fs/smbfs/request.c b/fs/smbfs/request.c
---- a/fs/smbfs/request.c 2005-02-14 00:46:54 -08:00
-+++ b/fs/smbfs/request.c 2005-02-14 00:46:54 -08:00
-@@ -590,8 +590,18 @@
- data_count = WVAL(inbuf, smb_drcnt);
-
- /* Modify offset for the split header/buffer we use */
-- data_offset -= hdrlen;
-- parm_offset -= hdrlen;
-+ if (data_count || data_offset) {
-+ if (unlikely(data_offset < hdrlen))
-+ goto out_bad_data;
-+ else
-+ data_offset -= hdrlen;
-+ }
-+ if (parm_count || parm_offset) {
-+ if (unlikely(parm_offset < hdrlen))
-+ goto out_bad_parm;
-+ else
-+ parm_offset -= hdrlen;
-+ }
-
- if (parm_count == parm_tot && data_count == data_tot) {
- /*
-@@ -602,18 +612,22 @@
- * response that fits.
- */
- VERBOSE("single trans2 response "
-- "dcnt=%d, pcnt=%d, doff=%d, poff=%d\n",
-+ "dcnt=%u, pcnt=%u, doff=%u, poff=%u\n",
- data_count, parm_count,
- data_offset, parm_offset);
- req->rq_ldata = data_count;
- req->rq_lparm = parm_count;
- req->rq_data = req->rq_buffer + data_offset;
- req->rq_parm = req->rq_buffer + parm_offset;
-+ if (unlikely(parm_offset + parm_count > req->rq_rlen))
-+ goto out_bad_parm;
-+ if (unlikely(data_offset + data_count > req->rq_rlen))
-+ goto out_bad_data;
- return 0;
- }
-
- VERBOSE("multi trans2 response "
-- "frag=%d, dcnt=%d, pcnt=%d, doff=%d, poff=%d\n",
-+ "frag=%d, dcnt=%u, pcnt=%u, doff=%u, poff=%u\n",
- req->rq_fragment,
- data_count, parm_count,
- data_offset, parm_offset);
-@@ -640,13 +654,15 @@
-
- req->rq_parm = req->rq_trans2buffer;
- req->rq_data = req->rq_trans2buffer + parm_tot;
-- } else if (req->rq_total_data < data_tot ||
-- req->rq_total_parm < parm_tot)
-+ } else if (unlikely(req->rq_total_data < data_tot ||
-+ req->rq_total_parm < parm_tot))
- goto out_data_grew;
-
-- if (parm_disp + parm_count > req->rq_total_parm)
-+ if (unlikely(parm_disp + parm_count > req->rq_total_parm ||
-+ parm_offset + parm_count > req->rq_rlen))
- goto out_bad_parm;
-- if (data_disp + data_count > req->rq_total_data)
-+ if (unlikely(data_disp + data_count > req->rq_total_data ||
-+ data_offset + data_count > req->rq_rlen))
- goto out_bad_data;
-
- inbuf = req->rq_buffer;
-@@ -668,10 +684,9 @@
- return 1;
-
- out_too_long:
-- printk(KERN_ERR "smb_trans2: data/param too long, data=%d, parm=%d\n",
-+ printk(KERN_ERR "smb_trans2: data/param too long, data=%u, parm=%u\n",
- data_tot, parm_tot);
-- req->rq_errno = -EIO;
-- goto out;
-+ goto out_EIO;
- out_no_mem:
- printk(KERN_ERR "smb_trans2: couldn't allocate data area of %d bytes\n",
- req->rq_trans2bufsize);
-@@ -679,16 +694,15 @@
- goto out;
- out_data_grew:
- printk(KERN_ERR "smb_trans2: data/params grew!\n");
-- req->rq_errno = -EIO;
-- goto out;
-+ goto out_EIO;
- out_bad_parm:
-- printk(KERN_ERR "smb_trans2: invalid parms, disp=%d, cnt=%d, tot=%d\n",
-- parm_disp, parm_count, parm_tot);
-- req->rq_errno = -EIO;
-- goto out;
-+ printk(KERN_ERR "smb_trans2: invalid parms, disp=%u, cnt=%u, tot=%u, ofs=%u\n",
-+ parm_disp, parm_count, parm_tot, parm_offset);
-+ goto out_EIO;
- out_bad_data:
-- printk(KERN_ERR "smb_trans2: invalid data, disp=%d, cnt=%d, tot=%d\n",
-- data_disp, data_count, data_tot);
-+ printk(KERN_ERR "smb_trans2: invalid data, disp=%u, cnt=%u, tot=%u, ofs=%u\n",
-+ data_disp, data_count, data_tot, data_offset);
-+out_EIO:
- req->rq_errno = -EIO;
- out:
- return req->rq_errno;
Deleted: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/127-ia64_ptrace_corner_case.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/127-ia64_ptrace_corner_case.dpatch 2005-03-10 23:26:10 UTC (rev 2666)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/127-ia64_ptrace_corner_case.dpatch 2005-03-10 23:51:43 UTC (rev 2667)
@@ -1,252 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [IA64] clean up ptrace corner cases
-## DP: Patch author: tony.luck@intel.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/22 14:21:34-08:00 tony.luck@intel.com
-# [IA64] clean up ptrace corner cases
-#
-# Patch from yanmin.zhang@intel.com to fix up some corner cases
-# in ptrace. Many thanks to davidm for reviewing and improving.
-#
-# Signed-off-by: Tony Luck <tony.luck@intel.com>
-#
-# arch/ia64/kernel/entry.S
-# 2005/01/22 14:18:28-08:00 tony.luck@intel.com +19 -7
-# clean up ptrace corner cases
-#
-# arch/ia64/kernel/fsys.S
-# 2005/01/22 14:19:11-08:00 tony.luck@intel.com +3 -2
-# clean up ptrace corner cases
-#
-# arch/ia64/kernel/gate.S
-# 2005/01/22 14:19:18-08:00 tony.luck@intel.com +3 -1
-# clean up ptrace corner cases
-#
-# arch/ia64/kernel/ivt.S
-# 2005/01/22 14:19:19-08:00 tony.luck@intel.com +20 -5
-# clean up ptrace corner cases
-#
-# arch/ia64/kernel/process.c
-# 2005/01/22 14:19:21-08:00 tony.luck@intel.com +1 -1
-# clean up ptrace corner cases
-#
-# include/asm-ia64/unistd.h
-# 2005/01/22 14:19:22-08:00 tony.luck@intel.com +1 -1
-# clean up ptrace corner cases
-#
-diff -Nru a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
---- a/arch/ia64/kernel/entry.S 2005-02-14 02:54:07 -08:00
-+++ b/arch/ia64/kernel/entry.S 2005-02-14 02:54:07 -08:00
-@@ -51,8 +51,11 @@
- * setup a null register window frame.
- */
- ENTRY(ia64_execve)
-- .prologue ASM_UNW_PRLG_RP|ASM_UNW_PRLG_PFS, ASM_UNW_PRLG_GRSAVE(3)
-- alloc loc1=ar.pfs,3,2,4,0
-+ /*
-+ * Allocate 8 input registers since ptrace() may clobber them
-+ */
-+ .prologue ASM_UNW_PRLG_RP|ASM_UNW_PRLG_PFS, ASM_UNW_PRLG_GRSAVE(8)
-+ alloc loc1=ar.pfs,8,2,4,0
- mov loc0=rp
- .body
- mov out0=in0 // filename
-@@ -113,8 +116,11 @@
- * u64 tls)
- */
- GLOBAL_ENTRY(sys_clone2)
-- .prologue ASM_UNW_PRLG_RP|ASM_UNW_PRLG_PFS, ASM_UNW_PRLG_GRSAVE(6)
-- alloc r16=ar.pfs,6,2,6,0
-+ /*
-+ * Allocate 8 input registers since ptrace() may clobber them
-+ */
-+ .prologue ASM_UNW_PRLG_RP|ASM_UNW_PRLG_PFS, ASM_UNW_PRLG_GRSAVE(8)
-+ alloc r16=ar.pfs,8,2,6,0
- DO_SAVE_SWITCH_STACK
- adds r2=PT(R16)+IA64_SWITCH_STACK_SIZE+16,sp
- mov loc0=rp
-@@ -142,8 +148,11 @@
- * Deprecated. Use sys_clone2() instead.
- */
- GLOBAL_ENTRY(sys_clone)
-- .prologue ASM_UNW_PRLG_RP|ASM_UNW_PRLG_PFS, ASM_UNW_PRLG_GRSAVE(5)
-- alloc r16=ar.pfs,5,2,6,0
-+ /*
-+ * Allocate 8 input registers since ptrace() may clobber them
-+ */
-+ .prologue ASM_UNW_PRLG_RP|ASM_UNW_PRLG_PFS, ASM_UNW_PRLG_GRSAVE(8)
-+ alloc r16=ar.pfs,8,2,6,0
- DO_SAVE_SWITCH_STACK
- adds r2=PT(R16)+IA64_SWITCH_STACK_SIZE+16,sp
- mov loc0=rp
-@@ -1212,7 +1221,10 @@
-
- ENTRY(sys_rt_sigreturn)
- PT_REGS_UNWIND_INFO(0)
-- alloc r2=ar.pfs,0,0,1,0
-+ /*
-+ * Allocate 8 input registers since ptrace() may clobber them
-+ */
-+ alloc r2=ar.pfs,8,0,1,0
- .prologue
- PT_REGS_SAVES(16)
- adds sp=-16,sp
-diff -Nru a/arch/ia64/kernel/fsys.S b/arch/ia64/kernel/fsys.S
---- a/arch/ia64/kernel/fsys.S 2005-02-14 02:54:07 -08:00
-+++ b/arch/ia64/kernel/fsys.S 2005-02-14 02:54:07 -08:00
-@@ -612,8 +612,9 @@
- ;;
- mov rp=r2 // set the real return addr
- tbit.z p8,p0=r3,TIF_SYSCALL_TRACE
--
--(p8) br.call.sptk.many b6=b6 // ignore this return addr
-+ ;;
-+(p10) br.cond.spnt.many ia64_ret_from_syscall // p10==true means out registers are more than 8
-+(p8) br.call.sptk.many b6=b6 // ignore this return addr
- br.cond.sptk ia64_trace_syscall
- END(fsys_bubble_down)
-
-diff -Nru a/arch/ia64/kernel/gate.S b/arch/ia64/kernel/gate.S
---- a/arch/ia64/kernel/gate.S 2005-02-14 02:54:07 -08:00
-+++ b/arch/ia64/kernel/gate.S 2005-02-14 02:54:07 -08:00
-@@ -81,6 +81,7 @@
- LOAD_FSYSCALL_TABLE(r14)
-
- mov r16=IA64_KR(CURRENT) // 12 cycle read latency
-+ tnat.nz p10,p9=r15
- mov r19=NR_syscalls-1
- ;;
- shladd r18=r17,3,r14
-@@ -119,7 +120,8 @@
- #endif
-
- mov r10=-1
-- mov r8=ENOSYS
-+(p10) mov r8=EINVAL
-+(p9) mov r8=ENOSYS
- FSYS_RETURN
- END(__kernel_syscall_via_epc)
-
-diff -Nru a/arch/ia64/kernel/ivt.S b/arch/ia64/kernel/ivt.S
---- a/arch/ia64/kernel/ivt.S 2005-02-14 02:54:07 -08:00
-+++ b/arch/ia64/kernel/ivt.S 2005-02-14 02:54:07 -08:00
-@@ -51,6 +51,7 @@
- #include <asm/system.h>
- #include <asm/thread_info.h>
- #include <asm/unistd.h>
-+#include <asm/errno.h>
-
- #if 1
- # define PSR_DEFAULT_BITS psr.ac
-@@ -732,10 +733,12 @@
- ssm psr.ic | PSR_DEFAULT_BITS
- ;;
- srlz.i // guarantee that interruption collection is on
-+ mov r3=NR_syscalls - 1
- ;;
- (p15) ssm psr.i // restore psr.i
-+ // p10==true means out registers are more than 8 or r15's Nat is true
-+(p10) br.cond.spnt.many ia64_ret_from_syscall
- ;;
-- mov r3=NR_syscalls - 1
- movl r16=sys_call_table
-
- adds r15=-1024,r15 // r15 contains the syscall number---subtract 1024
-@@ -836,8 +839,11 @@
- * On exit:
- * - executing on bank 1 registers
- * - psr.ic enabled, interrupts restored
-+ * - p10: TRUE if syscall is invoked with more than 8 out
-+ * registers or r15's Nat is true
- * - r1: kernel's gp
- * - r3: preserved (same as on entry)
-+ * - r8: -EINVAL if p10 is true
- * - r12: points to kernel stack
- * - r13: points to current task
- * - p15: TRUE if interrupts need to be re-enabled
-@@ -871,12 +877,17 @@
- ;;
-
- st8 [r16]=r19,PT(AR_RNAT)-PT(CR_IFS) // store ar.pfs.pfm in cr.ifs
-+ extr.u r11=r19,7,7 // I0 // get sol of ar.pfs
-+ and r8=0x7f,r19 // A // get sof of ar.pfs
-+
- st8 [r17]=r27,PT(AR_BSPSTORE)-PT(AR_RSC)// save ar.rsc
-+ tbit.nz p15,p0=r29,IA64_PSR_I_BIT // I0
- (p9) mov in1=-1
-+ ;;
-
- (pUStk) sub r18=r18,r22 // r18=RSE.ndirty*8
-- tbit.nz p15,p0=r29,IA64_PSR_I_BIT
- tnat.nz p10,p0=in2
-+ add r11=8,r11
- ;;
- (pKStk) adds r16=PT(PR)-PT(AR_RNAT),r16 // skip over ar_rnat field
- (pKStk) adds r17=PT(B0)-PT(AR_BSPSTORE),r17 // skip over ar_bspstore field
-@@ -904,25 +915,29 @@
- (p13) mov in5=-1
- ;;
- st8 [r16]=r21,PT(R8)-PT(AR_FPSR) // save ar.fpsr
-- st8.spill [r17]=r15 // save r15
- tnat.nz p14,p0=in6
-+ cmp.lt p10,p9=r11,r8 // frame size can't be more than local+8
- ;;
- stf8 [r16]=f1 // ensure pt_regs.r8 != 0 (see handle_syscall_error)
-+(p9) tnat.nz p10,p0=r15
- adds r12=-16,r1 // switch to kernel memory stack (with 16 bytes of scratch)
-+
-+ st8.spill [r17]=r15 // save r15
- tnat.nz p8,p0=in7
-+ nop.i 0
-
- mov r13=r2 // establish `current'
- movl r1=__gp // establish kernel global pointer
- ;;
- (p14) mov in6=-1
- (p8) mov in7=-1
-- tnat.nz p9,p0=r15
-+ nop.i 0
-
- cmp.eq pSys,pNonSys=r0,r0 // set pSys=1, pNonSys=0
- movl r17=FPSR_DEFAULT
- ;;
- mov.m ar.fpsr=r17 // set ar.fpsr to kernel default value
--(p9) mov r15=-1
-+(p10) mov r8=-EINVAL
- br.ret.sptk.many b7
- END(ia64_syscall_setup)
-
-diff -Nru a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
---- a/arch/ia64/kernel/process.c 2005-02-14 02:54:07 -08:00
-+++ b/arch/ia64/kernel/process.c 2005-02-14 02:54:07 -08:00
-@@ -632,7 +632,7 @@
- return 1; /* f0-f31 are always valid so we always return 1 */
- }
-
--asmlinkage long
-+long
- sys_execve (char __user *filename, char __user * __user *argv, char __user * __user *envp,
- struct pt_regs *regs)
- {
-diff -Nru a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h
---- a/include/asm-ia64/unistd.h 2005-02-14 02:54:07 -08:00
-+++ b/include/asm-ia64/unistd.h 2005-02-14 02:54:07 -08:00
-@@ -374,7 +374,7 @@
- int fd, long pgoff);
- struct pt_regs;
- struct sigaction;
--asmlinkage long sys_execve(char __user *filename, char __user * __user *argv,
-+long sys_execve(char __user *filename, char __user * __user *argv,
- char __user * __user *envp, struct pt_regs *regs);
- asmlinkage long sys_pipe(long arg0, long arg1, long arg2, long arg3,
- long arg4, long arg5, long arg6, long arg7, long stack);
Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-6
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-6 2005-03-10 23:26:10 UTC (rev 2666)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-6 2005-03-10 23:51:43 UTC (rev 2667)
@@ -9,55 +9,52 @@
+ outs.dpatch
- 083-x86_64_switch_mm_context_race.dpatch
+ sparc64-sb1500-clock-2.6.dpatch
-+ 088-ibmvscsi_event_struct_use_after_free.patch
-+ 089-i386_acpi_backwards_ifdef.patch
-+ 090-alsa_midi_emulation_chorus_reverb_swap.patch
-+ 091-alsa_emu8000_load_fx_skip_header.patch
-+ 092-net_sched_police_locate_sanity_check_input.patch
-+ 093-e1000_eeprom_read_off_by_one.patch
-+ 094-scsi_device_set_state_missing_oldstate.patch
-+ 095-jffs2_build_filesystem_memory_leak.patch
-+ 096-mtd_formatblock_zero_before_assignment.patch
-+ 097-mtd_s3c2410_nand_inithw_calc_rate_fix.patch
-+ 098-jffs2_do_mount_fs_init_bad_count.patch
-+ 099-jfs_commit_inode_commit_race.patch
-+ 101-ppc64_hugetlb_mm_free_pgd_unlock.patch
-+ 102-cosa_sppp_channel_init_delay_attach.patch
-+ 104-wan_sdla_firmware_cap_sys_rawio_addition.patch
-+ 105-cmsg_compat_ok_proper_cmsghdr_struct.patch
-+ 106-smbfs_input_validation_and_int_checks.patch
-+ 107-xfs_finish_reclaim_always_inode.patch
-+ 108-xfs_attrmulti_by_handle_limit_mem_alloc.patch
-+ 109-binfmt_elf_loader_solar_designer_fixes.patch
-+ 110-load_module_arg_checking.patch
-+ 111-security_seclvl_kconfig_dep.patch
-+ 112-audit_receive_skb_double_negative_return_val.patch
-+ 114-netfilter_private_queues.patch
-+ 115-proc_file_read_nbytes_signedness_fix.patch
-+ 116-n_tty_copy_from_read_buf_signedness_fixes.patch
-+ 117-reiserfs_file_64bit_size_t_fixes.patch
-+ 118-i2c_sis5595_setup_pci_config_return_checks.patch
-+ 119-i2c_viapro_i2cdump_overflow.patch
-+ 120-openpromfs_property_read_fix.patch
-+ 121-cpufreq_resume_readd.patch
-+ 122-cpufreq_resume_readd_2.patch
-+ 123-atm_get_addr_signedness_fix.patch
-+ 125-netfilter_private_queues_2.patch
-+ 126-ftdi_sio_set_serial_info_baud_base_check.patch
-+ 127-ia64_ptrace_corner_case.patch
-+ 129-video_cg3_screen_blanking.patch
-+ 130-sparc_prom_nodematch_check_getproperty.patch
-+ 131-sparc_check_prom_getproperty.patch
-+ 132-sparc32_get_tv32_use_correct_variable.patch
-+ 133-scsi_advansys_build_with_non_pci.patch
-+ 134-cciss_scsi_detect_put_host_on_error.patch
-+ 135-64bit_sys_shmget_compat_size_t_overflow.patch
-+ 136-64bit_sys_compat_overflows.patch
-+ 137-ppc64_prom_initialize_tce_table_typo.patch
-+ 138-tulip_de_init_one_irq_init.patch
-+ 139-pci_dma_free_coherent.patch
-+ 140-s390_memset_arg_order_fixes.patch
-+ 141-pci_devices_dont_disable_dev_if_busy.patch
-+ 142-r8169_dev_alloc_skb_alignment_fix.patch
-+ 143-sysfs_write_file_signedness_problem.patch
-+ 144-sys_epoll_wait_int_overflow.patch
++ 088-ibmvscsi_event_struct_use_after_free.dpatch
++ 089-i386_acpi_backwards_ifdef.dpatch
++ 090-alsa_midi_emulation_chorus_reverb_swap.dpatch
++ 091-alsa_emu8000_load_fx_skip_header.dpatch
++ 092-net_sched_police_locate_sanity_check_input.dpatch
++ 093-e1000_eeprom_read_off_by_one.dpatch
++ 094-scsi_device_set_state_missing_oldstate.dpatch
++ 095-jffs2_build_filesystem_memory_leak.dpatch
++ 096-mtd_formatblock_zero_before_assignment.dpatch
++ 097-mtd_s3c2410_nand_inithw_calc_rate_fix.dpatch
++ 098-jffs2_do_mount_fs_init_bad_count.dpatch
++ 099-jfs_commit_inode_commit_race.dpatch
++ 101-ppc64_hugetlb_mm_free_pgd_unlock.dpatch
++ 102-cosa_sppp_channel_init_delay_attach.dpatch
++ 104-wan_sdla_firmware_cap_sys_rawio_addition.dpatch
++ 107-xfs_finish_reclaim_always_inode.dpatch
++ 108-xfs_attrmulti_by_handle_limit_mem_alloc.dpatch
++ 109-binfmt_elf_loader_solar_designer_fixes.dpatch
++ 110-load_module_arg_checking.dpatch
++ 111-security_seclvl_kconfig_dep.dpatch
++ 112-audit_receive_skb_double_negative_return_val.dpatch
++ 114-netfilter_private_queues.dpatch
++ 115-proc_file_read_nbytes_signedness_fix.dpatch
++ 116-n_tty_copy_from_read_buf_signedness_fixes.dpatch
++ 117-reiserfs_file_64bit_size_t_fixes.dpatch
++ 118-i2c_sis5595_setup_pci_config_return_checks.dpatch
++ 119-i2c_viapro_i2cdump_overflow.dpatch
++ 120-openpromfs_property_read_fix.dpatch
++ 121-cpufreq_resume_readd.dpatch
++ 122-cpufreq_resume_readd_2.dpatch
++ 123-atm_get_addr_signedness_fix.dpatch
++ 125-netfilter_private_queues_2.dpatch
++ 126-ftdi_sio_set_serial_info_baud_base_check.dpatch
++ 129-video_cg3_screen_blanking.dpatch
++ 130-sparc_prom_nodematch_check_getproperty.dpatch
++ 131-sparc_check_prom_getproperty.dpatch
++ 132-sparc32_get_tv32_use_correct_variable.dpatch
++ 133-scsi_advansys_build_with_non_pci.dpatch
++ 134-cciss_scsi_detect_put_host_on_error.dpatch
++ 135-64bit_sys_shmget_compat_size_t_overflow.dpatch
++ 136-64bit_sys_compat_overflows.dpatch
++ 137-ppc64_prom_initialize_tce_table_typo.dpatch
++ 138-tulip_de_init_one_irq_init.dpatch
++ 139-pci_dma_free_coherent.dpatch
++ 140-s390_memset_arg_order_fixes.dpatch
++ 141-pci_devices_dont_disable_dev_if_busy.dpatch
++ 142-r8169_dev_alloc_skb_alignment_fix.dpatch
++ 143-sysfs_write_file_signedness_problem.dpatch
++ 144-sys_epoll_wait_int_overflow.dpatch