オープンソース・ソフトウェアの開発とダウンロード

TOMOYO

Subversion リポジトリの参照

/[tomoyo]/trunk/1.8.x/ccs-patch/patches/ccs-patch-2.6.18-debian-etch.diff

Diff of /trunk/1.8.x/ccs-patch/patches/ccs-patch-2.6.18-debian-etch.diff

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2944 by kumaneko, Mon Aug 24 05:00:52 2009 UTC revision 2949 by kumaneko, Tue Aug 25 01:16:00 2009 UTC
# Line 46  Source code for this patch is "apt-get i Line 46  Source code for this patch is "apt-get i
46   security/Makefile               |    3 +++   security/Makefile               |    3 +++
47   42 files changed, 292 insertions(+), 9 deletions(-)   42 files changed, 292 insertions(+), 9 deletions(-)
48    
49  --- linux-2.6.18-24etch3.orig/arch/alpha/kernel/ptrace.c  --- linux-2.6.18-24etch4.orig/arch/alpha/kernel/ptrace.c
50  +++ linux-2.6.18-24etch3/arch/alpha/kernel/ptrace.c  +++ linux-2.6.18-24etch4/arch/alpha/kernel/ptrace.c
51  @@ -20,6 +20,7 @@  @@ -20,6 +20,7 @@
52   #include <asm/pgtable.h>   #include <asm/pgtable.h>
53   #include <asm/system.h>   #include <asm/system.h>
# Line 65  Source code for this patch is "apt-get i Line 65  Source code for this patch is "apt-get i
65    
66          lock_kernel();          lock_kernel();
67          DBG(DBG_MEM, ("request=%ld pid=%ld addr=0x%lx data=0x%lx\n",          DBG(DBG_MEM, ("request=%ld pid=%ld addr=0x%lx data=0x%lx\n",
68  --- linux-2.6.18-24etch3.orig/arch/ia64/ia32/sys_ia32.c  --- linux-2.6.18-24etch4.orig/arch/ia64/ia32/sys_ia32.c
69  +++ linux-2.6.18-24etch3/arch/ia64/ia32/sys_ia32.c  +++ linux-2.6.18-24etch4/arch/ia64/ia32/sys_ia32.c
70  @@ -56,6 +56,7 @@  @@ -56,6 +56,7 @@
71   #include <asm/types.h>   #include <asm/types.h>
72   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 84  Source code for this patch is "apt-get i Line 84  Source code for this patch is "apt-get i
84    
85          lock_kernel();          lock_kernel();
86          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
87  --- linux-2.6.18-24etch3.orig/arch/ia64/kernel/ptrace.c  --- linux-2.6.18-24etch4.orig/arch/ia64/kernel/ptrace.c
88  +++ linux-2.6.18-24etch3/arch/ia64/kernel/ptrace.c  +++ linux-2.6.18-24etch4/arch/ia64/kernel/ptrace.c
89  @@ -28,6 +28,7 @@  @@ -28,6 +28,7 @@
90   #ifdef CONFIG_PERFMON   #ifdef CONFIG_PERFMON
91   #include <asm/perfmon.h>   #include <asm/perfmon.h>
# Line 103  Source code for this patch is "apt-get i Line 103  Source code for this patch is "apt-get i
103    
104          lock_kernel();          lock_kernel();
105          ret = -EPERM;          ret = -EPERM;
106  --- linux-2.6.18-24etch3.orig/arch/m32r/kernel/ptrace.c  --- linux-2.6.18-24etch4.orig/arch/m32r/kernel/ptrace.c
107  +++ linux-2.6.18-24etch3/arch/m32r/kernel/ptrace.c  +++ linux-2.6.18-24etch4/arch/m32r/kernel/ptrace.c
108  @@ -32,6 +32,7 @@  @@ -32,6 +32,7 @@
109   #include <asm/system.h>   #include <asm/system.h>
110   #include <asm/processor.h>   #include <asm/processor.h>
# Line 122  Source code for this patch is "apt-get i Line 122  Source code for this patch is "apt-get i
122    
123          lock_kernel();          lock_kernel();
124          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
125  --- linux-2.6.18-24etch3.orig/arch/mips/kernel/ptrace32.c  --- linux-2.6.18-24etch4.orig/arch/mips/kernel/ptrace32.c
126  +++ linux-2.6.18-24etch3/arch/mips/kernel/ptrace32.c  +++ linux-2.6.18-24etch4/arch/mips/kernel/ptrace32.c
127  @@ -35,6 +35,7 @@  @@ -35,6 +35,7 @@
128   #include <asm/system.h>   #include <asm/system.h>
129   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 141  Source code for this patch is "apt-get i Line 141  Source code for this patch is "apt-get i
141    
142   #if 0   #if 0
143          printk("ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n",          printk("ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n",
144  --- linux-2.6.18-24etch3.orig/arch/powerpc/kernel/ptrace32.c  --- linux-2.6.18-24etch4.orig/arch/powerpc/kernel/ptrace32.c
145  +++ linux-2.6.18-24etch3/arch/powerpc/kernel/ptrace32.c  +++ linux-2.6.18-24etch4/arch/powerpc/kernel/ptrace32.c
146  @@ -32,6 +32,7 @@  @@ -32,6 +32,7 @@
147   #include <asm/page.h>   #include <asm/page.h>
148   #include <asm/pgtable.h>   #include <asm/pgtable.h>
# Line 160  Source code for this patch is "apt-get i Line 160  Source code for this patch is "apt-get i
160    
161          lock_kernel();          lock_kernel();
162          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
163  --- linux-2.6.18-24etch3.orig/arch/s390/kernel/ptrace.c  --- linux-2.6.18-24etch4.orig/arch/s390/kernel/ptrace.c
164  +++ linux-2.6.18-24etch3/arch/s390/kernel/ptrace.c  +++ linux-2.6.18-24etch4/arch/s390/kernel/ptrace.c
165  @@ -41,6 +41,7 @@  @@ -41,6 +41,7 @@
166   #include <asm/system.h>   #include <asm/system.h>
167   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 179  Source code for this patch is "apt-get i Line 179  Source code for this patch is "apt-get i
179          lock_kernel();          lock_kernel();
180          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
181                   ret = ptrace_traceme();                   ret = ptrace_traceme();
182  --- linux-2.6.18-24etch3.orig/arch/sparc/kernel/ptrace.c  --- linux-2.6.18-24etch4.orig/arch/sparc/kernel/ptrace.c
183  +++ linux-2.6.18-24etch3/arch/sparc/kernel/ptrace.c  +++ linux-2.6.18-24etch4/arch/sparc/kernel/ptrace.c
184  @@ -23,6 +23,7 @@  @@ -23,6 +23,7 @@
185   #include <asm/pgtable.h>   #include <asm/pgtable.h>
186   #include <asm/system.h>   #include <asm/system.h>
# Line 200  Source code for this patch is "apt-get i Line 200  Source code for this patch is "apt-get i
200    
201          lock_kernel();          lock_kernel();
202   #ifdef DEBUG_PTRACE   #ifdef DEBUG_PTRACE
203  --- linux-2.6.18-24etch3.orig/arch/sparc64/kernel/ptrace.c  --- linux-2.6.18-24etch4.orig/arch/sparc64/kernel/ptrace.c
204  +++ linux-2.6.18-24etch3/arch/sparc64/kernel/ptrace.c  +++ linux-2.6.18-24etch4/arch/sparc64/kernel/ptrace.c
205  @@ -32,6 +32,7 @@  @@ -32,6 +32,7 @@
206   #include <asm/spitfire.h>   #include <asm/spitfire.h>
207   #include <asm/page.h>   #include <asm/page.h>
# Line 221  Source code for this patch is "apt-get i Line 221  Source code for this patch is "apt-get i
221    
222          if (test_thread_flag(TIF_32BIT)) {          if (test_thread_flag(TIF_32BIT)) {
223                  addr &= 0xffffffffUL;                  addr &= 0xffffffffUL;
224  --- linux-2.6.18-24etch3.orig/arch/x86_64/ia32/ptrace32.c  --- linux-2.6.18-24etch4.orig/arch/x86_64/ia32/ptrace32.c
225  +++ linux-2.6.18-24etch3/arch/x86_64/ia32/ptrace32.c  +++ linux-2.6.18-24etch4/arch/x86_64/ia32/ptrace32.c
226  @@ -26,6 +26,7 @@  @@ -26,6 +26,7 @@
227   #include <asm/i387.h>   #include <asm/i387.h>
228   #include <asm/fpu32.h>   #include <asm/fpu32.h>
# Line 240  Source code for this patch is "apt-get i Line 240  Source code for this patch is "apt-get i
240    
241          switch (request) {          switch (request) {
242          case PTRACE_TRACEME:          case PTRACE_TRACEME:
243  --- linux-2.6.18-24etch3.orig/fs/attr.c  --- linux-2.6.18-24etch4.orig/fs/attr.c
244  +++ linux-2.6.18-24etch3/fs/attr.c  +++ linux-2.6.18-24etch4/fs/attr.c
245  @@ -15,6 +15,7 @@  @@ -15,6 +15,7 @@
246   #include <linux/fcntl.h>   #include <linux/fcntl.h>
247   #include <linux/quotaops.h>   #include <linux/quotaops.h>
# Line 266  Source code for this patch is "apt-get i Line 266  Source code for this patch is "apt-get i
266                  if (!error) {                  if (!error) {
267                          if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||                          if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
268                              (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))                              (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))
269  --- linux-2.6.18-24etch3.orig/fs/compat.c  --- linux-2.6.18-24etch4.orig/fs/compat.c
270  +++ linux-2.6.18-24etch3/fs/compat.c  +++ linux-2.6.18-24etch4/fs/compat.c
271  @@ -52,6 +52,7 @@  @@ -52,6 +52,7 @@
272   #include <asm/uaccess.h>   #include <asm/uaccess.h>
273   #include <asm/mmu_context.h>   #include <asm/mmu_context.h>
# Line 305  Source code for this patch is "apt-get i Line 305  Source code for this patch is "apt-get i
305          if (retval >= 0) {          if (retval >= 0) {
306                  free_arg_pages(bprm);                  free_arg_pages(bprm);
307    
308  --- linux-2.6.18-24etch3.orig/fs/exec.c  --- linux-2.6.18-24etch4.orig/fs/exec.c
309  +++ linux-2.6.18-24etch3/fs/exec.c  +++ linux-2.6.18-24etch4/fs/exec.c
310  @@ -57,6 +57,8 @@  @@ -57,6 +57,8 @@
311   #include <linux/kmod.h>   #include <linux/kmod.h>
312   #endif   #endif
# Line 347  Source code for this patch is "apt-get i Line 347  Source code for this patch is "apt-get i
347          if (retval >= 0) {          if (retval >= 0) {
348                  free_arg_pages(bprm);                  free_arg_pages(bprm);
349    
350  --- linux-2.6.18-24etch3.orig/fs/fcntl.c  --- linux-2.6.18-24etch4.orig/fs/fcntl.c
351  +++ linux-2.6.18-24etch3/fs/fcntl.c  +++ linux-2.6.18-24etch4/fs/fcntl.c
352  @@ -22,6 +22,7 @@  @@ -22,6 +22,7 @@
353   #include <asm/poll.h>   #include <asm/poll.h>
354   #include <asm/siginfo.h>   #include <asm/siginfo.h>
# Line 367  Source code for this patch is "apt-get i Line 367  Source code for this patch is "apt-get i
367          /* O_NOATIME can only be set by the owner or superuser */          /* O_NOATIME can only be set by the owner or superuser */
368          if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))          if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))
369                  if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))                  if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
370  --- linux-2.6.18-24etch3.orig/fs/ioctl.c  --- linux-2.6.18-24etch4.orig/fs/ioctl.c
371  +++ linux-2.6.18-24etch3/fs/ioctl.c  +++ linux-2.6.18-24etch4/fs/ioctl.c
372  @@ -15,6 +15,7 @@  @@ -15,6 +15,7 @@
373    
374   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 395  Source code for this patch is "apt-get i Line 395  Source code for this patch is "apt-get i
395          if (error)          if (error)
396                  goto out_fput;                  goto out_fput;
397    
398  --- linux-2.6.18-24etch3.orig/fs/namei.c  --- linux-2.6.18-24etch4.orig/fs/namei.c
399  +++ linux-2.6.18-24etch3/fs/namei.c  +++ linux-2.6.18-24etch4/fs/namei.c
400  @@ -37,6 +37,8 @@  @@ -37,6 +37,8 @@
401    
402   #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])   #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])
# Line 506  Source code for this patch is "apt-get i Line 506  Source code for this patch is "apt-get i
506          error = vfs_rename(old_dir->d_inode, old_dentry,          error = vfs_rename(old_dir->d_inode, old_dentry,
507                                     new_dir->d_inode, new_dentry);                                     new_dir->d_inode, new_dentry);
508   exit5:   exit5:
509  --- linux-2.6.18-24etch3.orig/fs/namespace.c  --- linux-2.6.18-24etch4.orig/fs/namespace.c
510  +++ linux-2.6.18-24etch3/fs/namespace.c  +++ linux-2.6.18-24etch4/fs/namespace.c
511  @@ -25,6 +25,7 @@  @@ -25,6 +25,7 @@
512   #include <asm/uaccess.h>   #include <asm/uaccess.h>
513   #include <asm/unistd.h>   #include <asm/unistd.h>
# Line 595  Source code for this patch is "apt-get i Line 595  Source code for this patch is "apt-get i
595          if (error) {          if (error) {
596                  path_release(&old_nd);                  path_release(&old_nd);
597                  goto out1;                  goto out1;
598  --- linux-2.6.18-24etch3.orig/fs/open.c  --- linux-2.6.18-24etch4.orig/fs/open.c
599  +++ linux-2.6.18-24etch3/fs/open.c  +++ linux-2.6.18-24etch4/fs/open.c
600  @@ -30,6 +30,7 @@  @@ -30,6 +30,7 @@
601   #include <linux/audit.h>   #include <linux/audit.h>
602    
# Line 701  Source code for this patch is "apt-get i Line 701  Source code for this patch is "apt-get i
701          if (capable(CAP_SYS_TTY_CONFIG)) {          if (capable(CAP_SYS_TTY_CONFIG)) {
702                  tty_vhangup(current->signal->tty);                  tty_vhangup(current->signal->tty);
703                  return 0;                  return 0;
704  --- linux-2.6.18-24etch3.orig/fs/proc/proc_misc.c  --- linux-2.6.18-24etch4.orig/fs/proc/proc_misc.c
705  +++ linux-2.6.18-24etch3/fs/proc/proc_misc.c  +++ linux-2.6.18-24etch4/fs/proc/proc_misc.c
706  @@ -723,4 +723,5 @@ void __init proc_misc_init(void)  @@ -723,4 +723,5 @@ void __init proc_misc_init(void)
707          if (entry)          if (entry)
708                  entry->proc_fops = &proc_sysrq_trigger_operations;                  entry->proc_fops = &proc_sysrq_trigger_operations;
709   #endif   #endif
710  +       printk(KERN_INFO "Hook version: 2.6.18-24etch3 2009/08/23\n");  +       printk(KERN_INFO "Hook version: 2.6.18-24etch4 2009/08/25\n");
711   }   }
712  --- linux-2.6.18-24etch3.orig/include/linux/init_task.h  --- linux-2.6.18-24etch4.orig/include/linux/init_task.h
713  +++ linux-2.6.18-24etch3/include/linux/init_task.h  +++ linux-2.6.18-24etch4/include/linux/init_task.h
714  @@ -76,6 +76,14 @@  @@ -76,6 +76,14 @@
715    
716   extern struct group_info init_groups;   extern struct group_info init_groups;
# Line 734  Source code for this patch is "apt-get i Line 734  Source code for this patch is "apt-get i
734   }   }
735    
736    
737  --- linux-2.6.18-24etch3.orig/include/linux/sched.h  --- linux-2.6.18-24etch4.orig/include/linux/sched.h
738  +++ linux-2.6.18-24etch3/include/linux/sched.h  +++ linux-2.6.18-24etch4/include/linux/sched.h
739  @@ -25,6 +25,8 @@  @@ -25,6 +25,8 @@
740   #define CLONE_CHILD_SETTID     0x01000000      /* set the TID in the child */   #define CLONE_CHILD_SETTID     0x01000000      /* set the TID in the child */
741   #define CLONE_STOPPED          0x02000000      /* Start in stopped state */   #define CLONE_STOPPED          0x02000000      /* Start in stopped state */
# Line 756  Source code for this patch is "apt-get i Line 756  Source code for this patch is "apt-get i
756   };   };
757    
758   static inline pid_t process_group(struct task_struct *tsk)   static inline pid_t process_group(struct task_struct *tsk)
759  --- linux-2.6.18-24etch3.orig/kernel/compat.c  --- linux-2.6.18-24etch4.orig/kernel/compat.c
760  +++ linux-2.6.18-24etch3/kernel/compat.c  +++ linux-2.6.18-24etch4/kernel/compat.c
761  @@ -24,6 +24,7 @@  @@ -24,6 +24,7 @@
762   #include <linux/migrate.h>   #include <linux/migrate.h>
763    
# Line 775  Source code for this patch is "apt-get i Line 775  Source code for this patch is "apt-get i
775    
776          do_settimeofday(&tv);          do_settimeofday(&tv);
777          return 0;          return 0;
778  --- linux-2.6.18-24etch3.orig/kernel/kexec.c  --- linux-2.6.18-24etch4.orig/kernel/kexec.c
779  +++ linux-2.6.18-24etch3/kernel/kexec.c  +++ linux-2.6.18-24etch4/kernel/kexec.c
780  @@ -26,6 +26,7 @@  @@ -26,6 +26,7 @@
781   #include <asm/io.h>   #include <asm/io.h>
782   #include <asm/system.h>   #include <asm/system.h>
# Line 794  Source code for this patch is "apt-get i Line 794  Source code for this patch is "apt-get i
794    
795          /*          /*
796           * Verify we have a legal set of flags           * Verify we have a legal set of flags
797  --- linux-2.6.18-24etch3.orig/kernel/kmod.c  --- linux-2.6.18-24etch4.orig/kernel/kmod.c
798  +++ linux-2.6.18-24etch3/kernel/kmod.c  +++ linux-2.6.18-24etch4/kernel/kmod.c
799  @@ -148,6 +148,11 @@ static int ____call_usermodehelper(void  @@ -148,6 +148,11 @@ static int ____call_usermodehelper(void
800          /* We can run anywhere, unlike our parent keventd(). */          /* We can run anywhere, unlike our parent keventd(). */
801          set_cpus_allowed(current, CPU_MASK_ALL);          set_cpus_allowed(current, CPU_MASK_ALL);
# Line 808  Source code for this patch is "apt-get i Line 808  Source code for this patch is "apt-get i
808          retval = -EPERM;          retval = -EPERM;
809          if (current->fs->root)          if (current->fs->root)
810                  retval = execve(sub_info->path, sub_info->argv,sub_info->envp);                  retval = execve(sub_info->path, sub_info->argv,sub_info->envp);
811  --- linux-2.6.18-24etch3.orig/kernel/module.c  --- linux-2.6.18-24etch4.orig/kernel/module.c
812  +++ linux-2.6.18-24etch3/kernel/module.c  +++ linux-2.6.18-24etch4/kernel/module.c
813  @@ -44,6 +44,7 @@  @@ -44,6 +44,7 @@
814   #include <asm/semaphore.h>   #include <asm/semaphore.h>
815   #include <asm/cacheflush.h>   #include <asm/cacheflush.h>
# Line 838  Source code for this patch is "apt-get i Line 838  Source code for this patch is "apt-get i
838          /* Only one module load at a time, please */          /* Only one module load at a time, please */
839          if (mutex_lock_interruptible(&module_mutex) != 0)          if (mutex_lock_interruptible(&module_mutex) != 0)
840                  return -EINTR;                  return -EINTR;
841  --- linux-2.6.18-24etch3.orig/kernel/ptrace.c  --- linux-2.6.18-24etch4.orig/kernel/ptrace.c
842  +++ linux-2.6.18-24etch3/kernel/ptrace.c  +++ linux-2.6.18-24etch4/kernel/ptrace.c
843  @@ -21,6 +21,7 @@  @@ -21,6 +21,7 @@
844    
845   #include <asm/pgtable.h>   #include <asm/pgtable.h>
# Line 857  Source code for this patch is "apt-get i Line 857  Source code for this patch is "apt-get i
857          lock_kernel();          lock_kernel();
858          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
859                  ret = ptrace_traceme();                  ret = ptrace_traceme();
860  --- linux-2.6.18-24etch3.orig/kernel/sched.c  --- linux-2.6.18-24etch4.orig/kernel/sched.c
861  +++ linux-2.6.18-24etch3/kernel/sched.c  +++ linux-2.6.18-24etch4/kernel/sched.c
862  @@ -55,6 +55,7 @@  @@ -55,6 +55,7 @@
863   #include <asm/tlb.h>   #include <asm/tlb.h>
864    
# Line 876  Source code for this patch is "apt-get i Line 876  Source code for this patch is "apt-get i
876    
877          /*          /*
878           * Setpriority might change our priority at the same moment.           * Setpriority might change our priority at the same moment.
879  --- linux-2.6.18-24etch3.orig/kernel/signal.c  --- linux-2.6.18-24etch4.orig/kernel/signal.c
880  +++ linux-2.6.18-24etch3/kernel/signal.c  +++ linux-2.6.18-24etch4/kernel/signal.c
881  @@ -28,6 +28,7 @@  @@ -28,6 +28,7 @@
882   #include <asm/unistd.h>   #include <asm/unistd.h>
883   #include <asm/siginfo.h>   #include <asm/siginfo.h>
# Line 922  Source code for this patch is "apt-get i Line 922  Source code for this patch is "apt-get i
922    
923          /* POSIX.1b doesn't mention process groups.  */          /* POSIX.1b doesn't mention process groups.  */
924          return kill_proc_info(sig, &info, pid);          return kill_proc_info(sig, &info, pid);
925  --- linux-2.6.18-24etch3.orig/kernel/sys.c  --- linux-2.6.18-24etch4.orig/kernel/sys.c
926  +++ linux-2.6.18-24etch3/kernel/sys.c  +++ linux-2.6.18-24etch4/kernel/sys.c
927  @@ -36,6 +36,7 @@  @@ -36,6 +36,7 @@
928   #include <asm/uaccess.h>   #include <asm/uaccess.h>
929   #include <asm/io.h>   #include <asm/io.h>
# Line 970  Source code for this patch is "apt-get i Line 970  Source code for this patch is "apt-get i
970    
971          down_write(&uts_sem);          down_write(&uts_sem);
972          errno = -EFAULT;          errno = -EFAULT;
973  --- linux-2.6.18-24etch3.orig/kernel/sysctl.c  --- linux-2.6.18-24etch4.orig/kernel/sysctl.c
974  +++ linux-2.6.18-24etch3/kernel/sysctl.c  +++ linux-2.6.18-24etch4/kernel/sysctl.c
975  @@ -48,6 +48,7 @@  @@ -48,6 +48,7 @@
976    
977   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 1004  Source code for this patch is "apt-get i Line 1004  Source code for this patch is "apt-get i
1004                                          error = table->strategy(                                          error = table->strategy(
1005                                                  table, name, nlen,                                                  table, name, nlen,
1006                                                  oldval, oldlenp,                                                  oldval, oldlenp,
1007  --- linux-2.6.18-24etch3.orig/kernel/time.c  --- linux-2.6.18-24etch4.orig/kernel/time.c
1008  +++ linux-2.6.18-24etch3/kernel/time.c  +++ linux-2.6.18-24etch4/kernel/time.c
1009  @@ -39,6 +39,7 @@  @@ -39,6 +39,7 @@
1010    
1011   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 1041  Source code for this patch is "apt-get i Line 1041  Source code for this patch is "apt-get i
1041                                    
1042          /* Now we validate the data before disabling interrupts */          /* Now we validate the data before disabling interrupts */
1043    
1044  --- linux-2.6.18-24etch3.orig/net/ipv4/inet_connection_sock.c  --- linux-2.6.18-24etch4.orig/net/ipv4/inet_connection_sock.c
1045  +++ linux-2.6.18-24etch3/net/ipv4/inet_connection_sock.c  +++ linux-2.6.18-24etch4/net/ipv4/inet_connection_sock.c
1046  @@ -23,6 +23,7 @@  @@ -23,6 +23,7 @@
1047   #include <net/route.h>   #include <net/route.h>
1048   #include <net/tcp_states.h>   #include <net/tcp_states.h>
# Line 1060  Source code for this patch is "apt-get i Line 1060  Source code for this patch is "apt-get i
1060                          inet_bind_bucket_for_each(tb, node, &head->chain)                          inet_bind_bucket_for_each(tb, node, &head->chain)
1061                                  if (tb->port == rover)                                  if (tb->port == rover)
1062                                          goto next;                                          goto next;
1063  --- linux-2.6.18-24etch3.orig/net/ipv4/inet_hashtables.c  --- linux-2.6.18-24etch4.orig/net/ipv4/inet_hashtables.c
1064  +++ linux-2.6.18-24etch3/net/ipv4/inet_hashtables.c  +++ linux-2.6.18-24etch4/net/ipv4/inet_hashtables.c
1065  @@ -22,6 +22,7 @@  @@ -22,6 +22,7 @@
1066   #include <net/inet_connection_sock.h>   #include <net/inet_connection_sock.h>
1067   #include <net/inet_hashtables.h>   #include <net/inet_hashtables.h>
# Line 1079  Source code for this patch is "apt-get i Line 1079  Source code for this patch is "apt-get i
1079                          head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];                          head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];
1080                          spin_lock(&head->lock);                          spin_lock(&head->lock);
1081    
1082  --- linux-2.6.18-24etch3.orig/net/ipv4/raw.c  --- linux-2.6.18-24etch4.orig/net/ipv4/raw.c
1083  +++ linux-2.6.18-24etch3/net/ipv4/raw.c  +++ linux-2.6.18-24etch4/net/ipv4/raw.c
1084  @@ -79,6 +79,7 @@  @@ -79,6 +79,7 @@
1085   #include <linux/seq_file.h>   #include <linux/seq_file.h>
1086   #include <linux/netfilter.h>   #include <linux/netfilter.h>
# Line 1099  Source code for this patch is "apt-get i Line 1099  Source code for this patch is "apt-get i
1099    
1100          copied = skb->len;          copied = skb->len;
1101          if (len < copied) {          if (len < copied) {
1102  --- linux-2.6.18-24etch3.orig/net/ipv4/udp.c  --- linux-2.6.18-24etch4.orig/net/ipv4/udp.c
1103  +++ linux-2.6.18-24etch3/net/ipv4/udp.c  +++ linux-2.6.18-24etch4/net/ipv4/udp.c
1104  @@ -108,6 +108,7 @@  @@ -108,6 +108,7 @@
1105   #include <net/inet_common.h>   #include <net/inet_common.h>
1106   #include <net/checksum.h>   #include <net/checksum.h>
# Line 1139  Source code for this patch is "apt-get i Line 1139  Source code for this patch is "apt-get i
1139          copied = skb->len - sizeof(struct udphdr);          copied = skb->len - sizeof(struct udphdr);
1140          if (copied > len) {          if (copied > len) {
1141                  copied = len;                  copied = len;
1142  --- linux-2.6.18-24etch3.orig/net/ipv6/inet6_hashtables.c  --- linux-2.6.18-24etch4.orig/net/ipv6/inet6_hashtables.c
1143  +++ linux-2.6.18-24etch3/net/ipv6/inet6_hashtables.c  +++ linux-2.6.18-24etch4/net/ipv6/inet6_hashtables.c
1144  @@ -21,6 +21,7 @@  @@ -21,6 +21,7 @@
1145   #include <net/inet_hashtables.h>   #include <net/inet_hashtables.h>
1146   #include <net/inet6_hashtables.h>   #include <net/inet6_hashtables.h>
# Line 1167  Source code for this patch is "apt-get i Line 1167  Source code for this patch is "apt-get i
1167                          head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];                          head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];
1168                          spin_lock(&head->lock);                          spin_lock(&head->lock);
1169    
1170  --- linux-2.6.18-24etch3.orig/net/ipv6/raw.c  --- linux-2.6.18-24etch4.orig/net/ipv6/raw.c
1171  +++ linux-2.6.18-24etch3/net/ipv6/raw.c  +++ linux-2.6.18-24etch4/net/ipv6/raw.c
1172  @@ -56,6 +56,7 @@  @@ -56,6 +56,7 @@
1173    
1174   #include <linux/proc_fs.h>   #include <linux/proc_fs.h>
# Line 1187  Source code for this patch is "apt-get i Line 1187  Source code for this patch is "apt-get i
1187    
1188          copied = skb->len;          copied = skb->len;
1189          if (copied > len) {          if (copied > len) {
1190  --- linux-2.6.18-24etch3.orig/net/ipv6/udp.c  --- linux-2.6.18-24etch4.orig/net/ipv6/udp.c
1191  +++ linux-2.6.18-24etch3/net/ipv6/udp.c  +++ linux-2.6.18-24etch4/net/ipv6/udp.c
1192  @@ -58,6 +58,7 @@  @@ -58,6 +58,7 @@
1193    
1194   #include <linux/proc_fs.h>   #include <linux/proc_fs.h>
# Line 1225  Source code for this patch is "apt-get i Line 1225  Source code for this patch is "apt-get i
1225    
1226          copied = skb->len - sizeof(struct udphdr);          copied = skb->len - sizeof(struct udphdr);
1227          if (copied > len) {          if (copied > len) {
1228  --- linux-2.6.18-24etch3.orig/net/socket.c  --- linux-2.6.18-24etch4.orig/net/socket.c
1229  +++ linux-2.6.18-24etch3/net/socket.c  +++ linux-2.6.18-24etch4/net/socket.c
1230  @@ -94,6 +94,8 @@  @@ -94,6 +94,8 @@
1231   #include <net/sock.h>   #include <net/sock.h>
1232   #include <linux/netfilter.h>   #include <linux/netfilter.h>
# Line 1305  Source code for this patch is "apt-get i Line 1305  Source code for this patch is "apt-get i
1305          err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen,          err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen,
1306                                   sock->file->f_flags);                                   sock->file->f_flags);
1307   out_put:   out_put:
1308  --- linux-2.6.18-24etch3.orig/net/unix/af_unix.c  --- linux-2.6.18-24etch4.orig/net/unix/af_unix.c
1309  +++ linux-2.6.18-24etch3/net/unix/af_unix.c  +++ linux-2.6.18-24etch4/net/unix/af_unix.c
1310  @@ -116,6 +116,7 @@  @@ -116,6 +116,7 @@
1311   #include <linux/mount.h>   #include <linux/mount.h>
1312   #include <net/checksum.h>   #include <net/checksum.h>
# Line 1325  Source code for this patch is "apt-get i Line 1325  Source code for this patch is "apt-get i
1325                  err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0);                  err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0);
1326                  if (err)                  if (err)
1327                          goto out_mknod_dput;                          goto out_mknod_dput;
1328  --- linux-2.6.18-24etch3.orig/security/Kconfig  --- linux-2.6.18-24etch4.orig/security/Kconfig
1329  +++ linux-2.6.18-24etch3/security/Kconfig  +++ linux-2.6.18-24etch4/security/Kconfig
1330  @@ -107,5 +107,7 @@ config SECURITY_SECLVL  @@ -107,5 +107,7 @@ config SECURITY_SECLVL
1331    
1332   source security/selinux/Kconfig   source security/selinux/Kconfig
# Line 1335  Source code for this patch is "apt-get i Line 1335  Source code for this patch is "apt-get i
1335  +  +
1336   endmenu   endmenu
1337    
1338  --- linux-2.6.18-24etch3.orig/security/Makefile  --- linux-2.6.18-24etch4.orig/security/Makefile
1339  +++ linux-2.6.18-24etch3/security/Makefile  +++ linux-2.6.18-24etch4/security/Makefile
1340  @@ -17,3 +17,6 @@ obj-$(CONFIG_SECURITY_SELINUX)                += selin  @@ -17,3 +17,6 @@ obj-$(CONFIG_SECURITY_SELINUX)                += selin
1341   obj-$(CONFIG_SECURITY_CAPABILITIES)    += commoncap.o capability.o   obj-$(CONFIG_SECURITY_CAPABILITIES)    += commoncap.o capability.o
1342   obj-$(CONFIG_SECURITY_ROOTPLUG)                += commoncap.o root_plug.o   obj-$(CONFIG_SECURITY_ROOTPLUG)                += commoncap.o root_plug.o
Legend:
Removed from v.2944  
changed lines
  Added in v.2949
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
サイト情報
ソフトウェアを探す
ソフトウェアを作る
コミュニティ
ヘルプ