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

TOMOYO

Subversion リポジトリの参照

/[tomoyo]/branches/ccs-patch/patches/ccs-patch-2.6.15-ubuntu-6.06.diff

Diff of /branches/ccs-patch/patches/ccs-patch-2.6.15-ubuntu-6.06.diff

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

revision 3141 by kumaneko, Thu Nov 5 06:51:09 2009 UTC revision 3228 by kumaneko, Sat Dec 5 04:59:03 2009 UTC
# Line 45  Source code for this patch is "apt-get i Line 45  Source code for this patch is "apt-get i
45   security/Makefile               |    3 +++   security/Makefile               |    3 +++
46   41 files changed, 285 insertions(+), 10 deletions(-)   41 files changed, 285 insertions(+), 10 deletions(-)
47    
48  --- linux-2.6.15-55.80.orig/arch/alpha/kernel/ptrace.c  --- linux-2.6.15-55.81.orig/arch/alpha/kernel/ptrace.c
49  +++ linux-2.6.15-55.80/arch/alpha/kernel/ptrace.c  +++ linux-2.6.15-55.81/arch/alpha/kernel/ptrace.c
50  @@ -20,6 +20,7 @@  @@ -20,6 +20,7 @@
51   #include <asm/pgtable.h>   #include <asm/pgtable.h>
52   #include <asm/system.h>   #include <asm/system.h>
# Line 64  Source code for this patch is "apt-get i Line 64  Source code for this patch is "apt-get i
64    
65          lock_kernel();          lock_kernel();
66          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",
67  --- linux-2.6.15-55.80.orig/arch/ia64/ia32/sys_ia32.c  --- linux-2.6.15-55.81.orig/arch/ia64/ia32/sys_ia32.c
68  +++ linux-2.6.15-55.80/arch/ia64/ia32/sys_ia32.c  +++ linux-2.6.15-55.81/arch/ia64/ia32/sys_ia32.c
69  @@ -57,6 +57,7 @@  @@ -57,6 +57,7 @@
70   #include <asm/types.h>   #include <asm/types.h>
71   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 83  Source code for this patch is "apt-get i Line 83  Source code for this patch is "apt-get i
83    
84          lock_kernel();          lock_kernel();
85          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
86  --- linux-2.6.15-55.80.orig/arch/ia64/kernel/ptrace.c  --- linux-2.6.15-55.81.orig/arch/ia64/kernel/ptrace.c
87  +++ linux-2.6.15-55.80/arch/ia64/kernel/ptrace.c  +++ linux-2.6.15-55.81/arch/ia64/kernel/ptrace.c
88  @@ -29,6 +29,7 @@  @@ -29,6 +29,7 @@
89   #ifdef CONFIG_PERFMON   #ifdef CONFIG_PERFMON
90   #include <asm/perfmon.h>   #include <asm/perfmon.h>
# Line 102  Source code for this patch is "apt-get i Line 102  Source code for this patch is "apt-get i
102    
103          lock_kernel();          lock_kernel();
104          ret = -EPERM;          ret = -EPERM;
105  --- linux-2.6.15-55.80.orig/arch/m32r/kernel/ptrace.c  --- linux-2.6.15-55.81.orig/arch/m32r/kernel/ptrace.c
106  +++ linux-2.6.15-55.80/arch/m32r/kernel/ptrace.c  +++ linux-2.6.15-55.81/arch/m32r/kernel/ptrace.c
107  @@ -33,6 +33,7 @@  @@ -33,6 +33,7 @@
108   #include <asm/system.h>   #include <asm/system.h>
109   #include <asm/processor.h>   #include <asm/processor.h>
# Line 121  Source code for this patch is "apt-get i Line 121  Source code for this patch is "apt-get i
121    
122          lock_kernel();          lock_kernel();
123          ret = -EPERM;          ret = -EPERM;
124  --- linux-2.6.15-55.80.orig/arch/mips/kernel/ptrace32.c  --- linux-2.6.15-55.81.orig/arch/mips/kernel/ptrace32.c
125  +++ linux-2.6.15-55.80/arch/mips/kernel/ptrace32.c  +++ linux-2.6.15-55.81/arch/mips/kernel/ptrace32.c
126  @@ -35,6 +35,7 @@  @@ -35,6 +35,7 @@
127   #include <asm/system.h>   #include <asm/system.h>
128   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 140  Source code for this patch is "apt-get i Line 140  Source code for this patch is "apt-get i
140    
141   #if 0   #if 0
142          printk("ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n",          printk("ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n",
143  --- linux-2.6.15-55.80.orig/arch/powerpc/kernel/ptrace32.c  --- linux-2.6.15-55.81.orig/arch/powerpc/kernel/ptrace32.c
144  +++ linux-2.6.15-55.80/arch/powerpc/kernel/ptrace32.c  +++ linux-2.6.15-55.81/arch/powerpc/kernel/ptrace32.c
145  @@ -33,6 +33,7 @@  @@ -33,6 +33,7 @@
146   #include <asm/page.h>   #include <asm/page.h>
147   #include <asm/pgtable.h>   #include <asm/pgtable.h>
# Line 159  Source code for this patch is "apt-get i Line 159  Source code for this patch is "apt-get i
159    
160          lock_kernel();          lock_kernel();
161          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
162  --- linux-2.6.15-55.80.orig/arch/s390/kernel/ptrace.c  --- linux-2.6.15-55.81.orig/arch/s390/kernel/ptrace.c
163  +++ linux-2.6.15-55.80/arch/s390/kernel/ptrace.c  +++ linux-2.6.15-55.81/arch/s390/kernel/ptrace.c
164  @@ -41,6 +41,7 @@  @@ -41,6 +41,7 @@
165   #include <asm/system.h>   #include <asm/system.h>
166   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 178  Source code for this patch is "apt-get i Line 178  Source code for this patch is "apt-get i
178          lock_kernel();          lock_kernel();
179    
180          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
181  --- linux-2.6.15-55.80.orig/arch/sparc/kernel/ptrace.c  --- linux-2.6.15-55.81.orig/arch/sparc/kernel/ptrace.c
182  +++ linux-2.6.15-55.80/arch/sparc/kernel/ptrace.c  +++ linux-2.6.15-55.81/arch/sparc/kernel/ptrace.c
183  @@ -23,6 +23,7 @@  @@ -23,6 +23,7 @@
184   #include <asm/pgtable.h>   #include <asm/pgtable.h>
185   #include <asm/system.h>   #include <asm/system.h>
# Line 199  Source code for this patch is "apt-get i Line 199  Source code for this patch is "apt-get i
199    
200          lock_kernel();          lock_kernel();
201   #ifdef DEBUG_PTRACE   #ifdef DEBUG_PTRACE
202  --- linux-2.6.15-55.80.orig/arch/sparc64/kernel/ptrace.c  --- linux-2.6.15-55.81.orig/arch/sparc64/kernel/ptrace.c
203  +++ linux-2.6.15-55.80/arch/sparc64/kernel/ptrace.c  +++ linux-2.6.15-55.81/arch/sparc64/kernel/ptrace.c
204  @@ -32,6 +32,7 @@  @@ -32,6 +32,7 @@
205   #include <asm/spitfire.h>   #include <asm/spitfire.h>
206   #include <asm/page.h>   #include <asm/page.h>
# Line 220  Source code for this patch is "apt-get i Line 220  Source code for this patch is "apt-get i
220    
221          if (test_thread_flag(TIF_32BIT)) {          if (test_thread_flag(TIF_32BIT)) {
222                  addr &= 0xffffffffUL;                  addr &= 0xffffffffUL;
223  --- linux-2.6.15-55.80.orig/arch/x86_64/ia32/ptrace32.c  --- linux-2.6.15-55.81.orig/arch/x86_64/ia32/ptrace32.c
224  +++ linux-2.6.15-55.80/arch/x86_64/ia32/ptrace32.c  +++ linux-2.6.15-55.81/arch/x86_64/ia32/ptrace32.c
225  @@ -27,6 +27,7 @@  @@ -27,6 +27,7 @@
226   #include <asm/debugreg.h>   #include <asm/debugreg.h>
227   #include <asm/i387.h>   #include <asm/i387.h>
# Line 239  Source code for this patch is "apt-get i Line 239  Source code for this patch is "apt-get i
239    
240          switch (request) {          switch (request) {
241          default:          default:
242  --- linux-2.6.15-55.80.orig/fs/compat.c  --- linux-2.6.15-55.81.orig/fs/compat.c
243  +++ linux-2.6.15-55.80/fs/compat.c  +++ linux-2.6.15-55.81/fs/compat.c
244  @@ -52,6 +52,7 @@  @@ -52,6 +52,7 @@
245   #include <asm/uaccess.h>   #include <asm/uaccess.h>
246   #include <asm/mmu_context.h>   #include <asm/mmu_context.h>
# Line 278  Source code for this patch is "apt-get i Line 278  Source code for this patch is "apt-get i
278          if (retval >= 0) {          if (retval >= 0) {
279                  free_arg_pages(bprm);                  free_arg_pages(bprm);
280    
281  --- linux-2.6.15-55.80.orig/fs/exec.c  --- linux-2.6.15-55.81.orig/fs/exec.c
282  +++ linux-2.6.15-55.80/fs/exec.c  +++ linux-2.6.15-55.81/fs/exec.c
283  @@ -57,6 +57,8 @@  @@ -57,6 +57,8 @@
284   #include <linux/kmod.h>   #include <linux/kmod.h>
285   #endif   #endif
# Line 320  Source code for this patch is "apt-get i Line 320  Source code for this patch is "apt-get i
320          if (retval >= 0) {          if (retval >= 0) {
321                  free_arg_pages(bprm);                  free_arg_pages(bprm);
322    
323  --- linux-2.6.15-55.80.orig/fs/fcntl.c  --- linux-2.6.15-55.81.orig/fs/fcntl.c
324  +++ linux-2.6.15-55.80/fs/fcntl.c  +++ linux-2.6.15-55.81/fs/fcntl.c
325  @@ -21,6 +21,7 @@  @@ -21,6 +21,7 @@
326   #include <asm/poll.h>   #include <asm/poll.h>
327   #include <asm/siginfo.h>   #include <asm/siginfo.h>
# Line 340  Source code for this patch is "apt-get i Line 340  Source code for this patch is "apt-get i
340          /* O_NOATIME can only be set by the owner or superuser */          /* O_NOATIME can only be set by the owner or superuser */
341          if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))          if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))
342                  if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))                  if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
343  --- linux-2.6.15-55.80.orig/fs/ioctl.c  --- linux-2.6.15-55.81.orig/fs/ioctl.c
344  +++ linux-2.6.15-55.80/fs/ioctl.c  +++ linux-2.6.15-55.81/fs/ioctl.c
345  @@ -15,6 +15,7 @@  @@ -15,6 +15,7 @@
346    
347   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 368  Source code for this patch is "apt-get i Line 368  Source code for this patch is "apt-get i
368          if (error)          if (error)
369                  goto out_fput;                  goto out_fput;
370    
371  --- linux-2.6.15-55.80.orig/fs/namei.c  --- linux-2.6.15-55.81.orig/fs/namei.c
372  +++ linux-2.6.15-55.80/fs/namei.c  +++ linux-2.6.15-55.81/fs/namei.c
373  @@ -34,6 +34,8 @@  @@ -34,6 +34,8 @@
374    
375   #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])   #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])
# Line 479  Source code for this patch is "apt-get i Line 479  Source code for this patch is "apt-get i
479          error = vfs_rename(old_dir->d_inode, old_dentry,          error = vfs_rename(old_dir->d_inode, old_dentry,
480                                     new_dir->d_inode, new_dentry);                                     new_dir->d_inode, new_dentry);
481   exit5:   exit5:
482  --- linux-2.6.15-55.80.orig/fs/namespace.c  --- linux-2.6.15-55.81.orig/fs/namespace.c
483  +++ linux-2.6.15-55.80/fs/namespace.c  +++ linux-2.6.15-55.81/fs/namespace.c
484  @@ -25,6 +25,7 @@  @@ -25,6 +25,7 @@
485   #include <asm/uaccess.h>   #include <asm/uaccess.h>
486   #include <asm/unistd.h>   #include <asm/unistd.h>
# Line 574  Source code for this patch is "apt-get i Line 574  Source code for this patch is "apt-get i
574          if (error) {          if (error) {
575                  path_release(&old_nd);                  path_release(&old_nd);
576                  goto out1;                  goto out1;
577  --- linux-2.6.15-55.80.orig/fs/open.c  --- linux-2.6.15-55.81.orig/fs/open.c
578  +++ linux-2.6.15-55.80/fs/open.c  +++ linux-2.6.15-55.81/fs/open.c
579  @@ -28,6 +28,8 @@  @@ -28,6 +28,8 @@
580    
581   #include <asm/unistd.h>   #include <asm/unistd.h>
# Line 683  Source code for this patch is "apt-get i Line 683  Source code for this patch is "apt-get i
683          if (capable(CAP_SYS_TTY_CONFIG)) {          if (capable(CAP_SYS_TTY_CONFIG)) {
684                  tty_vhangup(current->signal->tty);                  tty_vhangup(current->signal->tty);
685                  return 0;                  return 0;
686  --- linux-2.6.15-55.80.orig/fs/proc/proc_misc.c  --- linux-2.6.15-55.81.orig/fs/proc/proc_misc.c
687  +++ linux-2.6.15-55.80/fs/proc/proc_misc.c  +++ linux-2.6.15-55.81/fs/proc/proc_misc.c
688  @@ -629,4 +629,5 @@ void __init proc_misc_init(void)  @@ -629,4 +629,5 @@ void __init proc_misc_init(void)
689          if (entry)          if (entry)
690                  entry->proc_fops = &proc_sysrq_trigger_operations;                  entry->proc_fops = &proc_sysrq_trigger_operations;
691   #endif   #endif
692  +       printk(KERN_INFO "Hook version: 2.6.15-55.80 2009/10/22\n");  +       printk(KERN_INFO "Hook version: 2.6.15-55.81 2009/12/05\n");
693   }   }
694  --- linux-2.6.15-55.80.orig/include/linux/init_task.h  --- linux-2.6.15-55.81.orig/include/linux/init_task.h
695  +++ linux-2.6.15-55.80/include/linux/init_task.h  +++ linux-2.6.15-55.81/include/linux/init_task.h
696  @@ -72,6 +72,14 @@  @@ -72,6 +72,14 @@
697    
698   extern struct group_info init_groups;   extern struct group_info init_groups;
# Line 716  Source code for this patch is "apt-get i Line 716  Source code for this patch is "apt-get i
716   }   }
717    
718    
719  --- linux-2.6.15-55.80.orig/include/linux/sched.h  --- linux-2.6.15-55.81.orig/include/linux/sched.h
720  +++ linux-2.6.15-55.80/include/linux/sched.h  +++ linux-2.6.15-55.81/include/linux/sched.h
721  @@ -165,6 +165,8 @@ struct sched_param {  @@ -165,6 +165,8 @@ struct sched_param {
722    
723   #ifdef __KERNEL__   #ifdef __KERNEL__
# Line 738  Source code for this patch is "apt-get i Line 738  Source code for this patch is "apt-get i
738   };   };
739    
740   static inline pid_t process_group(struct task_struct *tsk)   static inline pid_t process_group(struct task_struct *tsk)
741  --- linux-2.6.15-55.80.orig/kernel/compat.c  --- linux-2.6.15-55.81.orig/kernel/compat.c
742  +++ linux-2.6.15-55.80/kernel/compat.c  +++ linux-2.6.15-55.81/kernel/compat.c
743  @@ -24,6 +24,7 @@  @@ -24,6 +24,7 @@
744    
745   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 757  Source code for this patch is "apt-get i Line 757  Source code for this patch is "apt-get i
757    
758          do_settimeofday(&tv);          do_settimeofday(&tv);
759          return 0;          return 0;
760  --- linux-2.6.15-55.80.orig/kernel/kexec.c  --- linux-2.6.15-55.81.orig/kernel/kexec.c
761  +++ linux-2.6.15-55.80/kernel/kexec.c  +++ linux-2.6.15-55.81/kernel/kexec.c
762  @@ -25,6 +25,7 @@  @@ -25,6 +25,7 @@
763   #include <asm/io.h>   #include <asm/io.h>
764   #include <asm/system.h>   #include <asm/system.h>
# Line 776  Source code for this patch is "apt-get i Line 776  Source code for this patch is "apt-get i
776    
777          /*          /*
778           * Verify we have a legal set of flags           * Verify we have a legal set of flags
779  --- linux-2.6.15-55.80.orig/kernel/kmod.c  --- linux-2.6.15-55.81.orig/kernel/kmod.c
780  +++ linux-2.6.15-55.80/kernel/kmod.c  +++ linux-2.6.15-55.81/kernel/kmod.c
781  @@ -149,6 +149,11 @@ static int ____call_usermodehelper(void  @@ -149,6 +149,11 @@ static int ____call_usermodehelper(void
782          /* We can run anywhere, unlike our parent keventd(). */          /* We can run anywhere, unlike our parent keventd(). */
783          set_cpus_allowed(current, CPU_MASK_ALL);          set_cpus_allowed(current, CPU_MASK_ALL);
# Line 790  Source code for this patch is "apt-get i Line 790  Source code for this patch is "apt-get i
790          retval = -EPERM;          retval = -EPERM;
791          if (current->fs->root)          if (current->fs->root)
792                  retval = execve(sub_info->path, sub_info->argv,sub_info->envp);                  retval = execve(sub_info->path, sub_info->argv,sub_info->envp);
793  --- linux-2.6.15-55.80.orig/kernel/module.c  --- linux-2.6.15-55.81.orig/kernel/module.c
794  +++ linux-2.6.15-55.80/kernel/module.c  +++ linux-2.6.15-55.81/kernel/module.c
795  @@ -41,6 +41,7 @@  @@ -41,6 +41,7 @@
796   #include <asm/uaccess.h>   #include <asm/uaccess.h>
797   #include <asm/semaphore.h>   #include <asm/semaphore.h>
# Line 820  Source code for this patch is "apt-get i Line 820  Source code for this patch is "apt-get i
820          /* Only one module load at a time, please */          /* Only one module load at a time, please */
821          if (down_interruptible(&module_mutex) != 0)          if (down_interruptible(&module_mutex) != 0)
822                  return -EINTR;                  return -EINTR;
823  --- linux-2.6.15-55.80.orig/kernel/ptrace.c  --- linux-2.6.15-55.81.orig/kernel/ptrace.c
824  +++ linux-2.6.15-55.80/kernel/ptrace.c  +++ linux-2.6.15-55.81/kernel/ptrace.c
825  @@ -21,6 +21,7 @@  @@ -21,6 +21,7 @@
826    
827   #include <asm/pgtable.h>   #include <asm/pgtable.h>
# Line 839  Source code for this patch is "apt-get i Line 839  Source code for this patch is "apt-get i
839          lock_kernel();          lock_kernel();
840          ret = ptrace_get_task_struct(request, pid, &child);          ret = ptrace_get_task_struct(request, pid, &child);
841          if (!child)          if (!child)
842  --- linux-2.6.15-55.80.orig/kernel/sched.c  --- linux-2.6.15-55.81.orig/kernel/sched.c
843  +++ linux-2.6.15-55.80/kernel/sched.c  +++ linux-2.6.15-55.81/kernel/sched.c
844  @@ -50,6 +50,7 @@  @@ -50,6 +50,7 @@
845   #include <asm/tlb.h>   #include <asm/tlb.h>
846    
# Line 858  Source code for this patch is "apt-get i Line 858  Source code for this patch is "apt-get i
858    
859          /*          /*
860           * Setpriority might change our priority at the same moment.           * Setpriority might change our priority at the same moment.
861  --- linux-2.6.15-55.80.orig/kernel/signal.c  --- linux-2.6.15-55.81.orig/kernel/signal.c
862  +++ linux-2.6.15-55.80/kernel/signal.c  +++ linux-2.6.15-55.81/kernel/signal.c
863  @@ -29,6 +29,7 @@  @@ -29,6 +29,7 @@
864   #include <asm/uaccess.h>   #include <asm/uaccess.h>
865   #include <asm/unistd.h>   #include <asm/unistd.h>
# Line 904  Source code for this patch is "apt-get i Line 904  Source code for this patch is "apt-get i
904    
905          /* POSIX.1b doesn't mention process groups.  */          /* POSIX.1b doesn't mention process groups.  */
906          return kill_proc_info(sig, &info, pid);          return kill_proc_info(sig, &info, pid);
907  --- linux-2.6.15-55.80.orig/kernel/sys.c  --- linux-2.6.15-55.81.orig/kernel/sys.c
908  +++ linux-2.6.15-55.80/kernel/sys.c  +++ linux-2.6.15-55.81/kernel/sys.c
909  @@ -37,6 +37,7 @@  @@ -37,6 +37,7 @@
910   #include <asm/uaccess.h>   #include <asm/uaccess.h>
911   #include <asm/io.h>   #include <asm/io.h>
# Line 952  Source code for this patch is "apt-get i Line 952  Source code for this patch is "apt-get i
952    
953          down_write(&uts_sem);          down_write(&uts_sem);
954          errno = -EFAULT;          errno = -EFAULT;
955  --- linux-2.6.15-55.80.orig/kernel/sysctl.c  --- linux-2.6.15-55.81.orig/kernel/sysctl.c
956  +++ linux-2.6.15-55.80/kernel/sysctl.c  +++ linux-2.6.15-55.81/kernel/sysctl.c
957  @@ -45,6 +45,7 @@  @@ -45,6 +45,7 @@
958    
959   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 986  Source code for this patch is "apt-get i Line 986  Source code for this patch is "apt-get i
986                                          error = table->strategy(                                          error = table->strategy(
987                                                  table, name, nlen,                                                  table, name, nlen,
988                                                  oldval, oldlenp,                                                  oldval, oldlenp,
989  --- linux-2.6.15-55.80.orig/kernel/time.c  --- linux-2.6.15-55.81.orig/kernel/time.c
990  +++ linux-2.6.15-55.80/kernel/time.c  +++ linux-2.6.15-55.81/kernel/time.c
991  @@ -38,6 +38,7 @@  @@ -38,6 +38,7 @@
992    
993   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 1023  Source code for this patch is "apt-get i Line 1023  Source code for this patch is "apt-get i
1023                                    
1024          /* Now we validate the data before disabling interrupts */          /* Now we validate the data before disabling interrupts */
1025    
1026  --- linux-2.6.15-55.80.orig/net/ipv4/inet_connection_sock.c  --- linux-2.6.15-55.81.orig/net/ipv4/inet_connection_sock.c
1027  +++ linux-2.6.15-55.80/net/ipv4/inet_connection_sock.c  +++ linux-2.6.15-55.81/net/ipv4/inet_connection_sock.c
1028  @@ -24,6 +24,7 @@  @@ -24,6 +24,7 @@
1029   #include <net/route.h>   #include <net/route.h>
1030   #include <net/tcp_states.h>   #include <net/tcp_states.h>
# Line 1042  Source code for this patch is "apt-get i Line 1042  Source code for this patch is "apt-get i
1042                          inet_bind_bucket_for_each(tb, node, &head->chain)                          inet_bind_bucket_for_each(tb, node, &head->chain)
1043                                  if (tb->port == rover)                                  if (tb->port == rover)
1044                                          goto next;                                          goto next;
1045  --- linux-2.6.15-55.80.orig/net/ipv4/raw.c  --- linux-2.6.15-55.81.orig/net/ipv4/raw.c
1046  +++ linux-2.6.15-55.80/net/ipv4/raw.c  +++ linux-2.6.15-55.81/net/ipv4/raw.c
1047  @@ -79,6 +79,7 @@  @@ -79,6 +79,7 @@
1048   #include <linux/seq_file.h>   #include <linux/seq_file.h>
1049   #include <linux/netfilter.h>   #include <linux/netfilter.h>
# Line 1062  Source code for this patch is "apt-get i Line 1062  Source code for this patch is "apt-get i
1062    
1063          copied = skb->len;          copied = skb->len;
1064          if (len < copied) {          if (len < copied) {
1065  --- linux-2.6.15-55.80.orig/net/ipv4/tcp_ipv4.c  --- linux-2.6.15-55.81.orig/net/ipv4/tcp_ipv4.c
1066  +++ linux-2.6.15-55.80/net/ipv4/tcp_ipv4.c  +++ linux-2.6.15-55.81/net/ipv4/tcp_ipv4.c
1067  @@ -76,6 +76,7 @@  @@ -76,6 +76,7 @@
1068   #include <linux/stddef.h>   #include <linux/stddef.h>
1069   #include <linux/proc_fs.h>   #include <linux/proc_fs.h>
# Line 1081  Source code for this patch is "apt-get i Line 1081  Source code for this patch is "apt-get i
1081                          head = &tcp_hashinfo.bhash[inet_bhashfn(port, tcp_hashinfo.bhash_size)];                          head = &tcp_hashinfo.bhash[inet_bhashfn(port, tcp_hashinfo.bhash_size)];
1082                          spin_lock(&head->lock);                          spin_lock(&head->lock);
1083    
1084  --- linux-2.6.15-55.80.orig/net/ipv4/udp.c  --- linux-2.6.15-55.81.orig/net/ipv4/udp.c
1085  +++ linux-2.6.15-55.80/net/ipv4/udp.c  +++ linux-2.6.15-55.81/net/ipv4/udp.c
1086  @@ -108,6 +108,7 @@  @@ -108,6 +108,7 @@
1087   #include <net/inet_common.h>   #include <net/inet_common.h>
1088   #include <net/checksum.h>   #include <net/checksum.h>
# Line 1121  Source code for this patch is "apt-get i Line 1121  Source code for this patch is "apt-get i
1121          copied = skb->len - sizeof(struct udphdr);          copied = skb->len - sizeof(struct udphdr);
1122          if (copied > len) {          if (copied > len) {
1123                  copied = len;                  copied = len;
1124  --- linux-2.6.15-55.80.orig/net/ipv6/raw.c  --- linux-2.6.15-55.81.orig/net/ipv6/raw.c
1125  +++ linux-2.6.15-55.80/net/ipv6/raw.c  +++ linux-2.6.15-55.81/net/ipv6/raw.c
1126  @@ -56,6 +56,7 @@  @@ -56,6 +56,7 @@
1127    
1128   #include <linux/proc_fs.h>   #include <linux/proc_fs.h>
# Line 1141  Source code for this patch is "apt-get i Line 1141  Source code for this patch is "apt-get i
1141    
1142          copied = skb->len;          copied = skb->len;
1143          if (copied > len) {          if (copied > len) {
1144  --- linux-2.6.15-55.80.orig/net/ipv6/tcp_ipv6.c  --- linux-2.6.15-55.81.orig/net/ipv6/tcp_ipv6.c
1145  +++ linux-2.6.15-55.80/net/ipv6/tcp_ipv6.c  +++ linux-2.6.15-55.81/net/ipv6/tcp_ipv6.c
1146  @@ -64,6 +64,7 @@  @@ -64,6 +64,7 @@
1147    
1148   #include <linux/proc_fs.h>   #include <linux/proc_fs.h>
# Line 1169  Source code for this patch is "apt-get i Line 1169  Source code for this patch is "apt-get i
1169                          head = &tcp_hashinfo.bhash[inet_bhashfn(port, tcp_hashinfo.bhash_size)];                          head = &tcp_hashinfo.bhash[inet_bhashfn(port, tcp_hashinfo.bhash_size)];
1170                          spin_lock(&head->lock);                          spin_lock(&head->lock);
1171    
1172  --- linux-2.6.15-55.80.orig/net/ipv6/udp.c  --- linux-2.6.15-55.81.orig/net/ipv6/udp.c
1173  +++ linux-2.6.15-55.80/net/ipv6/udp.c  +++ linux-2.6.15-55.81/net/ipv6/udp.c
1174  @@ -58,6 +58,7 @@  @@ -58,6 +58,7 @@
1175    
1176   #include <linux/proc_fs.h>   #include <linux/proc_fs.h>
# Line 1207  Source code for this patch is "apt-get i Line 1207  Source code for this patch is "apt-get i
1207    
1208          copied = skb->len - sizeof(struct udphdr);          copied = skb->len - sizeof(struct udphdr);
1209          if (copied > len) {          if (copied > len) {
1210  --- linux-2.6.15-55.80.orig/net/socket.c  --- linux-2.6.15-55.81.orig/net/socket.c
1211  +++ linux-2.6.15-55.80/net/socket.c  +++ linux-2.6.15-55.81/net/socket.c
1212  @@ -97,6 +97,8 @@  @@ -97,6 +97,8 @@
1213   #include <net/sock.h>   #include <net/sock.h>
1214   #include <linux/netfilter.h>   #include <linux/netfilter.h>
# Line 1285  Source code for this patch is "apt-get i Line 1285  Source code for this patch is "apt-get i
1285          err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen,          err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen,
1286                                   sock->file->f_flags);                                   sock->file->f_flags);
1287   out_put:   out_put:
1288  --- linux-2.6.15-55.80.orig/net/unix/af_unix.c  --- linux-2.6.15-55.81.orig/net/unix/af_unix.c
1289  +++ linux-2.6.15-55.80/net/unix/af_unix.c  +++ linux-2.6.15-55.81/net/unix/af_unix.c
1290  @@ -117,6 +117,7 @@  @@ -117,6 +117,7 @@
1291   #include <linux/mount.h>   #include <linux/mount.h>
1292   #include <net/checksum.h>   #include <net/checksum.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 = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0);                  err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0);
1306                  if (err)                  if (err)
1307                          goto out_mknod_dput;                          goto out_mknod_dput;
1308  --- linux-2.6.15-55.80.orig/security/Kconfig  --- linux-2.6.15-55.81.orig/security/Kconfig
1309  +++ linux-2.6.15-55.80/security/Kconfig  +++ linux-2.6.15-55.81/security/Kconfig
1310  @@ -94,5 +94,7 @@ config SECURITY_SECLVL  @@ -94,5 +94,7 @@ config SECURITY_SECLVL
1311    
1312   source security/selinux/Kconfig   source security/selinux/Kconfig
# Line 1315  Source code for this patch is "apt-get i Line 1315  Source code for this patch is "apt-get i
1315  +  +
1316   endmenu   endmenu
1317    
1318  --- linux-2.6.15-55.80.orig/security/Makefile  --- linux-2.6.15-55.81.orig/security/Makefile
1319  +++ linux-2.6.15-55.80/security/Makefile  +++ linux-2.6.15-55.81/security/Makefile
1320  @@ -19,3 +19,6 @@ obj-$(CONFIG_SECURITY_ROOTPLUG)               += comm  @@ -19,3 +19,6 @@ obj-$(CONFIG_SECURITY_ROOTPLUG)               += comm
1321   obj-$(CONFIG_SECURITY_REALTIME)                += commoncap.o realcap.o   obj-$(CONFIG_SECURITY_REALTIME)                += commoncap.o realcap.o
1322    
Legend:
Removed from v.3141  
changed lines
  Added in v.3228
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
サイト情報
ソフトウェアを探す
ソフトウェアを作る
コミュニティ
ヘルプ