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

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 2306 by kumaneko, Tue Mar 24 05:35:12 2009 UTC revision 2405 by kumaneko, Wed Apr 8 07:45:32 2009 UTC
# Line 1  Line 1 
1  This is TOMOYO Linux patch for VineLinux 4.2.  This is TOMOYO Linux patch for VineLinux 4.2.
2    
3  Source code for this patch is http://updates.vinelinux.org/Vine-4.2/updates/SRPMS/kernel-2.6.16-76.40vl4.src.rpm  Source code for this patch is http://updates.vinelinux.org/Vine-4.2/updates/SRPMS/kernel-2.6.16-76.47vl4.src.rpm
4  ---  ---
5   arch/alpha/kernel/ptrace.c      |    7 ++++   arch/alpha/kernel/ptrace.c      |    7 ++++
6   arch/ia64/ia32/sys_ia32.c       |    7 ++++   arch/ia64/ia32/sys_ia32.c       |    7 ++++
# Line 46  Source code for this patch is http://upd Line 46  Source code for this patch is http://upd
46   net/unix/af_unix.c              |    8 +++++   net/unix/af_unix.c              |    8 +++++
47   42 files changed, 527 insertions(+), 10 deletions(-)   42 files changed, 527 insertions(+), 10 deletions(-)
48    
49  --- linux-2.6.16-76.40vl4.orig/arch/alpha/kernel/ptrace.c  --- linux-2.6.16-76.47vl4.orig/arch/alpha/kernel/ptrace.c
50  +++ linux-2.6.16-76.40vl4/arch/alpha/kernel/ptrace.c  +++ linux-2.6.16-76.47vl4/arch/alpha/kernel/ptrace.c
51  @@ -20,6 +20,9 @@  @@ -20,6 +20,9 @@
52   #include <asm/pgtable.h>   #include <asm/pgtable.h>
53   #include <asm/system.h>   #include <asm/system.h>
# Line 69  Source code for this patch is http://upd Line 69  Source code for this patch is http://upd
69    
70          lock_kernel();          lock_kernel();
71          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",
72  --- linux-2.6.16-76.40vl4.orig/arch/ia64/ia32/sys_ia32.c  --- linux-2.6.16-76.47vl4.orig/arch/ia64/ia32/sys_ia32.c
73  +++ linux-2.6.16-76.40vl4/arch/ia64/ia32/sys_ia32.c  +++ linux-2.6.16-76.47vl4/arch/ia64/ia32/sys_ia32.c
74  @@ -58,6 +58,9 @@  @@ -58,6 +58,9 @@
75   #include <asm/types.h>   #include <asm/types.h>
76   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 92  Source code for this patch is http://upd Line 92  Source code for this patch is http://upd
92    
93          lock_kernel();          lock_kernel();
94          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
95  --- linux-2.6.16-76.40vl4.orig/arch/ia64/kernel/ptrace.c  --- linux-2.6.16-76.47vl4.orig/arch/ia64/kernel/ptrace.c
96  +++ linux-2.6.16-76.40vl4/arch/ia64/kernel/ptrace.c  +++ linux-2.6.16-76.47vl4/arch/ia64/kernel/ptrace.c
97  @@ -29,6 +29,9 @@  @@ -29,6 +29,9 @@
98   #ifdef CONFIG_PERFMON   #ifdef CONFIG_PERFMON
99   #include <asm/perfmon.h>   #include <asm/perfmon.h>
# Line 115  Source code for this patch is http://upd Line 115  Source code for this patch is http://upd
115    
116          lock_kernel();          lock_kernel();
117          ret = -EPERM;          ret = -EPERM;
118  --- linux-2.6.16-76.40vl4.orig/arch/m32r/kernel/ptrace.c  --- linux-2.6.16-76.47vl4.orig/arch/m32r/kernel/ptrace.c
119  +++ linux-2.6.16-76.40vl4/arch/m32r/kernel/ptrace.c  +++ linux-2.6.16-76.47vl4/arch/m32r/kernel/ptrace.c
120  @@ -33,6 +33,9 @@  @@ -33,6 +33,9 @@
121   #include <asm/system.h>   #include <asm/system.h>
122   #include <asm/processor.h>   #include <asm/processor.h>
# Line 138  Source code for this patch is http://upd Line 138  Source code for this patch is http://upd
138    
139          lock_kernel();          lock_kernel();
140          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
141  --- linux-2.6.16-76.40vl4.orig/arch/mips/kernel/ptrace32.c  --- linux-2.6.16-76.47vl4.orig/arch/mips/kernel/ptrace32.c
142  +++ linux-2.6.16-76.40vl4/arch/mips/kernel/ptrace32.c  +++ linux-2.6.16-76.47vl4/arch/mips/kernel/ptrace32.c
143  @@ -35,6 +35,9 @@  @@ -35,6 +35,9 @@
144   #include <asm/system.h>   #include <asm/system.h>
145   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 161  Source code for this patch is http://upd Line 161  Source code for this patch is http://upd
161    
162   #if 0   #if 0
163          printk("ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n",          printk("ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n",
164  --- linux-2.6.16-76.40vl4.orig/arch/powerpc/kernel/ptrace32.c  --- linux-2.6.16-76.47vl4.orig/arch/powerpc/kernel/ptrace32.c
165  +++ linux-2.6.16-76.40vl4/arch/powerpc/kernel/ptrace32.c  +++ linux-2.6.16-76.47vl4/arch/powerpc/kernel/ptrace32.c
166  @@ -33,6 +33,9 @@  @@ -33,6 +33,9 @@
167   #include <asm/page.h>   #include <asm/page.h>
168   #include <asm/pgtable.h>   #include <asm/pgtable.h>
# Line 184  Source code for this patch is http://upd Line 184  Source code for this patch is http://upd
184    
185          lock_kernel();          lock_kernel();
186          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
187  --- linux-2.6.16-76.40vl4.orig/arch/s390/kernel/ptrace.c  --- linux-2.6.16-76.47vl4.orig/arch/s390/kernel/ptrace.c
188  +++ linux-2.6.16-76.40vl4/arch/s390/kernel/ptrace.c  +++ linux-2.6.16-76.47vl4/arch/s390/kernel/ptrace.c
189  @@ -41,6 +41,9 @@  @@ -41,6 +41,9 @@
190   #include <asm/system.h>   #include <asm/system.h>
191   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 207  Source code for this patch is http://upd Line 207  Source code for this patch is http://upd
207          lock_kernel();          lock_kernel();
208          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
209                   ret = ptrace_traceme();                   ret = ptrace_traceme();
210  --- linux-2.6.16-76.40vl4.orig/arch/sparc/kernel/ptrace.c  --- linux-2.6.16-76.47vl4.orig/arch/sparc/kernel/ptrace.c
211  +++ linux-2.6.16-76.40vl4/arch/sparc/kernel/ptrace.c  +++ linux-2.6.16-76.47vl4/arch/sparc/kernel/ptrace.c
212  @@ -23,6 +23,9 @@  @@ -23,6 +23,9 @@
213   #include <asm/pgtable.h>   #include <asm/pgtable.h>
214   #include <asm/system.h>   #include <asm/system.h>
# Line 232  Source code for this patch is http://upd Line 232  Source code for this patch is http://upd
232    
233          lock_kernel();          lock_kernel();
234   #ifdef DEBUG_PTRACE   #ifdef DEBUG_PTRACE
235  --- linux-2.6.16-76.40vl4.orig/arch/sparc64/kernel/ptrace.c  --- linux-2.6.16-76.47vl4.orig/arch/sparc64/kernel/ptrace.c
236  +++ linux-2.6.16-76.40vl4/arch/sparc64/kernel/ptrace.c  +++ linux-2.6.16-76.47vl4/arch/sparc64/kernel/ptrace.c
237  @@ -32,6 +32,9 @@  @@ -32,6 +32,9 @@
238   #include <asm/spitfire.h>   #include <asm/spitfire.h>
239   #include <asm/page.h>   #include <asm/page.h>
# Line 257  Source code for this patch is http://upd Line 257  Source code for this patch is http://upd
257    
258          if (test_thread_flag(TIF_32BIT)) {          if (test_thread_flag(TIF_32BIT)) {
259                  addr &= 0xffffffffUL;                  addr &= 0xffffffffUL;
260  --- linux-2.6.16-76.40vl4.orig/arch/x86_64/ia32/ptrace32.c  --- linux-2.6.16-76.47vl4.orig/arch/x86_64/ia32/ptrace32.c
261  +++ linux-2.6.16-76.40vl4/arch/x86_64/ia32/ptrace32.c  +++ linux-2.6.16-76.47vl4/arch/x86_64/ia32/ptrace32.c
262  @@ -27,6 +27,9 @@  @@ -27,6 +27,9 @@
263   #include <asm/debugreg.h>   #include <asm/debugreg.h>
264   #include <asm/i387.h>   #include <asm/i387.h>
# Line 280  Source code for this patch is http://upd Line 280  Source code for this patch is http://upd
280    
281          switch (request) {          switch (request) {
282          default:          default:
283  --- linux-2.6.16-76.40vl4.orig/fs/Kconfig  --- linux-2.6.16-76.47vl4.orig/fs/Kconfig
284  +++ linux-2.6.16-76.40vl4/fs/Kconfig  +++ linux-2.6.16-76.47vl4/fs/Kconfig
285  @@ -1906,5 +1906,7 @@ endmenu  @@ -1906,5 +1906,7 @@ endmenu
286    
287   source "fs/nls/Kconfig"   source "fs/nls/Kconfig"
# Line 290  Source code for this patch is http://upd Line 290  Source code for this patch is http://upd
290  +  +
291   endmenu   endmenu
292    
293  --- linux-2.6.16-76.40vl4.orig/fs/Makefile  --- linux-2.6.16-76.47vl4.orig/fs/Makefile
294  +++ linux-2.6.16-76.40vl4/fs/Makefile  +++ linux-2.6.16-76.47vl4/fs/Makefile
295  @@ -106,3 +106,5 @@ obj-$(CONFIG_CONFIGFS_FS)   += configfs/  @@ -106,3 +106,5 @@ obj-$(CONFIG_CONFIGFS_FS)   += configfs/
296   obj-$(CONFIG_OCFS2_FS)         += ocfs2/   obj-$(CONFIG_OCFS2_FS)         += ocfs2/
297   obj-$(CONFIG_SUPERMOUNT)       += supermount/   obj-$(CONFIG_SUPERMOUNT)       += supermount/
298   obj-$(CONFIG_UNION_FS)          += unionfs/   obj-$(CONFIG_UNION_FS)          += unionfs/
299  +  +
300  +include $(srctree)/fs/Makefile-2.6.ccs  +include $(srctree)/fs/Makefile-2.6.ccs
301  --- linux-2.6.16-76.40vl4.orig/fs/attr.c  --- linux-2.6.16-76.47vl4.orig/fs/attr.c
302  +++ linux-2.6.16-76.40vl4/fs/attr.c  +++ linux-2.6.16-76.47vl4/fs/attr.c
303  @@ -15,6 +15,9 @@  @@ -15,6 +15,9 @@
304   #include <linux/fcntl.h>   #include <linux/fcntl.h>
305   #include <linux/quotaops.h>   #include <linux/quotaops.h>
# Line 339  Source code for this patch is http://upd Line 339  Source code for this patch is http://upd
339                  if (!error) {                  if (!error) {
340                          if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||                          if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
341                              (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))                              (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))
342  --- linux-2.6.16-76.40vl4.orig/fs/compat.c  --- linux-2.6.16-76.47vl4.orig/fs/compat.c
343  +++ linux-2.6.16-76.40vl4/fs/compat.c  +++ linux-2.6.16-76.47vl4/fs/compat.c
344  @@ -52,6 +52,9 @@  @@ -52,6 +52,9 @@
345   #include <asm/uaccess.h>   #include <asm/uaccess.h>
346   #include <asm/mmu_context.h>   #include <asm/mmu_context.h>
# Line 384  Source code for this patch is http://upd Line 384  Source code for this patch is http://upd
384          if (retval >= 0) {          if (retval >= 0) {
385                  free_arg_pages(bprm);                  free_arg_pages(bprm);
386    
387  --- linux-2.6.16-76.40vl4.orig/fs/exec.c  --- linux-2.6.16-76.47vl4.orig/fs/exec.c
388  +++ linux-2.6.16-76.40vl4/fs/exec.c  +++ linux-2.6.16-76.47vl4/fs/exec.c
389  @@ -57,6 +57,10 @@  @@ -57,6 +57,10 @@
390   #include <linux/kmod.h>   #include <linux/kmod.h>
391   #endif   #endif
# Line 432  Source code for this patch is http://upd Line 432  Source code for this patch is http://upd
432          if (retval >= 0) {          if (retval >= 0) {
433                  free_arg_pages(bprm);                  free_arg_pages(bprm);
434    
435  --- linux-2.6.16-76.40vl4.orig/fs/fcntl.c  --- linux-2.6.16-76.47vl4.orig/fs/fcntl.c
436  +++ linux-2.6.16-76.40vl4/fs/fcntl.c  +++ linux-2.6.16-76.47vl4/fs/fcntl.c
437  @@ -22,6 +22,9 @@  @@ -22,6 +22,9 @@
438   #include <asm/poll.h>   #include <asm/poll.h>
439   #include <asm/siginfo.h>   #include <asm/siginfo.h>
# Line 457  Source code for this patch is http://upd Line 457  Source code for this patch is http://upd
457          /* O_NOATIME can only be set by the owner or superuser */          /* O_NOATIME can only be set by the owner or superuser */
458          if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))          if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))
459                  if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))                  if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
460  --- linux-2.6.16-76.40vl4.orig/fs/ioctl.c  --- linux-2.6.16-76.47vl4.orig/fs/ioctl.c
461  +++ linux-2.6.16-76.40vl4/fs/ioctl.c  +++ linux-2.6.16-76.47vl4/fs/ioctl.c
462  @@ -16,6 +16,9 @@  @@ -16,6 +16,9 @@
463    
464   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 491  Source code for this patch is http://upd Line 491  Source code for this patch is http://upd
491          if (error)          if (error)
492                  goto out_fput;                  goto out_fput;
493    
494  --- linux-2.6.16-76.40vl4.orig/fs/namei.c  --- linux-2.6.16-76.47vl4.orig/fs/namei.c
495  +++ linux-2.6.16-76.40vl4/fs/namei.c  +++ linux-2.6.16-76.47vl4/fs/namei.c
496  @@ -37,6 +37,10 @@  @@ -37,6 +37,10 @@
497    
498   #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])   #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])
# Line 630  Source code for this patch is http://upd Line 630  Source code for this patch is http://upd
630          error = vfs_rename(old_dir->d_inode, old_dentry,          error = vfs_rename(old_dir->d_inode, old_dentry,
631                                     new_dir->d_inode, new_dentry);                                     new_dir->d_inode, new_dentry);
632   exit5:   exit5:
633  --- linux-2.6.16-76.40vl4.orig/fs/namespace.c  --- linux-2.6.16-76.47vl4.orig/fs/namespace.c
634  +++ linux-2.6.16-76.40vl4/fs/namespace.c  +++ linux-2.6.16-76.47vl4/fs/namespace.c
635  @@ -26,6 +26,12 @@  @@ -26,6 +26,12 @@
636   #include <asm/uaccess.h>   #include <asm/uaccess.h>
637   #include <asm/unistd.h>   #include <asm/unistd.h>
# Line 745  Source code for this patch is http://upd Line 745  Source code for this patch is http://upd
745          if (error) {          if (error) {
746                  path_release(&old_nd);                  path_release(&old_nd);
747                  goto out1;                  goto out1;
748  --- linux-2.6.16-76.40vl4.orig/fs/open.c  --- linux-2.6.16-76.47vl4.orig/fs/open.c
749  +++ linux-2.6.16-76.40vl4/fs/open.c  +++ linux-2.6.16-76.47vl4/fs/open.c
750  @@ -30,6 +30,13 @@  @@ -30,6 +30,13 @@
751    
752   #include <asm/unistd.h>   #include <asm/unistd.h>
# Line 812  Source code for this patch is http://upd Line 812  Source code for this patch is http://upd
812          if (capable(CAP_SYS_TTY_CONFIG)) {          if (capable(CAP_SYS_TTY_CONFIG)) {
813                  tty_vhangup(current->signal->tty);                  tty_vhangup(current->signal->tty);
814                  return 0;                  return 0;
815  --- linux-2.6.16-76.40vl4.orig/fs/proc/Makefile  --- linux-2.6.16-76.47vl4.orig/fs/proc/Makefile
816  +++ linux-2.6.16-76.40vl4/fs/proc/Makefile  +++ linux-2.6.16-76.47vl4/fs/proc/Makefile
817  @@ -13,3 +13,6 @@ proc-y       += inode.o root.o base.o ge  @@ -13,3 +13,6 @@ proc-y       += inode.o root.o base.o ge
818   proc-$(CONFIG_PROC_KCORE)      += kcore.o   proc-$(CONFIG_PROC_KCORE)      += kcore.o
819   proc-$(CONFIG_PROC_VMCORE)     += vmcore.o   proc-$(CONFIG_PROC_VMCORE)     += vmcore.o
# Line 821  Source code for this patch is http://upd Line 821  Source code for this patch is http://upd
821  +  +
822  +proc-$(CONFIG_SAKURA) += ccs_proc.o  +proc-$(CONFIG_SAKURA) += ccs_proc.o
823  +proc-$(CONFIG_TOMOYO) += ccs_proc.o  +proc-$(CONFIG_TOMOYO) += ccs_proc.o
824  --- linux-2.6.16-76.40vl4.orig/fs/proc/proc_misc.c  --- linux-2.6.16-76.47vl4.orig/fs/proc/proc_misc.c
825  +++ linux-2.6.16-76.40vl4/fs/proc/proc_misc.c  +++ linux-2.6.16-76.47vl4/fs/proc/proc_misc.c
826  @@ -682,4 +682,9 @@ void __init proc_misc_init(void)  @@ -682,4 +682,9 @@ void __init proc_misc_init(void)
827          if (entry)          if (entry)
828                  entry->proc_fops = &proc_sysrq_trigger_operations;                  entry->proc_fops = &proc_sysrq_trigger_operations;
829   #endif   #endif
830  +       /***** CCS start. *****/  +       /***** CCS start. *****/
831  +#if defined(CONFIG_SAKURA) || defined(CONFIG_TOMOYO)  +#if defined(CONFIG_SAKURA) || defined(CONFIG_TOMOYO)
832  +       printk(KERN_INFO "Hook version: 2.6.16-76.40vl4 2009/03/24\n");  +       printk(KERN_INFO "Hook version: 2.6.16-76.47vl4 2009/04/08\n");
833  +#endif  +#endif
834  +       /***** CCS end. *****/  +       /***** CCS end. *****/
835   }   }
836  --- linux-2.6.16-76.40vl4.orig/include/linux/init_task.h  --- linux-2.6.16-76.47vl4.orig/include/linux/init_task.h
837  +++ linux-2.6.16-76.40vl4/include/linux/init_task.h  +++ linux-2.6.16-76.47vl4/include/linux/init_task.h
838  @@ -121,6 +121,10 @@ extern struct group_info init_groups;  @@ -121,6 +121,10 @@ extern struct group_info init_groups;
839          .journal_info   = NULL,                                         \          .journal_info   = NULL,                                         \
840          .cpu_timers     = INIT_CPU_TIMERS(tsk.cpu_timers),              \          .cpu_timers     = INIT_CPU_TIMERS(tsk.cpu_timers),              \
# Line 846  Source code for this patch is http://upd Line 846  Source code for this patch is http://upd
846   }   }
847    
848    
849  --- linux-2.6.16-76.40vl4.orig/include/linux/sched.h  --- linux-2.6.16-76.47vl4.orig/include/linux/sched.h
850  +++ linux-2.6.16-76.40vl4/include/linux/sched.h  +++ linux-2.6.16-76.47vl4/include/linux/sched.h
851  @@ -40,6 +40,10 @@  @@ -40,6 +40,10 @@
852    
853   struct exec_domain;   struct exec_domain;
# Line 859  Source code for this patch is http://upd Line 859  Source code for this patch is http://upd
859   /*   /*
860    * cloning flags:    * cloning flags:
861    */    */
862  @@ -871,6 +875,10 @@ struct task_struct {  @@ -873,6 +877,10 @@ struct task_struct {
  #endif  
         atomic_t fs_excl;       /* holding fs exclusive resources */  
863          struct rcu_head rcu;          struct rcu_head rcu;
864    
865            struct list_head        *scm_work_list;
866  +       /***** TOMOYO Linux start. *****/  +       /***** TOMOYO Linux start. *****/
867  +       struct ccs_domain_info *ccs_domain_info;  +       struct ccs_domain_info *ccs_domain_info;
868  +       u32 ccs_flags;  +       u32 ccs_flags;
# Line 870  Source code for this patch is http://upd Line 870  Source code for this patch is http://upd
870   };   };
871    
872   static inline pid_t process_group(struct task_struct *tsk)   static inline pid_t process_group(struct task_struct *tsk)
873  --- linux-2.6.16-76.40vl4.orig/kernel/compat.c  --- linux-2.6.16-76.47vl4.orig/kernel/compat.c
874  +++ linux-2.6.16-76.40vl4/kernel/compat.c  +++ linux-2.6.16-76.47vl4/kernel/compat.c
875  @@ -23,6 +23,9 @@  @@ -23,6 +23,9 @@
876   #include <linux/security.h>   #include <linux/security.h>
877    
# Line 893  Source code for this patch is http://upd Line 893  Source code for this patch is http://upd
893    
894          do_settimeofday(&tv);          do_settimeofday(&tv);
895          return 0;          return 0;
896  --- linux-2.6.16-76.40vl4.orig/kernel/kexec.c  --- linux-2.6.16-76.47vl4.orig/kernel/kexec.c
897  +++ linux-2.6.16-76.40vl4/kernel/kexec.c  +++ linux-2.6.16-76.47vl4/kernel/kexec.c
898  @@ -26,6 +26,9 @@  @@ -26,6 +26,9 @@
899   #include <asm/io.h>   #include <asm/io.h>
900   #include <asm/system.h>   #include <asm/system.h>
# Line 916  Source code for this patch is http://upd Line 916  Source code for this patch is http://upd
916    
917          /*          /*
918           * Verify we have a legal set of flags           * Verify we have a legal set of flags
919  --- linux-2.6.16-76.40vl4.orig/kernel/kmod.c  --- linux-2.6.16-76.47vl4.orig/kernel/kmod.c
920  +++ linux-2.6.16-76.40vl4/kernel/kmod.c  +++ linux-2.6.16-76.47vl4/kernel/kmod.c
921  @@ -150,6 +150,11 @@ static int ____call_usermodehelper(void  @@ -150,6 +150,11 @@ static int ____call_usermodehelper(void
922          /* We can run anywhere, unlike our parent keventd(). */          /* We can run anywhere, unlike our parent keventd(). */
923          set_cpus_allowed(current, CPU_MASK_ALL);          set_cpus_allowed(current, CPU_MASK_ALL);
# Line 930  Source code for this patch is http://upd Line 930  Source code for this patch is http://upd
930          retval = -EPERM;          retval = -EPERM;
931          if (current->fs->root)          if (current->fs->root)
932                  retval = execve(sub_info->path, sub_info->argv,sub_info->envp);                  retval = execve(sub_info->path, sub_info->argv,sub_info->envp);
933  --- linux-2.6.16-76.40vl4.orig/kernel/module.c  --- linux-2.6.16-76.47vl4.orig/kernel/module.c
934  +++ linux-2.6.16-76.40vl4/kernel/module.c  +++ linux-2.6.16-76.47vl4/kernel/module.c
935  @@ -42,6 +42,9 @@  @@ -42,6 +42,9 @@
936   #include <asm/uaccess.h>   #include <asm/uaccess.h>
937   #include <asm/semaphore.h>   #include <asm/semaphore.h>
# Line 966  Source code for this patch is http://upd Line 966  Source code for this patch is http://upd
966          /* Only one module load at a time, please */          /* Only one module load at a time, please */
967          if (down_interruptible(&module_mutex) != 0)          if (down_interruptible(&module_mutex) != 0)
968                  return -EINTR;                  return -EINTR;
969  --- linux-2.6.16-76.40vl4.orig/kernel/ptrace.c  --- linux-2.6.16-76.47vl4.orig/kernel/ptrace.c
970  +++ linux-2.6.16-76.40vl4/kernel/ptrace.c  +++ linux-2.6.16-76.47vl4/kernel/ptrace.c
971  @@ -21,6 +21,9 @@  @@ -21,6 +21,9 @@
972    
973   #include <asm/pgtable.h>   #include <asm/pgtable.h>
# Line 989  Source code for this patch is http://upd Line 989  Source code for this patch is http://upd
989          lock_kernel();          lock_kernel();
990          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
991                  ret = ptrace_traceme();                  ret = ptrace_traceme();
992  --- linux-2.6.16-76.40vl4.orig/kernel/sched.c  --- linux-2.6.16-76.47vl4.orig/kernel/sched.c
993  +++ linux-2.6.16-76.40vl4/kernel/sched.c  +++ linux-2.6.16-76.47vl4/kernel/sched.c
994  @@ -52,6 +52,9 @@  @@ -52,6 +52,9 @@
995   #include <asm/tlb.h>   #include <asm/tlb.h>
996    
# Line 1012  Source code for this patch is http://upd Line 1012  Source code for this patch is http://upd
1012    
1013          /*          /*
1014           * Setpriority might change our priority at the same moment.           * Setpriority might change our priority at the same moment.
1015  --- linux-2.6.16-76.40vl4.orig/kernel/signal.c  --- linux-2.6.16-76.47vl4.orig/kernel/signal.c
1016  +++ linux-2.6.16-76.40vl4/kernel/signal.c  +++ linux-2.6.16-76.47vl4/kernel/signal.c
1017  @@ -30,6 +30,9 @@  @@ -30,6 +30,9 @@
1018   #include <asm/uaccess.h>   #include <asm/uaccess.h>
1019   #include <asm/unistd.h>   #include <asm/unistd.h>
# Line 1063  Source code for this patch is http://upd Line 1063  Source code for this patch is http://upd
1063    
1064          return do_tkill(0, pid, sig);          return do_tkill(0, pid, sig);
1065   }   }
1066  --- linux-2.6.16-76.40vl4.orig/kernel/sys.c  --- linux-2.6.16-76.47vl4.orig/kernel/sys.c
1067  +++ linux-2.6.16-76.40vl4/kernel/sys.c  +++ linux-2.6.16-76.47vl4/kernel/sys.c
1068  @@ -38,6 +38,9 @@  @@ -38,6 +38,9 @@
1069   #include <asm/uaccess.h>   #include <asm/uaccess.h>
1070   #include <asm/io.h>   #include <asm/io.h>
# Line 1121  Source code for this patch is http://upd Line 1121  Source code for this patch is http://upd
1121    
1122          down_write(&uts_sem);          down_write(&uts_sem);
1123          errno = -EFAULT;          errno = -EFAULT;
1124  --- linux-2.6.16-76.40vl4.orig/kernel/sysctl.c  --- linux-2.6.16-76.47vl4.orig/kernel/sysctl.c
1125  +++ linux-2.6.16-76.40vl4/kernel/sysctl.c  +++ linux-2.6.16-76.47vl4/kernel/sysctl.c
1126  @@ -49,6 +49,9 @@  @@ -49,6 +49,9 @@
1127    
1128   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 1161  Source code for this patch is http://upd Line 1161  Source code for this patch is http://upd
1161                                          error = table->strategy(                                          error = table->strategy(
1162                                                  table, name, nlen,                                                  table, name, nlen,
1163                                                  oldval, oldlenp,                                                  oldval, oldlenp,
1164  --- linux-2.6.16-76.40vl4.orig/kernel/time.c  --- linux-2.6.16-76.47vl4.orig/kernel/time.c
1165  +++ linux-2.6.16-76.40vl4/kernel/time.c  +++ linux-2.6.16-76.47vl4/kernel/time.c
1166  @@ -39,6 +39,9 @@  @@ -39,6 +39,9 @@
1167    
1168   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 1206  Source code for this patch is http://upd Line 1206  Source code for this patch is http://upd
1206                                    
1207          /* Now we validate the data before disabling interrupts */          /* Now we validate the data before disabling interrupts */
1208    
1209  --- linux-2.6.16-76.40vl4.orig/net/core/datagram.c  --- linux-2.6.16-76.47vl4.orig/net/core/datagram.c
1210  +++ linux-2.6.16-76.40vl4/net/core/datagram.c  +++ linux-2.6.16-76.47vl4/net/core/datagram.c
1211  @@ -56,6 +56,11 @@  @@ -56,6 +56,11 @@
1212   #include <net/sock.h>   #include <net/sock.h>
1213   #include <net/tcp_states.h>   #include <net/tcp_states.h>
# Line 1233  Source code for this patch is http://upd Line 1233  Source code for this patch is http://upd
1233                  if (skb)                  if (skb)
1234                          return skb;                          return skb;
1235    
1236  --- linux-2.6.16-76.40vl4.orig/net/ipv4/inet_connection_sock.c  --- linux-2.6.16-76.47vl4.orig/net/ipv4/inet_connection_sock.c
1237  +++ linux-2.6.16-76.40vl4/net/ipv4/inet_connection_sock.c  +++ linux-2.6.16-76.47vl4/net/ipv4/inet_connection_sock.c
1238  @@ -24,6 +24,9 @@  @@ -24,6 +24,9 @@
1239   #include <net/route.h>   #include <net/route.h>
1240   #include <net/tcp_states.h>   #include <net/tcp_states.h>
# Line 1256  Source code for this patch is http://upd Line 1256  Source code for this patch is http://upd
1256                          inet_bind_bucket_for_each(tb, node, &head->chain)                          inet_bind_bucket_for_each(tb, node, &head->chain)
1257                                  if (tb->port == rover)                                  if (tb->port == rover)
1258                                          goto next;                                          goto next;
1259  --- linux-2.6.16-76.40vl4.orig/net/ipv4/inet_hashtables.c  --- linux-2.6.16-76.47vl4.orig/net/ipv4/inet_hashtables.c
1260  +++ linux-2.6.16-76.40vl4/net/ipv4/inet_hashtables.c  +++ linux-2.6.16-76.47vl4/net/ipv4/inet_hashtables.c
1261  @@ -23,6 +23,9 @@  @@ -23,6 +23,9 @@
1262   #include <net/inet_connection_sock.h>   #include <net/inet_connection_sock.h>
1263   #include <net/inet_hashtables.h>   #include <net/inet_hashtables.h>
# Line 1279  Source code for this patch is http://upd Line 1279  Source code for this patch is http://upd
1279                          head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];                          head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];
1280                          spin_lock(&head->lock);                          spin_lock(&head->lock);
1281    
1282  --- linux-2.6.16-76.40vl4.orig/net/ipv4/udp.c  --- linux-2.6.16-76.47vl4.orig/net/ipv4/udp.c
1283  +++ linux-2.6.16-76.40vl4/net/ipv4/udp.c  +++ linux-2.6.16-76.47vl4/net/ipv4/udp.c
1284  @@ -109,6 +109,9 @@  @@ -109,6 +109,9 @@
1285   #include <net/inet_common.h>   #include <net/inet_common.h>
1286   #include <net/checksum.h>   #include <net/checksum.h>
# Line 1313  Source code for this patch is http://upd Line 1313  Source code for this patch is http://upd
1313                          if (!udp_lport_inuse(result))                          if (!udp_lport_inuse(result))
1314                                  break;                                  break;
1315                  }                  }
1316  --- linux-2.6.16-76.40vl4.orig/net/ipv6/inet6_hashtables.c  --- linux-2.6.16-76.47vl4.orig/net/ipv6/inet6_hashtables.c
1317  +++ linux-2.6.16-76.40vl4/net/ipv6/inet6_hashtables.c  +++ linux-2.6.16-76.47vl4/net/ipv6/inet6_hashtables.c
1318  @@ -22,6 +22,9 @@  @@ -22,6 +22,9 @@
1319   #include <net/inet_hashtables.h>   #include <net/inet_hashtables.h>
1320   #include <net/inet6_hashtables.h>   #include <net/inet6_hashtables.h>
# Line 1345  Source code for this patch is http://upd Line 1345  Source code for this patch is http://upd
1345                          head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];                          head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];
1346                          spin_lock(&head->lock);                          spin_lock(&head->lock);
1347    
1348  --- linux-2.6.16-76.40vl4.orig/net/ipv6/udp.c  --- linux-2.6.16-76.47vl4.orig/net/ipv6/udp.c
1349  +++ linux-2.6.16-76.40vl4/net/ipv6/udp.c  +++ linux-2.6.16-76.47vl4/net/ipv6/udp.c
1350  @@ -59,6 +59,9 @@  @@ -59,6 +59,9 @@
1351    
1352   #include <linux/proc_fs.h>   #include <linux/proc_fs.h>
# Line 1379  Source code for this patch is http://upd Line 1379  Source code for this patch is http://upd
1379                          if (!udp_lport_inuse(result))                          if (!udp_lport_inuse(result))
1380                                  break;                                  break;
1381                  }                  }
1382  --- linux-2.6.16-76.40vl4.orig/net/socket.c  --- linux-2.6.16-76.47vl4.orig/net/socket.c
1383  +++ linux-2.6.16-76.40vl4/net/socket.c  +++ linux-2.6.16-76.47vl4/net/socket.c
1384  @@ -97,6 +97,11 @@  @@ -97,6 +97,11 @@
1385   #include <net/sock.h>   #include <net/sock.h>
1386   #include <linux/netfilter.h>   #include <linux/netfilter.h>
# Line 1473  Source code for this patch is http://upd Line 1473  Source code for this patch is http://upd
1473          err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen,          err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen,
1474                                   sock->file->f_flags);                                   sock->file->f_flags);
1475   out_put:   out_put:
1476  --- linux-2.6.16-76.40vl4.orig/net/unix/af_unix.c  --- linux-2.6.16-76.47vl4.orig/net/unix/af_unix.c
1477  +++ linux-2.6.16-76.40vl4/net/unix/af_unix.c  +++ linux-2.6.16-76.47vl4/net/unix/af_unix.c
1478  @@ -117,6 +117,9 @@  @@ -117,6 +117,9 @@
1479   #include <linux/mount.h>   #include <linux/mount.h>
1480   #include <net/checksum.h>   #include <net/checksum.h>
# Line 1485  Source code for this patch is http://upd Line 1485  Source code for this patch is http://upd
1485    
1486   int sysctl_unix_max_dgram_qlen = 10;   int sysctl_unix_max_dgram_qlen = 10;
1487    
1488  @@ -781,6 +784,11 @@ static int unix_bind(struct socket *sock  @@ -782,6 +785,11 @@ static int unix_bind(struct socket *sock
1489                   */                   */
1490                  mode = S_IFSOCK |                  mode = S_IFSOCK |
1491                         (SOCK_INODE(sock)->i_mode & ~current->fs->umask);                         (SOCK_INODE(sock)->i_mode & ~current->fs->umask);
Legend:
Removed from v.2306  
changed lines
  Added in v.2405
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
サイト情報
ソフトウェアを探す
ソフトウェアを作る
コミュニティ
ヘルプ