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

TOMOYO

Subversion リポジトリの参照

/[tomoyo]/trunk/1.8.x/ccs-patch/patches/ccs-patch-2.6.16-vine-linux-4.2.diff

Diff of /trunk/1.8.x/ccs-patch/patches/ccs-patch-2.6.16-vine-linux-4.2.diff

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

revision 2869 by kumaneko, Sat Aug 8 02:47:05 2009 UTC revision 2882 by kumaneko, Sun Aug 9 10:54:06 2009 UTC
# Line 46  Source code for this patch is http://upd Line 46  Source code for this patch is http://upd
46   security/Makefile               |    3 +++   security/Makefile               |    3 +++
47   42 files changed, 290 insertions(+), 11 deletions(-)   42 files changed, 290 insertions(+), 11 deletions(-)
48    
49  --- linux-2.6.16-76.49vl4.orig/arch/alpha/kernel/ptrace.c  --- linux-2.6.16-76.51vl4.orig/arch/alpha/kernel/ptrace.c
50  +++ linux-2.6.16-76.49vl4/arch/alpha/kernel/ptrace.c  +++ linux-2.6.16-76.51vl4/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 http://upd Line 65  Source code for this patch is http://upd
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.16-76.49vl4.orig/arch/ia64/ia32/sys_ia32.c  --- linux-2.6.16-76.51vl4.orig/arch/ia64/ia32/sys_ia32.c
69  +++ linux-2.6.16-76.49vl4/arch/ia64/ia32/sys_ia32.c  +++ linux-2.6.16-76.51vl4/arch/ia64/ia32/sys_ia32.c
70  @@ -58,6 +58,7 @@  @@ -58,6 +58,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 http://upd Line 84  Source code for this patch is http://upd
84    
85          lock_kernel();          lock_kernel();
86          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
87  --- linux-2.6.16-76.49vl4.orig/arch/ia64/kernel/ptrace.c  --- linux-2.6.16-76.51vl4.orig/arch/ia64/kernel/ptrace.c
88  +++ linux-2.6.16-76.49vl4/arch/ia64/kernel/ptrace.c  +++ linux-2.6.16-76.51vl4/arch/ia64/kernel/ptrace.c
89  @@ -29,6 +29,7 @@  @@ -29,6 +29,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 http://upd Line 103  Source code for this patch is http://upd
103    
104          lock_kernel();          lock_kernel();
105          ret = -EPERM;          ret = -EPERM;
106  --- linux-2.6.16-76.49vl4.orig/arch/m32r/kernel/ptrace.c  --- linux-2.6.16-76.51vl4.orig/arch/m32r/kernel/ptrace.c
107  +++ linux-2.6.16-76.49vl4/arch/m32r/kernel/ptrace.c  +++ linux-2.6.16-76.51vl4/arch/m32r/kernel/ptrace.c
108  @@ -33,6 +33,7 @@  @@ -33,6 +33,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 http://upd Line 122  Source code for this patch is http://upd
122    
123          lock_kernel();          lock_kernel();
124          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
125  --- linux-2.6.16-76.49vl4.orig/arch/mips/kernel/ptrace32.c  --- linux-2.6.16-76.51vl4.orig/arch/mips/kernel/ptrace32.c
126  +++ linux-2.6.16-76.49vl4/arch/mips/kernel/ptrace32.c  +++ linux-2.6.16-76.51vl4/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 http://upd Line 141  Source code for this patch is http://upd
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.16-76.49vl4.orig/arch/powerpc/kernel/ptrace32.c  --- linux-2.6.16-76.51vl4.orig/arch/powerpc/kernel/ptrace32.c
145  +++ linux-2.6.16-76.49vl4/arch/powerpc/kernel/ptrace32.c  +++ linux-2.6.16-76.51vl4/arch/powerpc/kernel/ptrace32.c
146  @@ -33,6 +33,7 @@  @@ -33,6 +33,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 http://upd Line 160  Source code for this patch is http://upd
160    
161          lock_kernel();          lock_kernel();
162          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
163  --- linux-2.6.16-76.49vl4.orig/arch/s390/kernel/ptrace.c  --- linux-2.6.16-76.51vl4.orig/arch/s390/kernel/ptrace.c
164  +++ linux-2.6.16-76.49vl4/arch/s390/kernel/ptrace.c  +++ linux-2.6.16-76.51vl4/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 http://upd Line 179  Source code for this patch is http://upd
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.16-76.49vl4.orig/arch/sparc/kernel/ptrace.c  --- linux-2.6.16-76.51vl4.orig/arch/sparc/kernel/ptrace.c
183  +++ linux-2.6.16-76.49vl4/arch/sparc/kernel/ptrace.c  +++ linux-2.6.16-76.51vl4/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 http://upd Line 200  Source code for this patch is http://upd
200    
201          lock_kernel();          lock_kernel();
202   #ifdef DEBUG_PTRACE   #ifdef DEBUG_PTRACE
203  --- linux-2.6.16-76.49vl4.orig/arch/sparc64/kernel/ptrace.c  --- linux-2.6.16-76.51vl4.orig/arch/sparc64/kernel/ptrace.c
204  +++ linux-2.6.16-76.49vl4/arch/sparc64/kernel/ptrace.c  +++ linux-2.6.16-76.51vl4/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 http://upd Line 221  Source code for this patch is http://upd
221    
222          if (test_thread_flag(TIF_32BIT)) {          if (test_thread_flag(TIF_32BIT)) {
223                  addr &= 0xffffffffUL;                  addr &= 0xffffffffUL;
224  --- linux-2.6.16-76.49vl4.orig/arch/x86_64/ia32/ptrace32.c  --- linux-2.6.16-76.51vl4.orig/arch/x86_64/ia32/ptrace32.c
225  +++ linux-2.6.16-76.49vl4/arch/x86_64/ia32/ptrace32.c  +++ linux-2.6.16-76.51vl4/arch/x86_64/ia32/ptrace32.c
226  @@ -27,6 +27,7 @@  @@ -27,6 +27,7 @@
227   #include <asm/debugreg.h>   #include <asm/debugreg.h>
228   #include <asm/i387.h>   #include <asm/i387.h>
# Line 240  Source code for this patch is http://upd Line 240  Source code for this patch is http://upd
240    
241          switch (request) {          switch (request) {
242          default:          default:
243  --- linux-2.6.16-76.49vl4.orig/fs/attr.c  --- linux-2.6.16-76.51vl4.orig/fs/attr.c
244  +++ linux-2.6.16-76.49vl4/fs/attr.c  +++ linux-2.6.16-76.51vl4/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 http://upd Line 266  Source code for this patch is http://upd
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.16-76.49vl4.orig/fs/compat.c  --- linux-2.6.16-76.51vl4.orig/fs/compat.c
270  +++ linux-2.6.16-76.49vl4/fs/compat.c  +++ linux-2.6.16-76.51vl4/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 http://upd Line 305  Source code for this patch is http://upd
305          if (retval >= 0) {          if (retval >= 0) {
306                  free_arg_pages(bprm);                  free_arg_pages(bprm);
307    
308  --- linux-2.6.16-76.49vl4.orig/fs/exec.c  --- linux-2.6.16-76.51vl4.orig/fs/exec.c
309  +++ linux-2.6.16-76.49vl4/fs/exec.c  +++ linux-2.6.16-76.51vl4/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 http://upd Line 347  Source code for this patch is http://upd
347          if (retval >= 0) {          if (retval >= 0) {
348                  free_arg_pages(bprm);                  free_arg_pages(bprm);
349    
350  --- linux-2.6.16-76.49vl4.orig/fs/fcntl.c  --- linux-2.6.16-76.51vl4.orig/fs/fcntl.c
351  +++ linux-2.6.16-76.49vl4/fs/fcntl.c  +++ linux-2.6.16-76.51vl4/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 368  Source code for this patch is http://upd Line 368  Source code for this patch is http://upd
368          /* O_NOATIME can only be set by the owner or superuser */          /* O_NOATIME can only be set by the owner or superuser */
369          if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))          if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))
370                  if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))                  if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
371  --- linux-2.6.16-76.49vl4.orig/fs/ioctl.c  --- linux-2.6.16-76.51vl4.orig/fs/ioctl.c
372  +++ linux-2.6.16-76.49vl4/fs/ioctl.c  +++ linux-2.6.16-76.51vl4/fs/ioctl.c
373  @@ -16,6 +16,7 @@  @@ -16,6 +16,7 @@
374    
375   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 396  Source code for this patch is http://upd Line 396  Source code for this patch is http://upd
396          if (error)          if (error)
397                  goto out_fput;                  goto out_fput;
398    
399  --- linux-2.6.16-76.49vl4.orig/fs/namei.c  --- linux-2.6.16-76.51vl4.orig/fs/namei.c
400  +++ linux-2.6.16-76.49vl4/fs/namei.c  +++ linux-2.6.16-76.51vl4/fs/namei.c
401  @@ -37,6 +37,8 @@  @@ -37,6 +37,8 @@
402    
403   #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])   #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])
# Line 513  Source code for this patch is http://upd Line 513  Source code for this patch is http://upd
513          error = vfs_rename(old_dir->d_inode, old_dentry,          error = vfs_rename(old_dir->d_inode, old_dentry,
514                                     new_dir->d_inode, new_dentry);                                     new_dir->d_inode, new_dentry);
515   exit5:   exit5:
516  --- linux-2.6.16-76.49vl4.orig/fs/namespace.c  --- linux-2.6.16-76.51vl4.orig/fs/namespace.c
517  +++ linux-2.6.16-76.49vl4/fs/namespace.c  +++ linux-2.6.16-76.51vl4/fs/namespace.c
518  @@ -26,6 +26,7 @@  @@ -26,6 +26,7 @@
519   #include <asm/uaccess.h>   #include <asm/uaccess.h>
520   #include <asm/unistd.h>   #include <asm/unistd.h>
# Line 603  Source code for this patch is http://upd Line 603  Source code for this patch is http://upd
603          if (error) {          if (error) {
604                  path_release(&old_nd);                  path_release(&old_nd);
605                  goto out1;                  goto out1;
606  --- linux-2.6.16-76.49vl4.orig/fs/open.c  --- linux-2.6.16-76.51vl4.orig/fs/open.c
607  +++ linux-2.6.16-76.49vl4/fs/open.c  +++ linux-2.6.16-76.51vl4/fs/open.c
608  @@ -30,6 +30,8 @@  @@ -30,6 +30,8 @@
609    
610   #include <asm/unistd.h>   #include <asm/unistd.h>
# Line 712  Source code for this patch is http://upd Line 712  Source code for this patch is http://upd
712          if (capable(CAP_SYS_TTY_CONFIG)) {          if (capable(CAP_SYS_TTY_CONFIG)) {
713                  tty_vhangup(current->signal->tty);                  tty_vhangup(current->signal->tty);
714                  return 0;                  return 0;
715  --- linux-2.6.16-76.49vl4.orig/fs/proc/proc_misc.c  --- linux-2.6.16-76.51vl4.orig/fs/proc/proc_misc.c
716  +++ linux-2.6.16-76.49vl4/fs/proc/proc_misc.c  +++ linux-2.6.16-76.51vl4/fs/proc/proc_misc.c
717  @@ -682,4 +682,5 @@ void __init proc_misc_init(void)  @@ -682,4 +682,5 @@ void __init proc_misc_init(void)
718          if (entry)          if (entry)
719                  entry->proc_fops = &proc_sysrq_trigger_operations;                  entry->proc_fops = &proc_sysrq_trigger_operations;
720   #endif   #endif
721  +       printk(KERN_INFO "Hook version: 2.6.16-76.49vl4 2009/08/08\n");  +       printk(KERN_INFO "Hook version: 2.6.16-76.51vl4 2009/08/09\n");
722   }   }
723  --- linux-2.6.16-76.49vl4.orig/include/linux/init_task.h  --- linux-2.6.16-76.51vl4.orig/include/linux/init_task.h
724  +++ linux-2.6.16-76.49vl4/include/linux/init_task.h  +++ linux-2.6.16-76.51vl4/include/linux/init_task.h
725  @@ -121,6 +121,8 @@ extern struct group_info init_groups;  @@ -121,6 +121,8 @@ extern struct group_info init_groups;
726          .journal_info   = NULL,                                         \          .journal_info   = NULL,                                         \
727          .cpu_timers     = INIT_CPU_TIMERS(tsk.cpu_timers),              \          .cpu_timers     = INIT_CPU_TIMERS(tsk.cpu_timers),              \
# Line 731  Source code for this patch is http://upd Line 731  Source code for this patch is http://upd
731   }   }
732    
733    
734  --- linux-2.6.16-76.49vl4.orig/include/linux/sched.h  --- linux-2.6.16-76.51vl4.orig/include/linux/sched.h
735  +++ linux-2.6.16-76.49vl4/include/linux/sched.h  +++ linux-2.6.16-76.51vl4/include/linux/sched.h
736  @@ -40,6 +40,8 @@  @@ -40,6 +40,8 @@
737    
738   struct exec_domain;   struct exec_domain;
# Line 751  Source code for this patch is http://upd Line 751  Source code for this patch is http://upd
751   };   };
752    
753   static inline pid_t process_group(struct task_struct *tsk)   static inline pid_t process_group(struct task_struct *tsk)
754  --- linux-2.6.16-76.49vl4.orig/kernel/compat.c  --- linux-2.6.16-76.51vl4.orig/kernel/compat.c
755  +++ linux-2.6.16-76.49vl4/kernel/compat.c  +++ linux-2.6.16-76.51vl4/kernel/compat.c
756  @@ -23,6 +23,7 @@  @@ -23,6 +23,7 @@
757   #include <linux/security.h>   #include <linux/security.h>
758    
# Line 770  Source code for this patch is http://upd Line 770  Source code for this patch is http://upd
770    
771          do_settimeofday(&tv);          do_settimeofday(&tv);
772          return 0;          return 0;
773  --- linux-2.6.16-76.49vl4.orig/kernel/kexec.c  --- linux-2.6.16-76.51vl4.orig/kernel/kexec.c
774  +++ linux-2.6.16-76.49vl4/kernel/kexec.c  +++ linux-2.6.16-76.51vl4/kernel/kexec.c
775  @@ -26,6 +26,7 @@  @@ -26,6 +26,7 @@
776   #include <asm/io.h>   #include <asm/io.h>
777   #include <asm/system.h>   #include <asm/system.h>
# Line 789  Source code for this patch is http://upd Line 789  Source code for this patch is http://upd
789    
790          /*          /*
791           * Verify we have a legal set of flags           * Verify we have a legal set of flags
792  --- linux-2.6.16-76.49vl4.orig/kernel/kmod.c  --- linux-2.6.16-76.51vl4.orig/kernel/kmod.c
793  +++ linux-2.6.16-76.49vl4/kernel/kmod.c  +++ linux-2.6.16-76.51vl4/kernel/kmod.c
794  @@ -150,6 +150,9 @@ static int ____call_usermodehelper(void  @@ -150,6 +150,9 @@ static int ____call_usermodehelper(void
795          /* We can run anywhere, unlike our parent keventd(). */          /* We can run anywhere, unlike our parent keventd(). */
796          set_cpus_allowed(current, CPU_MASK_ALL);          set_cpus_allowed(current, CPU_MASK_ALL);
# Line 801  Source code for this patch is http://upd Line 801  Source code for this patch is http://upd
801          retval = -EPERM;          retval = -EPERM;
802          if (current->fs->root)          if (current->fs->root)
803                  retval = execve(sub_info->path, sub_info->argv,sub_info->envp);                  retval = execve(sub_info->path, sub_info->argv,sub_info->envp);
804  --- linux-2.6.16-76.49vl4.orig/kernel/module.c  --- linux-2.6.16-76.51vl4.orig/kernel/module.c
805  +++ linux-2.6.16-76.49vl4/kernel/module.c  +++ linux-2.6.16-76.51vl4/kernel/module.c
806  @@ -42,6 +42,7 @@  @@ -42,6 +42,7 @@
807   #include <asm/uaccess.h>   #include <asm/uaccess.h>
808   #include <asm/semaphore.h>   #include <asm/semaphore.h>
# Line 831  Source code for this patch is http://upd Line 831  Source code for this patch is http://upd
831          /* Only one module load at a time, please */          /* Only one module load at a time, please */
832          if (down_interruptible(&module_mutex) != 0)          if (down_interruptible(&module_mutex) != 0)
833                  return -EINTR;                  return -EINTR;
834  --- linux-2.6.16-76.49vl4.orig/kernel/ptrace.c  --- linux-2.6.16-76.51vl4.orig/kernel/ptrace.c
835  +++ linux-2.6.16-76.49vl4/kernel/ptrace.c  +++ linux-2.6.16-76.51vl4/kernel/ptrace.c
836  @@ -21,6 +21,7 @@  @@ -21,6 +21,7 @@
837    
838   #include <asm/pgtable.h>   #include <asm/pgtable.h>
# Line 850  Source code for this patch is http://upd Line 850  Source code for this patch is http://upd
850          lock_kernel();          lock_kernel();
851          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
852                  ret = ptrace_traceme();                  ret = ptrace_traceme();
853  --- linux-2.6.16-76.49vl4.orig/kernel/sched.c  --- linux-2.6.16-76.51vl4.orig/kernel/sched.c
854  +++ linux-2.6.16-76.49vl4/kernel/sched.c  +++ linux-2.6.16-76.51vl4/kernel/sched.c
855  @@ -52,6 +52,7 @@  @@ -52,6 +52,7 @@
856   #include <asm/tlb.h>   #include <asm/tlb.h>
857    
# Line 869  Source code for this patch is http://upd Line 869  Source code for this patch is http://upd
869    
870          /*          /*
871           * Setpriority might change our priority at the same moment.           * Setpriority might change our priority at the same moment.
872  --- linux-2.6.16-76.49vl4.orig/kernel/signal.c  --- linux-2.6.16-76.51vl4.orig/kernel/signal.c
873  +++ linux-2.6.16-76.49vl4/kernel/signal.c  +++ linux-2.6.16-76.51vl4/kernel/signal.c
874  @@ -30,6 +30,7 @@  @@ -30,6 +30,7 @@
875   #include <asm/uaccess.h>   #include <asm/uaccess.h>
876   #include <asm/unistd.h>   #include <asm/unistd.h>
# Line 915  Source code for this patch is http://upd Line 915  Source code for this patch is http://upd
915    
916          /* POSIX.1b doesn't mention process groups.  */          /* POSIX.1b doesn't mention process groups.  */
917          return kill_proc_info(sig, &info, pid);          return kill_proc_info(sig, &info, pid);
918  --- linux-2.6.16-76.49vl4.orig/kernel/sys.c  --- linux-2.6.16-76.51vl4.orig/kernel/sys.c
919  +++ linux-2.6.16-76.49vl4/kernel/sys.c  +++ linux-2.6.16-76.51vl4/kernel/sys.c
920  @@ -38,6 +38,7 @@  @@ -38,6 +38,7 @@
921   #include <asm/uaccess.h>   #include <asm/uaccess.h>
922   #include <asm/io.h>   #include <asm/io.h>
# Line 963  Source code for this patch is http://upd Line 963  Source code for this patch is http://upd
963    
964          down_write(&uts_sem);          down_write(&uts_sem);
965          errno = -EFAULT;          errno = -EFAULT;
966  --- linux-2.6.16-76.49vl4.orig/kernel/sysctl.c  --- linux-2.6.16-76.51vl4.orig/kernel/sysctl.c
967  +++ linux-2.6.16-76.49vl4/kernel/sysctl.c  +++ linux-2.6.16-76.51vl4/kernel/sysctl.c
968  @@ -49,6 +49,7 @@  @@ -49,6 +49,7 @@
969    
970   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 997  Source code for this patch is http://upd Line 997  Source code for this patch is http://upd
997                                          error = table->strategy(                                          error = table->strategy(
998                                                  table, name, nlen,                                                  table, name, nlen,
999                                                  oldval, oldlenp,                                                  oldval, oldlenp,
1000  --- linux-2.6.16-76.49vl4.orig/kernel/time.c  --- linux-2.6.16-76.51vl4.orig/kernel/time.c
1001  +++ linux-2.6.16-76.49vl4/kernel/time.c  +++ linux-2.6.16-76.51vl4/kernel/time.c
1002  @@ -39,6 +39,7 @@  @@ -39,6 +39,7 @@
1003    
1004   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 1034  Source code for this patch is http://upd Line 1034  Source code for this patch is http://upd
1034                                    
1035          /* Now we validate the data before disabling interrupts */          /* Now we validate the data before disabling interrupts */
1036    
1037  --- linux-2.6.16-76.49vl4.orig/net/ipv4/inet_connection_sock.c  --- linux-2.6.16-76.51vl4.orig/net/ipv4/inet_connection_sock.c
1038  +++ linux-2.6.16-76.49vl4/net/ipv4/inet_connection_sock.c  +++ linux-2.6.16-76.51vl4/net/ipv4/inet_connection_sock.c
1039  @@ -24,6 +24,7 @@  @@ -24,6 +24,7 @@
1040   #include <net/route.h>   #include <net/route.h>
1041   #include <net/tcp_states.h>   #include <net/tcp_states.h>
# Line 1053  Source code for this patch is http://upd Line 1053  Source code for this patch is http://upd
1053                          inet_bind_bucket_for_each(tb, node, &head->chain)                          inet_bind_bucket_for_each(tb, node, &head->chain)
1054                                  if (tb->port == rover)                                  if (tb->port == rover)
1055                                          goto next;                                          goto next;
1056  --- linux-2.6.16-76.49vl4.orig/net/ipv4/inet_hashtables.c  --- linux-2.6.16-76.51vl4.orig/net/ipv4/inet_hashtables.c
1057  +++ linux-2.6.16-76.49vl4/net/ipv4/inet_hashtables.c  +++ linux-2.6.16-76.51vl4/net/ipv4/inet_hashtables.c
1058  @@ -23,6 +23,7 @@  @@ -23,6 +23,7 @@
1059   #include <net/inet_connection_sock.h>   #include <net/inet_connection_sock.h>
1060   #include <net/inet_hashtables.h>   #include <net/inet_hashtables.h>
# Line 1072  Source code for this patch is http://upd Line 1072  Source code for this patch is http://upd
1072                          head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];                          head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];
1073                          spin_lock(&head->lock);                          spin_lock(&head->lock);
1074    
1075  --- linux-2.6.16-76.49vl4.orig/net/ipv4/raw.c  --- linux-2.6.16-76.51vl4.orig/net/ipv4/raw.c
1076  +++ linux-2.6.16-76.49vl4/net/ipv4/raw.c  +++ linux-2.6.16-76.51vl4/net/ipv4/raw.c
1077  @@ -79,6 +79,7 @@  @@ -79,6 +79,7 @@
1078   #include <linux/seq_file.h>   #include <linux/seq_file.h>
1079   #include <linux/netfilter.h>   #include <linux/netfilter.h>
# Line 1092  Source code for this patch is http://upd Line 1092  Source code for this patch is http://upd
1092    
1093          copied = skb->len;          copied = skb->len;
1094          if (len < copied) {          if (len < copied) {
1095  --- linux-2.6.16-76.49vl4.orig/net/ipv4/udp.c  --- linux-2.6.16-76.51vl4.orig/net/ipv4/udp.c
1096  +++ linux-2.6.16-76.49vl4/net/ipv4/udp.c  +++ linux-2.6.16-76.51vl4/net/ipv4/udp.c
1097  @@ -109,6 +109,7 @@  @@ -109,6 +109,7 @@
1098   #include <net/inet_common.h>   #include <net/inet_common.h>
1099   #include <net/checksum.h>   #include <net/checksum.h>
# Line 1132  Source code for this patch is http://upd Line 1132  Source code for this patch is http://upd
1132          copied = skb->len - sizeof(struct udphdr);          copied = skb->len - sizeof(struct udphdr);
1133          if (copied > len) {          if (copied > len) {
1134                  copied = len;                  copied = len;
1135  --- linux-2.6.16-76.49vl4.orig/net/ipv6/inet6_hashtables.c  --- linux-2.6.16-76.51vl4.orig/net/ipv6/inet6_hashtables.c
1136  +++ linux-2.6.16-76.49vl4/net/ipv6/inet6_hashtables.c  +++ linux-2.6.16-76.51vl4/net/ipv6/inet6_hashtables.c
1137  @@ -22,6 +22,7 @@  @@ -22,6 +22,7 @@
1138   #include <net/inet_hashtables.h>   #include <net/inet_hashtables.h>
1139   #include <net/inet6_hashtables.h>   #include <net/inet6_hashtables.h>
# Line 1160  Source code for this patch is http://upd Line 1160  Source code for this patch is http://upd
1160                          head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];                          head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];
1161                          spin_lock(&head->lock);                          spin_lock(&head->lock);
1162    
1163  --- linux-2.6.16-76.49vl4.orig/net/ipv6/raw.c  --- linux-2.6.16-76.51vl4.orig/net/ipv6/raw.c
1164  +++ linux-2.6.16-76.49vl4/net/ipv6/raw.c  +++ linux-2.6.16-76.51vl4/net/ipv6/raw.c
1165  @@ -56,6 +56,7 @@  @@ -56,6 +56,7 @@
1166    
1167   #include <linux/proc_fs.h>   #include <linux/proc_fs.h>
# Line 1180  Source code for this patch is http://upd Line 1180  Source code for this patch is http://upd
1180    
1181          copied = skb->len;          copied = skb->len;
1182          if (copied > len) {          if (copied > len) {
1183  --- linux-2.6.16-76.49vl4.orig/net/ipv6/udp.c  --- linux-2.6.16-76.51vl4.orig/net/ipv6/udp.c
1184  +++ linux-2.6.16-76.49vl4/net/ipv6/udp.c  +++ linux-2.6.16-76.51vl4/net/ipv6/udp.c
1185  @@ -59,6 +59,7 @@  @@ -59,6 +59,7 @@
1186    
1187   #include <linux/proc_fs.h>   #include <linux/proc_fs.h>
# Line 1218  Source code for this patch is http://upd Line 1218  Source code for this patch is http://upd
1218    
1219          copied = skb->len - sizeof(struct udphdr);          copied = skb->len - sizeof(struct udphdr);
1220          if (copied > len) {          if (copied > len) {
1221  --- linux-2.6.16-76.49vl4.orig/net/socket.c  --- linux-2.6.16-76.51vl4.orig/net/socket.c
1222  +++ linux-2.6.16-76.49vl4/net/socket.c  +++ linux-2.6.16-76.51vl4/net/socket.c
1223  @@ -97,6 +97,8 @@  @@ -97,6 +97,8 @@
1224   #include <net/sock.h>   #include <net/sock.h>
1225   #include <linux/netfilter.h>   #include <linux/netfilter.h>
# Line 1298  Source code for this patch is http://upd Line 1298  Source code for this patch is http://upd
1298          err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen,          err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen,
1299                                   sock->file->f_flags);                                   sock->file->f_flags);
1300   out_put:   out_put:
1301  --- linux-2.6.16-76.49vl4.orig/net/unix/af_unix.c  --- linux-2.6.16-76.51vl4.orig/net/unix/af_unix.c
1302  +++ linux-2.6.16-76.49vl4/net/unix/af_unix.c  +++ linux-2.6.16-76.51vl4/net/unix/af_unix.c
1303  @@ -117,6 +117,7 @@  @@ -117,6 +117,7 @@
1304   #include <linux/mount.h>   #include <linux/mount.h>
1305   #include <net/checksum.h>   #include <net/checksum.h>
# Line 1318  Source code for this patch is http://upd Line 1318  Source code for this patch is http://upd
1318                  err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0);                  err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0);
1319                  if (err)                  if (err)
1320                          goto out_mknod_dput;                          goto out_mknod_dput;
1321  --- linux-2.6.16-76.49vl4.orig/security/Kconfig  --- linux-2.6.16-76.51vl4.orig/security/Kconfig
1322  +++ linux-2.6.16-76.49vl4/security/Kconfig  +++ linux-2.6.16-76.51vl4/security/Kconfig
1323  @@ -101,5 +101,7 @@ config SECURITY_SECLVL  @@ -101,5 +101,7 @@ config SECURITY_SECLVL
1324    
1325   source security/selinux/Kconfig   source security/selinux/Kconfig
# Line 1328  Source code for this patch is http://upd Line 1328  Source code for this patch is http://upd
1328  +  +
1329   endmenu   endmenu
1330    
1331  --- linux-2.6.16-76.49vl4.orig/security/Makefile  --- linux-2.6.16-76.51vl4.orig/security/Makefile
1332  +++ linux-2.6.16-76.49vl4/security/Makefile  +++ linux-2.6.16-76.51vl4/security/Makefile
1333  @@ -17,3 +17,6 @@ obj-$(CONFIG_SECURITY_SELINUX)                += selin  @@ -17,3 +17,6 @@ obj-$(CONFIG_SECURITY_SELINUX)                += selin
1334   obj-$(CONFIG_SECURITY_CAPABILITIES)    += commoncap.o capability.o   obj-$(CONFIG_SECURITY_CAPABILITIES)    += commoncap.o capability.o
1335   obj-$(CONFIG_SECURITY_ROOTPLUG)                += commoncap.o root_plug.o   obj-$(CONFIG_SECURITY_ROOTPLUG)                += commoncap.o root_plug.o
Legend:
Removed from v.2869  
changed lines
  Added in v.2882
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
サイト情報
ソフトウェアを探す
ソフトウェアを作る
コミュニティ
ヘルプ