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

TOMOYO

Subversion リポジトリの参照

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

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

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

revision 2459 by kumaneko, Mon Apr 20 05:47:21 2009 UTC revision 2513 by kumaneko, Thu May 7 08:22:27 2009 UTC
# Line 47  Source code for this patch is "apt-get i Line 47  Source code for this patch is "apt-get i
47   net/unix/af_unix.c              |    8 +++++   net/unix/af_unix.c              |    8 +++++
48   43 files changed, 549 insertions(+), 9 deletions(-)   43 files changed, 549 insertions(+), 9 deletions(-)
49    
50  --- linux-2.6.18-24.orig/arch/alpha/kernel/ptrace.c  --- linux-2.6.18-24etch2.orig/arch/alpha/kernel/ptrace.c
51  +++ linux-2.6.18-24/arch/alpha/kernel/ptrace.c  +++ linux-2.6.18-24etch2/arch/alpha/kernel/ptrace.c
52  @@ -20,6 +20,9 @@  @@ -20,6 +20,9 @@
53   #include <asm/pgtable.h>   #include <asm/pgtable.h>
54   #include <asm/system.h>   #include <asm/system.h>
# Line 70  Source code for this patch is "apt-get i Line 70  Source code for this patch is "apt-get i
70    
71          lock_kernel();          lock_kernel();
72          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",
73  --- linux-2.6.18-24.orig/arch/ia64/ia32/sys_ia32.c  --- linux-2.6.18-24etch2.orig/arch/ia64/ia32/sys_ia32.c
74  +++ linux-2.6.18-24/arch/ia64/ia32/sys_ia32.c  +++ linux-2.6.18-24etch2/arch/ia64/ia32/sys_ia32.c
75  @@ -56,6 +56,9 @@  @@ -56,6 +56,9 @@
76   #include <asm/types.h>   #include <asm/types.h>
77   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 93  Source code for this patch is "apt-get i Line 93  Source code for this patch is "apt-get i
93    
94          lock_kernel();          lock_kernel();
95          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
96  --- linux-2.6.18-24.orig/arch/ia64/kernel/ptrace.c  --- linux-2.6.18-24etch2.orig/arch/ia64/kernel/ptrace.c
97  +++ linux-2.6.18-24/arch/ia64/kernel/ptrace.c  +++ linux-2.6.18-24etch2/arch/ia64/kernel/ptrace.c
98  @@ -28,6 +28,9 @@  @@ -28,6 +28,9 @@
99   #ifdef CONFIG_PERFMON   #ifdef CONFIG_PERFMON
100   #include <asm/perfmon.h>   #include <asm/perfmon.h>
# Line 116  Source code for this patch is "apt-get i Line 116  Source code for this patch is "apt-get i
116    
117          lock_kernel();          lock_kernel();
118          ret = -EPERM;          ret = -EPERM;
119  --- linux-2.6.18-24.orig/arch/m32r/kernel/ptrace.c  --- linux-2.6.18-24etch2.orig/arch/m32r/kernel/ptrace.c
120  +++ linux-2.6.18-24/arch/m32r/kernel/ptrace.c  +++ linux-2.6.18-24etch2/arch/m32r/kernel/ptrace.c
121  @@ -32,6 +32,9 @@  @@ -32,6 +32,9 @@
122   #include <asm/system.h>   #include <asm/system.h>
123   #include <asm/processor.h>   #include <asm/processor.h>
# Line 139  Source code for this patch is "apt-get i Line 139  Source code for this patch is "apt-get i
139    
140          lock_kernel();          lock_kernel();
141          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
142  --- linux-2.6.18-24.orig/arch/mips/kernel/ptrace32.c  --- linux-2.6.18-24etch2.orig/arch/mips/kernel/ptrace32.c
143  +++ linux-2.6.18-24/arch/mips/kernel/ptrace32.c  +++ linux-2.6.18-24etch2/arch/mips/kernel/ptrace32.c
144  @@ -35,6 +35,9 @@  @@ -35,6 +35,9 @@
145   #include <asm/system.h>   #include <asm/system.h>
146   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 162  Source code for this patch is "apt-get i Line 162  Source code for this patch is "apt-get i
162    
163   #if 0   #if 0
164          printk("ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n",          printk("ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n",
165  --- linux-2.6.18-24.orig/arch/powerpc/kernel/ptrace32.c  --- linux-2.6.18-24etch2.orig/arch/powerpc/kernel/ptrace32.c
166  +++ linux-2.6.18-24/arch/powerpc/kernel/ptrace32.c  +++ linux-2.6.18-24etch2/arch/powerpc/kernel/ptrace32.c
167  @@ -32,6 +32,9 @@  @@ -32,6 +32,9 @@
168   #include <asm/page.h>   #include <asm/page.h>
169   #include <asm/pgtable.h>   #include <asm/pgtable.h>
# Line 185  Source code for this patch is "apt-get i Line 185  Source code for this patch is "apt-get i
185    
186          lock_kernel();          lock_kernel();
187          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
188  --- linux-2.6.18-24.orig/arch/s390/kernel/ptrace.c  --- linux-2.6.18-24etch2.orig/arch/s390/kernel/ptrace.c
189  +++ linux-2.6.18-24/arch/s390/kernel/ptrace.c  +++ linux-2.6.18-24etch2/arch/s390/kernel/ptrace.c
190  @@ -41,6 +41,9 @@  @@ -41,6 +41,9 @@
191   #include <asm/system.h>   #include <asm/system.h>
192   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 208  Source code for this patch is "apt-get i Line 208  Source code for this patch is "apt-get i
208          lock_kernel();          lock_kernel();
209          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
210                   ret = ptrace_traceme();                   ret = ptrace_traceme();
211  --- linux-2.6.18-24.orig/arch/sparc/kernel/ptrace.c  --- linux-2.6.18-24etch2.orig/arch/sparc/kernel/ptrace.c
212  +++ linux-2.6.18-24/arch/sparc/kernel/ptrace.c  +++ linux-2.6.18-24etch2/arch/sparc/kernel/ptrace.c
213  @@ -23,6 +23,9 @@  @@ -23,6 +23,9 @@
214   #include <asm/pgtable.h>   #include <asm/pgtable.h>
215   #include <asm/system.h>   #include <asm/system.h>
# Line 233  Source code for this patch is "apt-get i Line 233  Source code for this patch is "apt-get i
233    
234          lock_kernel();          lock_kernel();
235   #ifdef DEBUG_PTRACE   #ifdef DEBUG_PTRACE
236  --- linux-2.6.18-24.orig/arch/sparc64/kernel/ptrace.c  --- linux-2.6.18-24etch2.orig/arch/sparc64/kernel/ptrace.c
237  +++ linux-2.6.18-24/arch/sparc64/kernel/ptrace.c  +++ linux-2.6.18-24etch2/arch/sparc64/kernel/ptrace.c
238  @@ -32,6 +32,9 @@  @@ -32,6 +32,9 @@
239   #include <asm/spitfire.h>   #include <asm/spitfire.h>
240   #include <asm/page.h>   #include <asm/page.h>
# Line 258  Source code for this patch is "apt-get i Line 258  Source code for this patch is "apt-get i
258    
259          if (test_thread_flag(TIF_32BIT)) {          if (test_thread_flag(TIF_32BIT)) {
260                  addr &= 0xffffffffUL;                  addr &= 0xffffffffUL;
261  --- linux-2.6.18-24.orig/arch/x86_64/ia32/ptrace32.c  --- linux-2.6.18-24etch2.orig/arch/x86_64/ia32/ptrace32.c
262  +++ linux-2.6.18-24/arch/x86_64/ia32/ptrace32.c  +++ linux-2.6.18-24etch2/arch/x86_64/ia32/ptrace32.c
263  @@ -26,6 +26,9 @@  @@ -26,6 +26,9 @@
264   #include <asm/i387.h>   #include <asm/i387.h>
265   #include <asm/fpu32.h>   #include <asm/fpu32.h>
# Line 281  Source code for this patch is "apt-get i Line 281  Source code for this patch is "apt-get i
281    
282          switch (request) {          switch (request) {
283          case PTRACE_TRACEME:          case PTRACE_TRACEME:
284  --- linux-2.6.18-24.orig/fs/Kconfig  --- linux-2.6.18-24etch2.orig/fs/Kconfig
285  +++ linux-2.6.18-24/fs/Kconfig  +++ linux-2.6.18-24etch2/fs/Kconfig
286  @@ -1931,5 +1931,7 @@ endmenu  @@ -1931,5 +1931,7 @@ endmenu
287    
288   source "fs/nls/Kconfig"   source "fs/nls/Kconfig"
# Line 291  Source code for this patch is "apt-get i Line 291  Source code for this patch is "apt-get i
291  +  +
292   endmenu   endmenu
293    
294  --- linux-2.6.18-24.orig/fs/Makefile  --- linux-2.6.18-24etch2.orig/fs/Makefile
295  +++ linux-2.6.18-24/fs/Makefile  +++ linux-2.6.18-24etch2/fs/Makefile
296  @@ -102,3 +102,5 @@ obj-$(CONFIG_HOSTFS)                += hostfs/  @@ -102,3 +102,5 @@ obj-$(CONFIG_HOSTFS)                += hostfs/
297   obj-$(CONFIG_HPPFS)            += hppfs/   obj-$(CONFIG_HPPFS)            += hppfs/
298   obj-$(CONFIG_DEBUG_FS)         += debugfs/   obj-$(CONFIG_DEBUG_FS)         += debugfs/
299   obj-$(CONFIG_OCFS2_FS)         += ocfs2/   obj-$(CONFIG_OCFS2_FS)         += ocfs2/
300  +  +
301  +include $(srctree)/fs/Makefile-2.6.ccs  +include $(srctree)/fs/Makefile-2.6.ccs
302  --- linux-2.6.18-24.orig/fs/attr.c  --- linux-2.6.18-24etch2.orig/fs/attr.c
303  +++ linux-2.6.18-24/fs/attr.c  +++ linux-2.6.18-24etch2/fs/attr.c
304  @@ -15,6 +15,9 @@  @@ -15,6 +15,9 @@
305   #include <linux/fcntl.h>   #include <linux/fcntl.h>
306   #include <linux/quotaops.h>   #include <linux/quotaops.h>
# Line 340  Source code for this patch is "apt-get i Line 340  Source code for this patch is "apt-get i
340                  if (!error) {                  if (!error) {
341                          if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||                          if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
342                              (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))                              (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))
343  --- linux-2.6.18-24.orig/fs/compat.c  --- linux-2.6.18-24etch2.orig/fs/compat.c
344  +++ linux-2.6.18-24/fs/compat.c  +++ linux-2.6.18-24etch2/fs/compat.c
345  @@ -52,6 +52,9 @@  @@ -52,6 +52,9 @@
346   #include <asm/uaccess.h>   #include <asm/uaccess.h>
347   #include <asm/mmu_context.h>   #include <asm/mmu_context.h>
# Line 385  Source code for this patch is "apt-get i Line 385  Source code for this patch is "apt-get i
385          if (retval >= 0) {          if (retval >= 0) {
386                  free_arg_pages(bprm);                  free_arg_pages(bprm);
387    
388  --- linux-2.6.18-24.orig/fs/exec.c  --- linux-2.6.18-24etch2.orig/fs/exec.c
389  +++ linux-2.6.18-24/fs/exec.c  +++ linux-2.6.18-24etch2/fs/exec.c
390  @@ -57,6 +57,10 @@  @@ -57,6 +57,10 @@
391   #include <linux/kmod.h>   #include <linux/kmod.h>
392   #endif   #endif
# Line 433  Source code for this patch is "apt-get i Line 433  Source code for this patch is "apt-get i
433          if (retval >= 0) {          if (retval >= 0) {
434                  free_arg_pages(bprm);                  free_arg_pages(bprm);
435    
436  --- linux-2.6.18-24.orig/fs/fcntl.c  --- linux-2.6.18-24etch2.orig/fs/fcntl.c
437  +++ linux-2.6.18-24/fs/fcntl.c  +++ linux-2.6.18-24etch2/fs/fcntl.c
438  @@ -22,6 +22,9 @@  @@ -22,6 +22,9 @@
439   #include <asm/poll.h>   #include <asm/poll.h>
440   #include <asm/siginfo.h>   #include <asm/siginfo.h>
# Line 458  Source code for this patch is "apt-get i Line 458  Source code for this patch is "apt-get i
458          /* O_NOATIME can only be set by the owner or superuser */          /* O_NOATIME can only be set by the owner or superuser */
459          if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))          if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))
460                  if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))                  if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
461  --- linux-2.6.18-24.orig/fs/ioctl.c  --- linux-2.6.18-24etch2.orig/fs/ioctl.c
462  +++ linux-2.6.18-24/fs/ioctl.c  +++ linux-2.6.18-24etch2/fs/ioctl.c
463  @@ -15,6 +15,9 @@  @@ -15,6 +15,9 @@
464    
465   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 492  Source code for this patch is "apt-get i Line 492  Source code for this patch is "apt-get i
492          if (error)          if (error)
493                  goto out_fput;                  goto out_fput;
494    
495  --- linux-2.6.18-24.orig/fs/namei.c  --- linux-2.6.18-24etch2.orig/fs/namei.c
496  +++ linux-2.6.18-24/fs/namei.c  +++ linux-2.6.18-24etch2/fs/namei.c
497  @@ -37,6 +37,10 @@  @@ -37,6 +37,10 @@
498    
499   #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])   #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])
# Line 631  Source code for this patch is "apt-get i Line 631  Source code for this patch is "apt-get i
631          error = vfs_rename(old_dir->d_inode, old_dentry,          error = vfs_rename(old_dir->d_inode, old_dentry,
632                                     new_dir->d_inode, new_dentry);                                     new_dir->d_inode, new_dentry);
633   exit5:   exit5:
634  --- linux-2.6.18-24.orig/fs/namespace.c  --- linux-2.6.18-24etch2.orig/fs/namespace.c
635  +++ linux-2.6.18-24/fs/namespace.c  +++ linux-2.6.18-24etch2/fs/namespace.c
636  @@ -25,6 +25,12 @@  @@ -25,6 +25,12 @@
637   #include <asm/uaccess.h>   #include <asm/uaccess.h>
638   #include <asm/unistd.h>   #include <asm/unistd.h>
# Line 746  Source code for this patch is "apt-get i Line 746  Source code for this patch is "apt-get i
746          if (error) {          if (error) {
747                  path_release(&old_nd);                  path_release(&old_nd);
748                  goto out1;                  goto out1;
749  --- linux-2.6.18-24.orig/fs/open.c  --- linux-2.6.18-24etch2.orig/fs/open.c
750  +++ linux-2.6.18-24/fs/open.c  +++ linux-2.6.18-24etch2/fs/open.c
751  @@ -30,6 +30,12 @@  @@ -30,6 +30,12 @@
752   #include <linux/audit.h>   #include <linux/audit.h>
753    
# Line 811  Source code for this patch is "apt-get i Line 811  Source code for this patch is "apt-get i
811          if (capable(CAP_SYS_TTY_CONFIG)) {          if (capable(CAP_SYS_TTY_CONFIG)) {
812                  tty_vhangup(current->signal->tty);                  tty_vhangup(current->signal->tty);
813                  return 0;                  return 0;
814  --- linux-2.6.18-24.orig/fs/proc/Makefile  --- linux-2.6.18-24etch2.orig/fs/proc/Makefile
815  +++ linux-2.6.18-24/fs/proc/Makefile  +++ linux-2.6.18-24etch2/fs/proc/Makefile
816  @@ -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
817   proc-$(CONFIG_PROC_KCORE)      += kcore.o   proc-$(CONFIG_PROC_KCORE)      += kcore.o
818   proc-$(CONFIG_PROC_VMCORE)     += vmcore.o   proc-$(CONFIG_PROC_VMCORE)     += vmcore.o
# Line 820  Source code for this patch is "apt-get i Line 820  Source code for this patch is "apt-get i
820  +  +
821  +proc-$(CONFIG_SAKURA) += ccs_proc.o  +proc-$(CONFIG_SAKURA) += ccs_proc.o
822  +proc-$(CONFIG_TOMOYO) += ccs_proc.o  +proc-$(CONFIG_TOMOYO) += ccs_proc.o
823  --- linux-2.6.18-24.orig/fs/proc/proc_misc.c  --- linux-2.6.18-24etch2.orig/fs/proc/proc_misc.c
824  +++ linux-2.6.18-24/fs/proc/proc_misc.c  +++ linux-2.6.18-24etch2/fs/proc/proc_misc.c
825  @@ -723,4 +723,9 @@ void __init proc_misc_init(void)  @@ -723,4 +723,9 @@ void __init proc_misc_init(void)
826          if (entry)          if (entry)
827                  entry->proc_fops = &proc_sysrq_trigger_operations;                  entry->proc_fops = &proc_sysrq_trigger_operations;
828   #endif   #endif
829  +       /***** CCS start. *****/  +       /***** CCS start. *****/
830  +#if defined(CONFIG_SAKURA) || defined(CONFIG_TOMOYO)  +#if defined(CONFIG_SAKURA) || defined(CONFIG_TOMOYO)
831  +       printk(KERN_INFO "Hook version: 2.6.18-24 2009/04/20\n");  +       printk(KERN_INFO "Hook version: 2.6.18-24etch2 2009/05/07\n");
832  +#endif  +#endif
833  +       /***** CCS end. *****/  +       /***** CCS end. *****/
834   }   }
835  --- linux-2.6.18-24.orig/include/linux/init_task.h  --- linux-2.6.18-24etch2.orig/include/linux/init_task.h
836  +++ linux-2.6.18-24/include/linux/init_task.h  +++ linux-2.6.18-24etch2/include/linux/init_task.h
837  @@ -128,6 +128,10 @@ extern struct group_info init_groups;  @@ -128,6 +128,10 @@ extern struct group_info init_groups;
838          .pi_lock        = SPIN_LOCK_UNLOCKED,                           \          .pi_lock        = SPIN_LOCK_UNLOCKED,                           \
839          INIT_TRACE_IRQFLAGS                                             \          INIT_TRACE_IRQFLAGS                                             \
# Line 845  Source code for this patch is "apt-get i Line 845  Source code for this patch is "apt-get i
845   }   }
846    
847    
848  --- linux-2.6.18-24.orig/include/linux/sched.h  --- linux-2.6.18-24etch2.orig/include/linux/sched.h
849  +++ linux-2.6.18-24/include/linux/sched.h  +++ linux-2.6.18-24etch2/include/linux/sched.h
850  @@ -25,6 +25,10 @@  @@ -25,6 +25,10 @@
851   #define CLONE_CHILD_SETTID     0x01000000      /* set the TID in the child */   #define CLONE_CHILD_SETTID     0x01000000      /* set the TID in the child */
852   #define CLONE_STOPPED          0x02000000      /* Start in stopped state */   #define CLONE_STOPPED          0x02000000      /* Start in stopped state */
# Line 869  Source code for this patch is "apt-get i Line 869  Source code for this patch is "apt-get i
869   };   };
870    
871   static inline pid_t process_group(struct task_struct *tsk)   static inline pid_t process_group(struct task_struct *tsk)
872  --- linux-2.6.18-24.orig/kernel/compat.c  --- linux-2.6.18-24etch2.orig/kernel/compat.c
873  +++ linux-2.6.18-24/kernel/compat.c  +++ linux-2.6.18-24etch2/kernel/compat.c
874  @@ -24,6 +24,9 @@  @@ -24,6 +24,9 @@
875   #include <linux/migrate.h>   #include <linux/migrate.h>
876    
# Line 892  Source code for this patch is "apt-get i Line 892  Source code for this patch is "apt-get i
892    
893          do_settimeofday(&tv);          do_settimeofday(&tv);
894          return 0;          return 0;
895  --- linux-2.6.18-24.orig/kernel/kexec.c  --- linux-2.6.18-24etch2.orig/kernel/kexec.c
896  +++ linux-2.6.18-24/kernel/kexec.c  +++ linux-2.6.18-24etch2/kernel/kexec.c
897  @@ -26,6 +26,9 @@  @@ -26,6 +26,9 @@
898   #include <asm/io.h>   #include <asm/io.h>
899   #include <asm/system.h>   #include <asm/system.h>
# Line 915  Source code for this patch is "apt-get i Line 915  Source code for this patch is "apt-get i
915    
916          /*          /*
917           * Verify we have a legal set of flags           * Verify we have a legal set of flags
918  --- linux-2.6.18-24.orig/kernel/kmod.c  --- linux-2.6.18-24etch2.orig/kernel/kmod.c
919  +++ linux-2.6.18-24/kernel/kmod.c  +++ linux-2.6.18-24etch2/kernel/kmod.c
920  @@ -148,6 +148,11 @@ static int ____call_usermodehelper(void  @@ -148,6 +148,11 @@ static int ____call_usermodehelper(void
921          /* We can run anywhere, unlike our parent keventd(). */          /* We can run anywhere, unlike our parent keventd(). */
922          set_cpus_allowed(current, CPU_MASK_ALL);          set_cpus_allowed(current, CPU_MASK_ALL);
# Line 929  Source code for this patch is "apt-get i Line 929  Source code for this patch is "apt-get i
929          retval = -EPERM;          retval = -EPERM;
930          if (current->fs->root)          if (current->fs->root)
931                  retval = execve(sub_info->path, sub_info->argv,sub_info->envp);                  retval = execve(sub_info->path, sub_info->argv,sub_info->envp);
932  --- linux-2.6.18-24.orig/kernel/module.c  --- linux-2.6.18-24etch2.orig/kernel/module.c
933  +++ linux-2.6.18-24/kernel/module.c  +++ linux-2.6.18-24etch2/kernel/module.c
934  @@ -44,6 +44,9 @@  @@ -44,6 +44,9 @@
935   #include <asm/semaphore.h>   #include <asm/semaphore.h>
936   #include <asm/cacheflush.h>   #include <asm/cacheflush.h>
# Line 965  Source code for this patch is "apt-get i Line 965  Source code for this patch is "apt-get i
965          /* Only one module load at a time, please */          /* Only one module load at a time, please */
966          if (mutex_lock_interruptible(&module_mutex) != 0)          if (mutex_lock_interruptible(&module_mutex) != 0)
967                  return -EINTR;                  return -EINTR;
968  --- linux-2.6.18-24.orig/kernel/ptrace.c  --- linux-2.6.18-24etch2.orig/kernel/ptrace.c
969  +++ linux-2.6.18-24/kernel/ptrace.c  +++ linux-2.6.18-24etch2/kernel/ptrace.c
970  @@ -21,6 +21,9 @@  @@ -21,6 +21,9 @@
971    
972   #include <asm/pgtable.h>   #include <asm/pgtable.h>
# Line 988  Source code for this patch is "apt-get i Line 988  Source code for this patch is "apt-get i
988          lock_kernel();          lock_kernel();
989          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
990                  ret = ptrace_traceme();                  ret = ptrace_traceme();
991  --- linux-2.6.18-24.orig/kernel/sched.c  --- linux-2.6.18-24etch2.orig/kernel/sched.c
992  +++ linux-2.6.18-24/kernel/sched.c  +++ linux-2.6.18-24etch2/kernel/sched.c
993  @@ -55,6 +55,9 @@  @@ -55,6 +55,9 @@
994   #include <asm/tlb.h>   #include <asm/tlb.h>
995    
# Line 1011  Source code for this patch is "apt-get i Line 1011  Source code for this patch is "apt-get i
1011    
1012          /*          /*
1013           * Setpriority might change our priority at the same moment.           * Setpriority might change our priority at the same moment.
1014  --- linux-2.6.18-24.orig/kernel/signal.c  --- linux-2.6.18-24etch2.orig/kernel/signal.c
1015  +++ linux-2.6.18-24/kernel/signal.c  +++ linux-2.6.18-24etch2/kernel/signal.c
1016  @@ -28,6 +28,9 @@  @@ -28,6 +28,9 @@
1017   #include <asm/unistd.h>   #include <asm/unistd.h>
1018   #include <asm/siginfo.h>   #include <asm/siginfo.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          return do_tkill(0, pid, sig);          return do_tkill(0, pid, sig);
1064   }   }
1065  --- linux-2.6.18-24.orig/kernel/sys.c  --- linux-2.6.18-24etch2.orig/kernel/sys.c
1066  +++ linux-2.6.18-24/kernel/sys.c  +++ linux-2.6.18-24etch2/kernel/sys.c
1067  @@ -36,6 +36,9 @@  @@ -36,6 +36,9 @@
1068   #include <asm/uaccess.h>   #include <asm/uaccess.h>
1069   #include <asm/io.h>   #include <asm/io.h>
# Line 1120  Source code for this patch is "apt-get i Line 1120  Source code for this patch is "apt-get i
1120    
1121          down_write(&uts_sem);          down_write(&uts_sem);
1122          errno = -EFAULT;          errno = -EFAULT;
1123  --- linux-2.6.18-24.orig/kernel/sysctl.c  --- linux-2.6.18-24etch2.orig/kernel/sysctl.c
1124  +++ linux-2.6.18-24/kernel/sysctl.c  +++ linux-2.6.18-24etch2/kernel/sysctl.c
1125  @@ -48,6 +48,9 @@  @@ -48,6 +48,9 @@
1126    
1127   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 1160  Source code for this patch is "apt-get i Line 1160  Source code for this patch is "apt-get i
1160                                          error = table->strategy(                                          error = table->strategy(
1161                                                  table, name, nlen,                                                  table, name, nlen,
1162                                                  oldval, oldlenp,                                                  oldval, oldlenp,
1163  --- linux-2.6.18-24.orig/kernel/time.c  --- linux-2.6.18-24etch2.orig/kernel/time.c
1164  +++ linux-2.6.18-24/kernel/time.c  +++ linux-2.6.18-24etch2/kernel/time.c
1165  @@ -39,6 +39,9 @@  @@ -39,6 +39,9 @@
1166    
1167   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 1205  Source code for this patch is "apt-get i Line 1205  Source code for this patch is "apt-get i
1205                                    
1206          /* Now we validate the data before disabling interrupts */          /* Now we validate the data before disabling interrupts */
1207    
1208  --- linux-2.6.18-24.orig/net/ipv4/inet_connection_sock.c  --- linux-2.6.18-24etch2.orig/net/ipv4/inet_connection_sock.c
1209  +++ linux-2.6.18-24/net/ipv4/inet_connection_sock.c  +++ linux-2.6.18-24etch2/net/ipv4/inet_connection_sock.c
1210  @@ -23,6 +23,9 @@  @@ -23,6 +23,9 @@
1211   #include <net/route.h>   #include <net/route.h>
1212   #include <net/tcp_states.h>   #include <net/tcp_states.h>
# Line 1228  Source code for this patch is "apt-get i Line 1228  Source code for this patch is "apt-get i
1228                          inet_bind_bucket_for_each(tb, node, &head->chain)                          inet_bind_bucket_for_each(tb, node, &head->chain)
1229                                  if (tb->port == rover)                                  if (tb->port == rover)
1230                                          goto next;                                          goto next;
1231  --- linux-2.6.18-24.orig/net/ipv4/inet_hashtables.c  --- linux-2.6.18-24etch2.orig/net/ipv4/inet_hashtables.c
1232  +++ linux-2.6.18-24/net/ipv4/inet_hashtables.c  +++ linux-2.6.18-24etch2/net/ipv4/inet_hashtables.c
1233  @@ -22,6 +22,9 @@  @@ -22,6 +22,9 @@
1234   #include <net/inet_connection_sock.h>   #include <net/inet_connection_sock.h>
1235   #include <net/inet_hashtables.h>   #include <net/inet_hashtables.h>
# Line 1251  Source code for this patch is "apt-get i Line 1251  Source code for this patch is "apt-get i
1251                          head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];                          head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];
1252                          spin_lock(&head->lock);                          spin_lock(&head->lock);
1253    
1254  --- linux-2.6.18-24.orig/net/ipv4/raw.c  --- linux-2.6.18-24etch2.orig/net/ipv4/raw.c
1255  +++ linux-2.6.18-24/net/ipv4/raw.c  +++ linux-2.6.18-24etch2/net/ipv4/raw.c
1256  @@ -79,6 +79,9 @@  @@ -79,6 +79,9 @@
1257   #include <linux/seq_file.h>   #include <linux/seq_file.h>
1258   #include <linux/netfilter.h>   #include <linux/netfilter.h>
# Line 1275  Source code for this patch is "apt-get i Line 1275  Source code for this patch is "apt-get i
1275    
1276          copied = skb->len;          copied = skb->len;
1277          if (len < copied) {          if (len < copied) {
1278  --- linux-2.6.18-24.orig/net/ipv4/udp.c  --- linux-2.6.18-24etch2.orig/net/ipv4/udp.c
1279  +++ linux-2.6.18-24/net/ipv4/udp.c  +++ linux-2.6.18-24etch2/net/ipv4/udp.c
1280  @@ -108,6 +108,12 @@  @@ -108,6 +108,12 @@
1281   #include <net/inet_common.h>   #include <net/inet_common.h>
1282   #include <net/checksum.h>   #include <net/checksum.h>
# Line 1326  Source code for this patch is "apt-get i Line 1326  Source code for this patch is "apt-get i
1326          copied = skb->len - sizeof(struct udphdr);          copied = skb->len - sizeof(struct udphdr);
1327          if (copied > len) {          if (copied > len) {
1328                  copied = len;                  copied = len;
1329  --- linux-2.6.18-24.orig/net/ipv6/inet6_hashtables.c  --- linux-2.6.18-24etch2.orig/net/ipv6/inet6_hashtables.c
1330  +++ linux-2.6.18-24/net/ipv6/inet6_hashtables.c  +++ linux-2.6.18-24etch2/net/ipv6/inet6_hashtables.c
1331  @@ -21,6 +21,9 @@  @@ -21,6 +21,9 @@
1332   #include <net/inet_hashtables.h>   #include <net/inet_hashtables.h>
1333   #include <net/inet6_hashtables.h>   #include <net/inet6_hashtables.h>
# Line 1358  Source code for this patch is "apt-get i Line 1358  Source code for this patch is "apt-get i
1358                          head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];                          head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];
1359                          spin_lock(&head->lock);                          spin_lock(&head->lock);
1360    
1361  --- linux-2.6.18-24.orig/net/ipv6/raw.c  --- linux-2.6.18-24etch2.orig/net/ipv6/raw.c
1362  +++ linux-2.6.18-24/net/ipv6/raw.c  +++ linux-2.6.18-24etch2/net/ipv6/raw.c
1363  @@ -56,6 +56,9 @@  @@ -56,6 +56,9 @@
1364    
1365   #include <linux/proc_fs.h>   #include <linux/proc_fs.h>
# Line 1382  Source code for this patch is "apt-get i Line 1382  Source code for this patch is "apt-get i
1382    
1383          copied = skb->len;          copied = skb->len;
1384          if (copied > len) {          if (copied > len) {
1385  --- linux-2.6.18-24.orig/net/ipv6/udp.c  --- linux-2.6.18-24etch2.orig/net/ipv6/udp.c
1386  +++ linux-2.6.18-24/net/ipv6/udp.c  +++ linux-2.6.18-24etch2/net/ipv6/udp.c
1387  @@ -58,6 +58,12 @@  @@ -58,6 +58,12 @@
1388    
1389   #include <linux/proc_fs.h>   #include <linux/proc_fs.h>
# Line 1431  Source code for this patch is "apt-get i Line 1431  Source code for this patch is "apt-get i
1431    
1432          copied = skb->len - sizeof(struct udphdr);          copied = skb->len - sizeof(struct udphdr);
1433          if (copied > len) {          if (copied > len) {
1434  --- linux-2.6.18-24.orig/net/socket.c  --- linux-2.6.18-24etch2.orig/net/socket.c
1435  +++ linux-2.6.18-24/net/socket.c  +++ linux-2.6.18-24etch2/net/socket.c
1436  @@ -94,6 +94,11 @@  @@ -94,6 +94,11 @@
1437   #include <net/sock.h>   #include <net/sock.h>
1438   #include <linux/netfilter.h>   #include <linux/netfilter.h>
# Line 1525  Source code for this patch is "apt-get i Line 1525  Source code for this patch is "apt-get i
1525          err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen,          err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen,
1526                                   sock->file->f_flags);                                   sock->file->f_flags);
1527   out_put:   out_put:
1528  --- linux-2.6.18-24.orig/net/unix/af_unix.c  --- linux-2.6.18-24etch2.orig/net/unix/af_unix.c
1529  +++ linux-2.6.18-24/net/unix/af_unix.c  +++ linux-2.6.18-24etch2/net/unix/af_unix.c
1530  @@ -116,6 +116,9 @@  @@ -116,6 +116,9 @@
1531   #include <linux/mount.h>   #include <linux/mount.h>
1532   #include <net/checksum.h>   #include <net/checksum.h>
Legend:
Removed from v.2459  
changed lines
  Added in v.2513
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
サイト情報
ソフトウェアを探す
ソフトウェアを作る
コミュニティ
ヘルプ