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

TOMOYO

Subversion リポジトリの参照

/[tomoyo]/trunk/1.7.x/ccs-patch/patches/ccs-patch-2.6.15-ubuntu-6.06.diff

Diff of /trunk/1.7.x/ccs-patch/patches/ccs-patch-2.6.15-ubuntu-6.06.diff

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

revision 1498 by kumaneko, Fri Aug 29 12:08:57 2008 UTC revision 1766 by kumaneko, Thu Oct 30 08:15:34 2008 UTC
# Line 9  Source code for this patch is "apt-get i Line 9  Source code for this patch is "apt-get i
9   arch/mips/kernel/ptrace32.c     |    9 +++   arch/mips/kernel/ptrace32.c     |    9 +++
10   arch/powerpc/kernel/ptrace32.c  |    9 +++   arch/powerpc/kernel/ptrace32.c  |    9 +++
11   arch/s390/kernel/ptrace.c       |    9 +++   arch/s390/kernel/ptrace.c       |    9 +++
  arch/sh64/kernel/ptrace.c       |    9 +++  
12   arch/sparc/kernel/ptrace.c      |   11 +++   arch/sparc/kernel/ptrace.c      |   11 +++
13   arch/sparc64/kernel/ptrace.c    |   11 +++   arch/sparc64/kernel/ptrace.c    |   11 +++
14   arch/x86_64/ia32/ptrace32.c     |    9 +++   arch/x86_64/ia32/ptrace32.c     |    9 +++
# Line 45  Source code for this patch is "apt-get i Line 44  Source code for this patch is "apt-get i
44   net/ipv6/udp.c                  |   11 +++   net/ipv6/udp.c                  |   11 +++
45   net/socket.c                    |   43 +++++++++++++-   net/socket.c                    |   43 +++++++++++++-
46   net/unix/af_unix.c              |   15 +++++   net/unix/af_unix.c              |   15 +++++
47   43 files changed, 714 insertions(+), 9 deletions(-)   42 files changed, 705 insertions(+), 9 deletions(-)
48    
49  --- linux-2.6.15-52.71.orig/arch/alpha/kernel/ptrace.c  --- linux-2.6.15-52.73.orig/arch/alpha/kernel/ptrace.c
50  +++ linux-2.6.15-52.71/arch/alpha/kernel/ptrace.c  +++ linux-2.6.15-52.73/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 72  Source code for this patch is "apt-get i Line 71  Source code for this patch is "apt-get i
71    
72          lock_kernel();          lock_kernel();
73          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",
74  --- linux-2.6.15-52.71.orig/arch/ia64/ia32/sys_ia32.c  --- linux-2.6.15-52.73.orig/arch/ia64/ia32/sys_ia32.c
75  +++ linux-2.6.15-52.71/arch/ia64/ia32/sys_ia32.c  +++ linux-2.6.15-52.73/arch/ia64/ia32/sys_ia32.c
76  @@ -57,6 +57,9 @@  @@ -57,6 +57,9 @@
77   #include <asm/types.h>   #include <asm/types.h>
78   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 97  Source code for this patch is "apt-get i Line 96  Source code for this patch is "apt-get i
96    
97          lock_kernel();          lock_kernel();
98          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
99  --- linux-2.6.15-52.71.orig/arch/ia64/kernel/ptrace.c  --- linux-2.6.15-52.73.orig/arch/ia64/kernel/ptrace.c
100  +++ linux-2.6.15-52.71/arch/ia64/kernel/ptrace.c  +++ linux-2.6.15-52.73/arch/ia64/kernel/ptrace.c
101  @@ -29,6 +29,9 @@  @@ -29,6 +29,9 @@
102   #ifdef CONFIG_PERFMON   #ifdef CONFIG_PERFMON
103   #include <asm/perfmon.h>   #include <asm/perfmon.h>
# Line 122  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-52.71.orig/arch/m32r/kernel/ptrace.c  --- linux-2.6.15-52.73.orig/arch/m32r/kernel/ptrace.c
125  +++ linux-2.6.15-52.71/arch/m32r/kernel/ptrace.c  +++ linux-2.6.15-52.73/arch/m32r/kernel/ptrace.c
126  @@ -33,6 +33,9 @@  @@ -33,6 +33,9 @@
127   #include <asm/system.h>   #include <asm/system.h>
128   #include <asm/processor.h>   #include <asm/processor.h>
# Line 147  Source code for this patch is "apt-get i Line 146  Source code for this patch is "apt-get i
146    
147          lock_kernel();          lock_kernel();
148          ret = -EPERM;          ret = -EPERM;
149  --- linux-2.6.15-52.71.orig/arch/mips/kernel/ptrace32.c  --- linux-2.6.15-52.73.orig/arch/mips/kernel/ptrace32.c
150  +++ linux-2.6.15-52.71/arch/mips/kernel/ptrace32.c  +++ linux-2.6.15-52.73/arch/mips/kernel/ptrace32.c
151  @@ -35,6 +35,9 @@  @@ -35,6 +35,9 @@
152   #include <asm/system.h>   #include <asm/system.h>
153   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 172  Source code for this patch is "apt-get i Line 171  Source code for this patch is "apt-get i
171    
172   #if 0   #if 0
173          printk("ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n",          printk("ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n",
174  --- linux-2.6.15-52.71.orig/arch/powerpc/kernel/ptrace32.c  --- linux-2.6.15-52.73.orig/arch/powerpc/kernel/ptrace32.c
175  +++ linux-2.6.15-52.71/arch/powerpc/kernel/ptrace32.c  +++ linux-2.6.15-52.73/arch/powerpc/kernel/ptrace32.c
176  @@ -33,6 +33,9 @@  @@ -33,6 +33,9 @@
177   #include <asm/page.h>   #include <asm/page.h>
178   #include <asm/pgtable.h>   #include <asm/pgtable.h>
# Line 197  Source code for this patch is "apt-get i Line 196  Source code for this patch is "apt-get i
196    
197          lock_kernel();          lock_kernel();
198          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
199  --- linux-2.6.15-52.71.orig/arch/s390/kernel/ptrace.c  --- linux-2.6.15-52.73.orig/arch/s390/kernel/ptrace.c
200  +++ linux-2.6.15-52.71/arch/s390/kernel/ptrace.c  +++ linux-2.6.15-52.73/arch/s390/kernel/ptrace.c
201  @@ -41,6 +41,9 @@  @@ -41,6 +41,9 @@
202   #include <asm/system.h>   #include <asm/system.h>
203   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 222  Source code for this patch is "apt-get i Line 221  Source code for this patch is "apt-get i
221          lock_kernel();          lock_kernel();
222    
223          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
224  --- linux-2.6.15-52.71.orig/arch/sh64/kernel/ptrace.c  --- linux-2.6.15-52.73.orig/arch/sparc/kernel/ptrace.c
225  +++ linux-2.6.15-52.71/arch/sh64/kernel/ptrace.c  +++ linux-2.6.15-52.73/arch/sparc/kernel/ptrace.c
 @@ -36,6 +36,9 @@  
  #include <asm/system.h>  
  #include <asm/processor.h>  
  #include <asm/mmu_context.h>  
 +/***** TOMOYO Linux start. *****/  
 +#include <linux/tomoyo.h>  
 +/***** TOMOYO Linux end. *****/  
   
  /* This mask defines the bits of the SR which the user is not allowed to  
     change, which are everything except S, Q, M, PR, SZ, FR. */  
 @@ -272,6 +275,12 @@ asmlinkage int sh64_ptrace(long request,  
         extern void poke_real_address_q(unsigned long long addr, unsigned long long data);  
  #define WPC_DBRMODE 0x0d104008  
         static int first_call = 1;  
 +       /***** TOMOYO Linux start. *****/  
 +#ifdef TOMOYO_SYS_PTRACE  
 +       if (!ccs_capable(TOMOYO_SYS_PTRACE))  
 +               return -EPERM;  
 +#endif  
 +       /***** TOMOYO Linux end. *****/  
   
         lock_kernel();  
         if (first_call) {  
 --- linux-2.6.15-52.71.orig/arch/sparc/kernel/ptrace.c  
 +++ linux-2.6.15-52.71/arch/sparc/kernel/ptrace.c  
226  @@ -23,6 +23,9 @@  @@ -23,6 +23,9 @@
227   #include <asm/pgtable.h>   #include <asm/pgtable.h>
228   #include <asm/system.h>   #include <asm/system.h>
# Line 274  Source code for this patch is "apt-get i Line 248  Source code for this patch is "apt-get i
248    
249          lock_kernel();          lock_kernel();
250   #ifdef DEBUG_PTRACE   #ifdef DEBUG_PTRACE
251  --- linux-2.6.15-52.71.orig/arch/sparc64/kernel/ptrace.c  --- linux-2.6.15-52.73.orig/arch/sparc64/kernel/ptrace.c
252  +++ linux-2.6.15-52.71/arch/sparc64/kernel/ptrace.c  +++ linux-2.6.15-52.73/arch/sparc64/kernel/ptrace.c
253  @@ -32,6 +32,9 @@  @@ -32,6 +32,9 @@
254   #include <asm/spitfire.h>   #include <asm/spitfire.h>
255   #include <asm/page.h>   #include <asm/page.h>
# Line 301  Source code for this patch is "apt-get i Line 275  Source code for this patch is "apt-get i
275    
276          if (test_thread_flag(TIF_32BIT)) {          if (test_thread_flag(TIF_32BIT)) {
277                  addr &= 0xffffffffUL;                  addr &= 0xffffffffUL;
278  --- linux-2.6.15-52.71.orig/arch/x86_64/ia32/ptrace32.c  --- linux-2.6.15-52.73.orig/arch/x86_64/ia32/ptrace32.c
279  +++ linux-2.6.15-52.71/arch/x86_64/ia32/ptrace32.c  +++ linux-2.6.15-52.73/arch/x86_64/ia32/ptrace32.c
280  @@ -27,6 +27,9 @@  @@ -27,6 +27,9 @@
281   #include <asm/debugreg.h>   #include <asm/debugreg.h>
282   #include <asm/i387.h>   #include <asm/i387.h>
# Line 326  Source code for this patch is "apt-get i Line 300  Source code for this patch is "apt-get i
300    
301          switch (request) {          switch (request) {
302          default:          default:
303  --- linux-2.6.15-52.71.orig/fs/Kconfig  --- linux-2.6.15-52.73.orig/fs/Kconfig
304  +++ linux-2.6.15-52.71/fs/Kconfig  +++ linux-2.6.15-52.73/fs/Kconfig
305  @@ -1910,5 +1910,7 @@ endmenu  @@ -1910,5 +1910,7 @@ endmenu
306    
307   source "fs/nls/Kconfig"   source "fs/nls/Kconfig"
# Line 336  Source code for this patch is "apt-get i Line 310  Source code for this patch is "apt-get i
310  +  +
311   endmenu   endmenu
312    
313  --- linux-2.6.15-52.71.orig/fs/Makefile  --- linux-2.6.15-52.73.orig/fs/Makefile
314  +++ linux-2.6.15-52.71/fs/Makefile  +++ linux-2.6.15-52.73/fs/Makefile
315  @@ -108,3 +108,5 @@ obj-$(CONFIG_CONFIGFS_FS)   += configfs/  @@ -108,3 +108,5 @@ obj-$(CONFIG_CONFIGFS_FS)   += configfs/
316   obj-$(CONFIG_OCFS2_FS)         += ocfs2/   obj-$(CONFIG_OCFS2_FS)         += ocfs2/
317   obj-$(CONFIG_UNION_FS)          += unionfs/   obj-$(CONFIG_UNION_FS)          += unionfs/
318   obj-$(CONFIG_DAZUKO)           += dazuko/   obj-$(CONFIG_DAZUKO)           += dazuko/
319  +  +
320  +include $(srctree)/fs/Makefile-2.6.ccs  +include $(srctree)/fs/Makefile-2.6.ccs
321  --- linux-2.6.15-52.71.orig/fs/attr.c  --- linux-2.6.15-52.73.orig/fs/attr.c
322  +++ linux-2.6.15-52.71/fs/attr.c  +++ linux-2.6.15-52.73/fs/attr.c
323  @@ -15,6 +15,9 @@  @@ -15,6 +15,9 @@
324   #include <linux/quotaops.h>   #include <linux/quotaops.h>
325   #include <linux/security.h>   #include <linux/security.h>
# Line 385  Source code for this patch is "apt-get i Line 359  Source code for this patch is "apt-get i
359                  if (!error) {                  if (!error) {
360                          if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||                          if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
361                              (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))                              (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))
362  --- linux-2.6.15-52.71.orig/fs/compat.c  --- linux-2.6.15-52.73.orig/fs/compat.c
363  +++ linux-2.6.15-52.71/fs/compat.c  +++ linux-2.6.15-52.73/fs/compat.c
364  @@ -52,6 +52,9 @@  @@ -52,6 +52,9 @@
365   #include <asm/uaccess.h>   #include <asm/uaccess.h>
366   #include <asm/mmu_context.h>   #include <asm/mmu_context.h>
# Line 419  Source code for this patch is "apt-get i Line 393  Source code for this patch is "apt-get i
393          if (retval >= 0) {          if (retval >= 0) {
394                  free_arg_pages(bprm);                  free_arg_pages(bprm);
395    
396  --- linux-2.6.15-52.71.orig/fs/exec.c  --- linux-2.6.15-52.73.orig/fs/exec.c
397  +++ linux-2.6.15-52.71/fs/exec.c  +++ linux-2.6.15-52.73/fs/exec.c
398  @@ -57,6 +57,10 @@  @@ -57,6 +57,10 @@
399   #include <linux/kmod.h>   #include <linux/kmod.h>
400   #endif   #endif
# Line 470  Source code for this patch is "apt-get i Line 444  Source code for this patch is "apt-get i
444          if (retval >= 0) {          if (retval >= 0) {
445                  free_arg_pages(bprm);                  free_arg_pages(bprm);
446    
447  --- linux-2.6.15-52.71.orig/fs/fcntl.c  --- linux-2.6.15-52.73.orig/fs/fcntl.c
448  +++ linux-2.6.15-52.71/fs/fcntl.c  +++ linux-2.6.15-52.73/fs/fcntl.c
449  @@ -21,6 +21,9 @@  @@ -21,6 +21,9 @@
450   #include <asm/poll.h>   #include <asm/poll.h>
451   #include <asm/siginfo.h>   #include <asm/siginfo.h>
# Line 494  Source code for this patch is "apt-get i Line 468  Source code for this patch is "apt-get i
468          /* O_NOATIME can only be set by the owner or superuser */          /* O_NOATIME can only be set by the owner or superuser */
469          if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))          if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))
470                  if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))                  if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
471  --- linux-2.6.15-52.71.orig/fs/ioctl.c  --- linux-2.6.15-52.73.orig/fs/ioctl.c
472  +++ linux-2.6.15-52.71/fs/ioctl.c  +++ linux-2.6.15-52.73/fs/ioctl.c
473  @@ -15,6 +15,9 @@  @@ -15,6 +15,9 @@
474    
475   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 517  Source code for this patch is "apt-get i Line 491  Source code for this patch is "apt-get i
491    
492          if (filp->f_op->unlocked_ioctl) {          if (filp->f_op->unlocked_ioctl) {
493                  error = filp->f_op->unlocked_ioctl(filp, cmd, arg);                  error = filp->f_op->unlocked_ioctl(filp, cmd, arg);
494  --- linux-2.6.15-52.71.orig/fs/namei.c  --- linux-2.6.15-52.73.orig/fs/namei.c
495  +++ linux-2.6.15-52.71/fs/namei.c  +++ linux-2.6.15-52.73/fs/namei.c
496  @@ -34,6 +34,10 @@  @@ -34,6 +34,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 753  Source code for this patch is "apt-get i Line 727  Source code for this patch is "apt-get i
727    
728          from = getname(oldname);          from = getname(oldname);
729          if(IS_ERR(from))          if(IS_ERR(from))
730  --- linux-2.6.15-52.71.orig/fs/namespace.c  --- linux-2.6.15-52.73.orig/fs/namespace.c
731  +++ linux-2.6.15-52.71/fs/namespace.c  +++ linux-2.6.15-52.73/fs/namespace.c
732  @@ -25,6 +25,12 @@  @@ -25,6 +25,12 @@
733   #include <asm/uaccess.h>   #include <asm/uaccess.h>
734   #include <asm/unistd.h>   #include <asm/unistd.h>
# Line 868  Source code for this patch is "apt-get i Line 842  Source code for this patch is "apt-get i
842          if (error) {          if (error) {
843                  path_release(&old_nd);                  path_release(&old_nd);
844                  goto out1;                  goto out1;
845  --- linux-2.6.15-52.71.orig/fs/open.c  --- linux-2.6.15-52.73.orig/fs/open.c
846  +++ linux-2.6.15-52.71/fs/open.c  +++ linux-2.6.15-52.73/fs/open.c
847  @@ -28,6 +28,13 @@  @@ -28,6 +28,13 @@
848    
849   #include <asm/unistd.h>   #include <asm/unistd.h>
# Line 934  Source code for this patch is "apt-get i Line 908  Source code for this patch is "apt-get i
908          if (capable(CAP_SYS_TTY_CONFIG)) {          if (capable(CAP_SYS_TTY_CONFIG)) {
909                  tty_vhangup(current->signal->tty);                  tty_vhangup(current->signal->tty);
910                  return 0;                  return 0;
911  --- linux-2.6.15-52.71.orig/fs/proc/Makefile  --- linux-2.6.15-52.73.orig/fs/proc/Makefile
912  +++ linux-2.6.15-52.71/fs/proc/Makefile  +++ linux-2.6.15-52.73/fs/proc/Makefile
913  @@ -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
914   proc-$(CONFIG_PROC_KCORE)      += kcore.o   proc-$(CONFIG_PROC_KCORE)      += kcore.o
915   proc-$(CONFIG_PROC_VMCORE)     += vmcore.o   proc-$(CONFIG_PROC_VMCORE)     += vmcore.o
# Line 943  Source code for this patch is "apt-get i Line 917  Source code for this patch is "apt-get i
917  +  +
918  +proc-$(CONFIG_SAKURA) += ccs_proc.o  +proc-$(CONFIG_SAKURA) += ccs_proc.o
919  +proc-$(CONFIG_TOMOYO) += ccs_proc.o  +proc-$(CONFIG_TOMOYO) += ccs_proc.o
920  --- linux-2.6.15-52.71.orig/fs/proc/proc_misc.c  --- linux-2.6.15-52.73.orig/fs/proc/proc_misc.c
921  +++ linux-2.6.15-52.71/fs/proc/proc_misc.c  +++ linux-2.6.15-52.73/fs/proc/proc_misc.c
922  @@ -629,4 +629,9 @@ void __init proc_misc_init(void)  @@ -629,4 +629,9 @@ void __init proc_misc_init(void)
923          if (entry)          if (entry)
924                  entry->proc_fops = &proc_sysrq_trigger_operations;                  entry->proc_fops = &proc_sysrq_trigger_operations;
925   #endif   #endif
926  +       /***** CCS start. *****/  +       /***** CCS start. *****/
927  +#if defined(CONFIG_SAKURA) || defined(CONFIG_TOMOYO)  +#if defined(CONFIG_SAKURA) || defined(CONFIG_TOMOYO)
928  +       printk(KERN_INFO "Hook version: 2.6.15.7-ubuntu1 2008/08/20\n");  +       printk(KERN_INFO "Hook version: 2.6.15-52.73 2008/10/30\n");
929  +#endif  +#endif
930  +       /***** CCS end. *****/  +       /***** CCS end. *****/
931   }   }
932  --- linux-2.6.15-52.71.orig/include/linux/init_task.h  --- linux-2.6.15-52.73.orig/include/linux/init_task.h
933  +++ linux-2.6.15-52.71/include/linux/init_task.h  +++ linux-2.6.15-52.73/include/linux/init_task.h
934  @@ -121,6 +121,10 @@ extern struct group_info init_groups;  @@ -121,6 +121,10 @@ extern struct group_info init_groups;
935          .journal_info   = NULL,                                         \          .journal_info   = NULL,                                         \
936          .cpu_timers     = INIT_CPU_TIMERS(tsk.cpu_timers),              \          .cpu_timers     = INIT_CPU_TIMERS(tsk.cpu_timers),              \
# Line 968  Source code for this patch is "apt-get i Line 942  Source code for this patch is "apt-get i
942   }   }
943    
944    
945  --- linux-2.6.15-52.71.orig/include/linux/sched.h  --- linux-2.6.15-52.73.orig/include/linux/sched.h
946  +++ linux-2.6.15-52.71/include/linux/sched.h  +++ linux-2.6.15-52.73/include/linux/sched.h
947  @@ -39,6 +39,11 @@  @@ -39,6 +39,11 @@
948    
949   struct exec_domain;   struct exec_domain;
# Line 993  Source code for this patch is "apt-get i Line 967  Source code for this patch is "apt-get i
967   };   };
968    
969   static inline pid_t process_group(struct task_struct *tsk)   static inline pid_t process_group(struct task_struct *tsk)
970  --- linux-2.6.15-52.71.orig/kernel/compat.c  --- linux-2.6.15-52.73.orig/kernel/compat.c
971  +++ linux-2.6.15-52.71/kernel/compat.c  +++ linux-2.6.15-52.73/kernel/compat.c
972  @@ -24,6 +24,9 @@  @@ -24,6 +24,9 @@
973    
974   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 1016  Source code for this patch is "apt-get i Line 990  Source code for this patch is "apt-get i
990    
991          do_settimeofday(&tv);          do_settimeofday(&tv);
992          return 0;          return 0;
993  --- linux-2.6.15-52.71.orig/kernel/kexec.c  --- linux-2.6.15-52.73.orig/kernel/kexec.c
994  +++ linux-2.6.15-52.71/kernel/kexec.c  +++ linux-2.6.15-52.73/kernel/kexec.c
995  @@ -25,6 +25,9 @@  @@ -25,6 +25,9 @@
996   #include <asm/io.h>   #include <asm/io.h>
997   #include <asm/system.h>   #include <asm/system.h>
# Line 1039  Source code for this patch is "apt-get i Line 1013  Source code for this patch is "apt-get i
1013    
1014          /*          /*
1015           * Verify we have a legal set of flags           * Verify we have a legal set of flags
1016  --- linux-2.6.15-52.71.orig/kernel/kmod.c  --- linux-2.6.15-52.73.orig/kernel/kmod.c
1017  +++ linux-2.6.15-52.71/kernel/kmod.c  +++ linux-2.6.15-52.73/kernel/kmod.c
1018  @@ -149,6 +149,11 @@ static int ____call_usermodehelper(void  @@ -149,6 +149,11 @@ static int ____call_usermodehelper(void
1019          /* We can run anywhere, unlike our parent keventd(). */          /* We can run anywhere, unlike our parent keventd(). */
1020          set_cpus_allowed(current, CPU_MASK_ALL);          set_cpus_allowed(current, CPU_MASK_ALL);
# Line 1053  Source code for this patch is "apt-get i Line 1027  Source code for this patch is "apt-get i
1027          retval = -EPERM;          retval = -EPERM;
1028          if (current->fs->root)          if (current->fs->root)
1029                  retval = execve(sub_info->path, sub_info->argv,sub_info->envp);                  retval = execve(sub_info->path, sub_info->argv,sub_info->envp);
1030  --- linux-2.6.15-52.71.orig/kernel/module.c  --- linux-2.6.15-52.73.orig/kernel/module.c
1031  +++ linux-2.6.15-52.71/kernel/module.c  +++ linux-2.6.15-52.73/kernel/module.c
1032  @@ -41,6 +41,9 @@  @@ -41,6 +41,9 @@
1033   #include <asm/uaccess.h>   #include <asm/uaccess.h>
1034   #include <asm/semaphore.h>   #include <asm/semaphore.h>
# Line 1089  Source code for this patch is "apt-get i Line 1063  Source code for this patch is "apt-get i
1063          /* Only one module load at a time, please */          /* Only one module load at a time, please */
1064          if (down_interruptible(&module_mutex) != 0)          if (down_interruptible(&module_mutex) != 0)
1065                  return -EINTR;                  return -EINTR;
1066  --- linux-2.6.15-52.71.orig/kernel/ptrace.c  --- linux-2.6.15-52.73.orig/kernel/ptrace.c
1067  +++ linux-2.6.15-52.71/kernel/ptrace.c  +++ linux-2.6.15-52.73/kernel/ptrace.c
1068  @@ -20,6 +20,9 @@  @@ -20,6 +20,9 @@
1069    
1070   #include <asm/pgtable.h>   #include <asm/pgtable.h>
# Line 1114  Source code for this patch is "apt-get i Line 1088  Source code for this patch is "apt-get i
1088          lock_kernel();          lock_kernel();
1089          ret = ptrace_get_task_struct(request, pid, &child);          ret = ptrace_get_task_struct(request, pid, &child);
1090          if (!child)          if (!child)
1091  --- linux-2.6.15-52.71.orig/kernel/sched.c  --- linux-2.6.15-52.73.orig/kernel/sched.c
1092  +++ linux-2.6.15-52.71/kernel/sched.c  +++ linux-2.6.15-52.73/kernel/sched.c
1093  @@ -50,6 +50,9 @@  @@ -50,6 +50,9 @@
1094   #include <asm/tlb.h>   #include <asm/tlb.h>
1095    
# Line 1137  Source code for this patch is "apt-get i Line 1111  Source code for this patch is "apt-get i
1111    
1112          /*          /*
1113           * Setpriority might change our priority at the same moment.           * Setpriority might change our priority at the same moment.
1114  --- linux-2.6.15-52.71.orig/kernel/signal.c  --- linux-2.6.15-52.73.orig/kernel/signal.c
1115  +++ linux-2.6.15-52.71/kernel/signal.c  +++ linux-2.6.15-52.73/kernel/signal.c
1116  @@ -29,6 +29,9 @@  @@ -29,6 +29,9 @@
1117   #include <asm/uaccess.h>   #include <asm/uaccess.h>
1118   #include <asm/unistd.h>   #include <asm/unistd.h>
# Line 1188  Source code for this patch is "apt-get i Line 1162  Source code for this patch is "apt-get i
1162    
1163          return do_tkill(0, pid, sig);          return do_tkill(0, pid, sig);
1164   }   }
1165  --- linux-2.6.15-52.71.orig/kernel/sys.c  --- linux-2.6.15-52.73.orig/kernel/sys.c
1166  +++ linux-2.6.15-52.71/kernel/sys.c  +++ linux-2.6.15-52.73/kernel/sys.c
1167  @@ -37,6 +37,9 @@  @@ -37,6 +37,9 @@
1168   #include <asm/uaccess.h>   #include <asm/uaccess.h>
1169   #include <asm/io.h>   #include <asm/io.h>
# Line 1246  Source code for this patch is "apt-get i Line 1220  Source code for this patch is "apt-get i
1220    
1221          down_write(&uts_sem);          down_write(&uts_sem);
1222          errno = -EFAULT;          errno = -EFAULT;
1223  --- linux-2.6.15-52.71.orig/kernel/sysctl.c  --- linux-2.6.15-52.73.orig/kernel/sysctl.c
1224  +++ linux-2.6.15-52.71/kernel/sysctl.c  +++ linux-2.6.15-52.73/kernel/sysctl.c
1225  @@ -45,6 +45,9 @@  @@ -45,6 +45,9 @@
1226    
1227   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 1387  Source code for this patch is "apt-get i Line 1361  Source code for this patch is "apt-get i
1361                                          error = table->strategy(                                          error = table->strategy(
1362                                                  table, name, nlen,                                                  table, name, nlen,
1363                                                  oldval, oldlenp,                                                  oldval, oldlenp,
1364  --- linux-2.6.15-52.71.orig/kernel/time.c  --- linux-2.6.15-52.73.orig/kernel/time.c
1365  +++ linux-2.6.15-52.71/kernel/time.c  +++ linux-2.6.15-52.73/kernel/time.c
1366  @@ -38,6 +38,9 @@  @@ -38,6 +38,9 @@
1367    
1368   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 1432  Source code for this patch is "apt-get i Line 1406  Source code for this patch is "apt-get i
1406                                    
1407          /* Now we validate the data before disabling interrupts */          /* Now we validate the data before disabling interrupts */
1408    
1409  --- linux-2.6.15-52.71.orig/net/core/datagram.c  --- linux-2.6.15-52.73.orig/net/core/datagram.c
1410  +++ linux-2.6.15-52.71/net/core/datagram.c  +++ linux-2.6.15-52.73/net/core/datagram.c
1411  @@ -55,6 +55,11 @@  @@ -55,6 +55,11 @@
1412   #include <net/sock.h>   #include <net/sock.h>
1413   #include <net/tcp_states.h>   #include <net/tcp_states.h>
# Line 1459  Source code for this patch is "apt-get i Line 1433  Source code for this patch is "apt-get i
1433                  if (skb)                  if (skb)
1434                          return skb;                          return skb;
1435    
1436  --- linux-2.6.15-52.71.orig/net/ipv4/inet_connection_sock.c  --- linux-2.6.15-52.73.orig/net/ipv4/inet_connection_sock.c
1437  +++ linux-2.6.15-52.71/net/ipv4/inet_connection_sock.c  +++ linux-2.6.15-52.73/net/ipv4/inet_connection_sock.c
1438  @@ -24,6 +24,9 @@  @@ -24,6 +24,9 @@
1439   #include <net/route.h>   #include <net/route.h>
1440   #include <net/tcp_states.h>   #include <net/tcp_states.h>
# Line 1482  Source code for this patch is "apt-get i Line 1456  Source code for this patch is "apt-get i
1456                          inet_bind_bucket_for_each(tb, node, &head->chain)                          inet_bind_bucket_for_each(tb, node, &head->chain)
1457                                  if (tb->port == rover)                                  if (tb->port == rover)
1458                                          goto next;                                          goto next;
1459  --- linux-2.6.15-52.71.orig/net/ipv4/tcp_ipv4.c  --- linux-2.6.15-52.73.orig/net/ipv4/tcp_ipv4.c
1460  +++ linux-2.6.15-52.71/net/ipv4/tcp_ipv4.c  +++ linux-2.6.15-52.73/net/ipv4/tcp_ipv4.c
1461  @@ -76,6 +76,9 @@  @@ -76,6 +76,9 @@
1462   #include <linux/stddef.h>   #include <linux/stddef.h>
1463   #include <linux/proc_fs.h>   #include <linux/proc_fs.h>
# Line 1505  Source code for this patch is "apt-get i Line 1479  Source code for this patch is "apt-get i
1479                          head = &tcp_hashinfo.bhash[inet_bhashfn(port, tcp_hashinfo.bhash_size)];                          head = &tcp_hashinfo.bhash[inet_bhashfn(port, tcp_hashinfo.bhash_size)];
1480                          spin_lock(&head->lock);                          spin_lock(&head->lock);
1481    
1482  --- linux-2.6.15-52.71.orig/net/ipv4/udp.c  --- linux-2.6.15-52.73.orig/net/ipv4/udp.c
1483  +++ linux-2.6.15-52.71/net/ipv4/udp.c  +++ linux-2.6.15-52.73/net/ipv4/udp.c
1484  @@ -108,6 +108,9 @@  @@ -108,6 +108,9 @@
1485   #include <net/inet_common.h>   #include <net/inet_common.h>
1486   #include <net/checksum.h>   #include <net/checksum.h>
# Line 1539  Source code for this patch is "apt-get i Line 1513  Source code for this patch is "apt-get i
1513                          if (!udp_lport_inuse(result))                          if (!udp_lport_inuse(result))
1514                                  break;                                  break;
1515                  }                  }
1516  --- linux-2.6.15-52.71.orig/net/ipv6/tcp_ipv6.c  --- linux-2.6.15-52.73.orig/net/ipv6/tcp_ipv6.c
1517  +++ linux-2.6.15-52.71/net/ipv6/tcp_ipv6.c  +++ linux-2.6.15-52.73/net/ipv6/tcp_ipv6.c
1518  @@ -64,6 +64,9 @@  @@ -64,6 +64,9 @@
1519    
1520   #include <linux/proc_fs.h>   #include <linux/proc_fs.h>
# Line 1573  Source code for this patch is "apt-get i Line 1547  Source code for this patch is "apt-get i
1547                          head = &tcp_hashinfo.bhash[inet_bhashfn(port, tcp_hashinfo.bhash_size)];                          head = &tcp_hashinfo.bhash[inet_bhashfn(port, tcp_hashinfo.bhash_size)];
1548                          spin_lock(&head->lock);                          spin_lock(&head->lock);
1549    
1550  --- linux-2.6.15-52.71.orig/net/ipv6/udp.c  --- linux-2.6.15-52.73.orig/net/ipv6/udp.c
1551  +++ linux-2.6.15-52.71/net/ipv6/udp.c  +++ linux-2.6.15-52.73/net/ipv6/udp.c
1552  @@ -58,6 +58,9 @@  @@ -58,6 +58,9 @@
1553    
1554   #include <linux/proc_fs.h>   #include <linux/proc_fs.h>
# Line 1607  Source code for this patch is "apt-get i Line 1581  Source code for this patch is "apt-get i
1581                          if (!udp_lport_inuse(result))                          if (!udp_lport_inuse(result))
1582                                  break;                                  break;
1583                  }                  }
1584  --- linux-2.6.15-52.71.orig/net/socket.c  --- linux-2.6.15-52.73.orig/net/socket.c
1585  +++ linux-2.6.15-52.71/net/socket.c  +++ linux-2.6.15-52.73/net/socket.c
1586  @@ -97,6 +97,11 @@  @@ -97,6 +97,11 @@
1587   #include <net/sock.h>   #include <net/sock.h>
1588   #include <linux/netfilter.h>   #include <linux/netfilter.h>
# Line 1701  Source code for this patch is "apt-get i Line 1675  Source code for this patch is "apt-get i
1675          err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen,          err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen,
1676                                   sock->file->f_flags);                                   sock->file->f_flags);
1677   out_put:   out_put:
1678  --- linux-2.6.15-52.71.orig/net/unix/af_unix.c  --- linux-2.6.15-52.73.orig/net/unix/af_unix.c
1679  +++ linux-2.6.15-52.71/net/unix/af_unix.c  +++ linux-2.6.15-52.73/net/unix/af_unix.c
1680  @@ -117,6 +117,9 @@  @@ -117,6 +117,9 @@
1681   #include <linux/mount.h>   #include <linux/mount.h>
1682   #include <net/checksum.h>   #include <net/checksum.h>
Legend:
Removed from v.1498  
changed lines
  Added in v.1766
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
サイト情報
ソフトウェアを探す
ソフトウェアを作る
コミュニティ
ヘルプ