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

TOMOYO

Subversion リポジトリの参照

/[tomoyo]/trunk/1.8.x/ccs-patch/patches/ccs-patch-2.4.37.diff

Diff of /trunk/1.8.x/ccs-patch/patches/ccs-patch-2.4.37.diff

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

revision 3027 by kumaneko, Thu Sep 10 05:40:52 2009 UTC revision 3028 by kumaneko, Sun Sep 13 10:54:18 2009 UTC
# Line 1  Line 1 
1  This is TOMOYO Linux patch for kernel 2.4.37.5.  This is TOMOYO Linux patch for kernel 2.4.37.6.
2    
3  Source code for this patch is http://www.kernel.org/pub/linux/kernel/v2.4/linux-2.4.37.5.tar.bz2  Source code for this patch is http://www.kernel.org/pub/linux/kernel/v2.4/linux-2.4.37.6.tar.bz2
4  ---  ---
5   arch/alpha/kernel/ptrace.c   |    3 +++   arch/alpha/kernel/ptrace.c   |    3 +++
6   arch/arm/kernel/ptrace.c     |    3 +++   arch/arm/kernel/ptrace.c     |    3 +++
# Line 51  Source code for this patch is http://www Line 51  Source code for this patch is http://www
51   net/unix/af_unix.c           |    4 ++++   net/unix/af_unix.c           |    4 ++++
52   47 files changed, 325 insertions(+), 5 deletions(-)   47 files changed, 325 insertions(+), 5 deletions(-)
53    
54  --- linux-2.4.37.5.orig/arch/alpha/kernel/ptrace.c  --- linux-2.4.37.6.orig/arch/alpha/kernel/ptrace.c
55  +++ linux-2.4.37.5/arch/alpha/kernel/ptrace.c  +++ linux-2.4.37.6/arch/alpha/kernel/ptrace.c
56  @@ -18,6 +18,7 @@  @@ -18,6 +18,7 @@
57   #include <asm/pgtable.h>   #include <asm/pgtable.h>
58   #include <asm/system.h>   #include <asm/system.h>
# Line 70  Source code for this patch is http://www Line 70  Source code for this patch is http://www
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.4.37.5.orig/arch/arm/kernel/ptrace.c  --- linux-2.4.37.6.orig/arch/arm/kernel/ptrace.c
74  +++ linux-2.4.37.5/arch/arm/kernel/ptrace.c  +++ linux-2.4.37.6/arch/arm/kernel/ptrace.c
75  @@ -22,6 +22,7 @@  @@ -22,6 +22,7 @@
76   #include <asm/uaccess.h>   #include <asm/uaccess.h>
77   #include <asm/pgtable.h>   #include <asm/pgtable.h>
# Line 89  Source code for this patch is http://www Line 89  Source code for this patch is http://www
89    
90          lock_kernel();          lock_kernel();
91          ret = -EPERM;          ret = -EPERM;
92  --- linux-2.4.37.5.orig/arch/cris/kernel/ptrace.c  --- linux-2.4.37.6.orig/arch/cris/kernel/ptrace.c
93  +++ linux-2.4.37.5/arch/cris/kernel/ptrace.c  +++ linux-2.4.37.6/arch/cris/kernel/ptrace.c
94  @@ -48,6 +48,7 @@  @@ -48,6 +48,7 @@
95   #include <asm/pgtable.h>   #include <asm/pgtable.h>
96   #include <asm/system.h>   #include <asm/system.h>
# Line 108  Source code for this patch is http://www Line 108  Source code for this patch is http://www
108    
109          lock_kernel();          lock_kernel();
110          ret = -EPERM;          ret = -EPERM;
111  --- linux-2.4.37.5.orig/arch/i386/kernel/ptrace.c  --- linux-2.4.37.6.orig/arch/i386/kernel/ptrace.c
112  +++ linux-2.4.37.5/arch/i386/kernel/ptrace.c  +++ linux-2.4.37.6/arch/i386/kernel/ptrace.c
113  @@ -20,6 +20,7 @@  @@ -20,6 +20,7 @@
114   #include <asm/processor.h>   #include <asm/processor.h>
115   #include <asm/i387.h>   #include <asm/i387.h>
# Line 127  Source code for this patch is http://www Line 127  Source code for this patch is http://www
127    
128          lock_kernel();          lock_kernel();
129          ret = -EPERM;          ret = -EPERM;
130  --- linux-2.4.37.5.orig/arch/ia64/ia32/sys_ia32.c  --- linux-2.4.37.6.orig/arch/ia64/ia32/sys_ia32.c
131  +++ linux-2.4.37.5/arch/ia64/ia32/sys_ia32.c  +++ linux-2.4.37.6/arch/ia64/ia32/sys_ia32.c
132  @@ -57,6 +57,7 @@  @@ -57,6 +57,7 @@
133   #include <net/scm.h>   #include <net/scm.h>
134   #include <net/sock.h>   #include <net/sock.h>
# Line 146  Source code for this patch is http://www Line 146  Source code for this patch is http://www
146    
147          lock_kernel();          lock_kernel();
148          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
149  --- linux-2.4.37.5.orig/arch/ia64/kernel/ptrace.c  --- linux-2.4.37.6.orig/arch/ia64/kernel/ptrace.c
150  +++ linux-2.4.37.5/arch/ia64/kernel/ptrace.c  +++ linux-2.4.37.6/arch/ia64/kernel/ptrace.c
151  @@ -27,6 +27,7 @@  @@ -27,6 +27,7 @@
152   #ifdef CONFIG_PERFMON   #ifdef CONFIG_PERFMON
153   #include <asm/perfmon.h>   #include <asm/perfmon.h>
# Line 165  Source code for this patch is http://www Line 165  Source code for this patch is http://www
165    
166          lock_kernel();          lock_kernel();
167          ret = -EPERM;          ret = -EPERM;
168  --- linux-2.4.37.5.orig/arch/m68k/kernel/ptrace.c  --- linux-2.4.37.6.orig/arch/m68k/kernel/ptrace.c
169  +++ linux-2.4.37.5/arch/m68k/kernel/ptrace.c  +++ linux-2.4.37.6/arch/m68k/kernel/ptrace.c
170  @@ -25,6 +25,7 @@  @@ -25,6 +25,7 @@
171   #include <asm/pgtable.h>   #include <asm/pgtable.h>
172   #include <asm/system.h>   #include <asm/system.h>
# Line 184  Source code for this patch is http://www Line 184  Source code for this patch is http://www
184    
185          lock_kernel();          lock_kernel();
186          ret = -EPERM;          ret = -EPERM;
187  --- linux-2.4.37.5.orig/arch/mips/kernel/ptrace.c  --- linux-2.4.37.6.orig/arch/mips/kernel/ptrace.c
188  +++ linux-2.4.37.5/arch/mips/kernel/ptrace.c  +++ linux-2.4.37.6/arch/mips/kernel/ptrace.c
189  @@ -28,6 +28,7 @@  @@ -28,6 +28,7 @@
190   #include <asm/bootinfo.h>   #include <asm/bootinfo.h>
191   #include <asm/cpu.h>   #include <asm/cpu.h>
# Line 203  Source code for this patch is http://www Line 203  Source code for this patch is http://www
203    
204          lock_kernel();          lock_kernel();
205   #if 0   #if 0
206  --- linux-2.4.37.5.orig/arch/mips64/kernel/ptrace.c  --- linux-2.4.37.6.orig/arch/mips64/kernel/ptrace.c
207  +++ linux-2.4.37.5/arch/mips64/kernel/ptrace.c  +++ linux-2.4.37.6/arch/mips64/kernel/ptrace.c
208  @@ -30,6 +30,7 @@  @@ -30,6 +30,7 @@
209   #include <asm/system.h>   #include <asm/system.h>
210   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 231  Source code for this patch is http://www Line 231  Source code for this patch is http://www
231    
232          lock_kernel();          lock_kernel();
233   #if 0   #if 0
234  --- linux-2.4.37.5.orig/arch/parisc/kernel/ptrace.c  --- linux-2.4.37.6.orig/arch/parisc/kernel/ptrace.c
235  +++ linux-2.4.37.5/arch/parisc/kernel/ptrace.c  +++ linux-2.4.37.6/arch/parisc/kernel/ptrace.c
236  @@ -21,6 +21,7 @@  @@ -21,6 +21,7 @@
237   #include <asm/system.h>   #include <asm/system.h>
238   #include <asm/processor.h>   #include <asm/processor.h>
# Line 250  Source code for this patch is http://www Line 250  Source code for this patch is http://www
250    
251          lock_kernel();          lock_kernel();
252          ret = -EPERM;          ret = -EPERM;
253  --- linux-2.4.37.5.orig/arch/ppc/kernel/ptrace.c  --- linux-2.4.37.6.orig/arch/ppc/kernel/ptrace.c
254  +++ linux-2.4.37.5/arch/ppc/kernel/ptrace.c  +++ linux-2.4.37.6/arch/ppc/kernel/ptrace.c
255  @@ -29,6 +29,7 @@  @@ -29,6 +29,7 @@
256   #include <asm/page.h>   #include <asm/page.h>
257   #include <asm/pgtable.h>   #include <asm/pgtable.h>
# Line 269  Source code for this patch is http://www Line 269  Source code for this patch is http://www
269    
270          lock_kernel();          lock_kernel();
271          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
272  --- linux-2.4.37.5.orig/arch/ppc64/kernel/ptrace.c  --- linux-2.4.37.6.orig/arch/ppc64/kernel/ptrace.c
273  +++ linux-2.4.37.5/arch/ppc64/kernel/ptrace.c  +++ linux-2.4.37.6/arch/ppc64/kernel/ptrace.c
274  @@ -30,6 +30,7 @@  @@ -30,6 +30,7 @@
275   #include <asm/page.h>   #include <asm/page.h>
276   #include <asm/pgtable.h>   #include <asm/pgtable.h>
# Line 288  Source code for this patch is http://www Line 288  Source code for this patch is http://www
288    
289          lock_kernel();          lock_kernel();
290          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
291  --- linux-2.4.37.5.orig/arch/ppc64/kernel/ptrace32.c  --- linux-2.4.37.6.orig/arch/ppc64/kernel/ptrace32.c
292  +++ linux-2.4.37.5/arch/ppc64/kernel/ptrace32.c  +++ linux-2.4.37.6/arch/ppc64/kernel/ptrace32.c
293  @@ -30,6 +30,7 @@  @@ -30,6 +30,7 @@
294   #include <asm/page.h>   #include <asm/page.h>
295   #include <asm/pgtable.h>   #include <asm/pgtable.h>
# Line 307  Source code for this patch is http://www Line 307  Source code for this patch is http://www
307    
308          lock_kernel();          lock_kernel();
309          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
310  --- linux-2.4.37.5.orig/arch/s390/kernel/ptrace.c  --- linux-2.4.37.6.orig/arch/s390/kernel/ptrace.c
311  +++ linux-2.4.37.5/arch/s390/kernel/ptrace.c  +++ linux-2.4.37.6/arch/s390/kernel/ptrace.c
312  @@ -37,6 +37,7 @@  @@ -37,6 +37,7 @@
313   #include <asm/pgalloc.h>   #include <asm/pgalloc.h>
314   #include <asm/system.h>   #include <asm/system.h>
# Line 326  Source code for this patch is http://www Line 326  Source code for this patch is http://www
326    
327          lock_kernel();          lock_kernel();
328          if (request == PTRACE_TRACEME)          if (request == PTRACE_TRACEME)
329  --- linux-2.4.37.5.orig/arch/s390x/kernel/ptrace.c  --- linux-2.4.37.6.orig/arch/s390x/kernel/ptrace.c
330  +++ linux-2.4.37.5/arch/s390x/kernel/ptrace.c  +++ linux-2.4.37.6/arch/s390x/kernel/ptrace.c
331  @@ -43,6 +43,7 @@  @@ -43,6 +43,7 @@
332   #else   #else
333   #define parent_31bit 0   #define parent_31bit 0
# Line 345  Source code for this patch is http://www Line 345  Source code for this patch is http://www
345          lock_kernel();          lock_kernel();
346          if (request == PTRACE_TRACEME)          if (request == PTRACE_TRACEME)
347          {          {
348  --- linux-2.4.37.5.orig/arch/sh/kernel/ptrace.c  --- linux-2.4.37.6.orig/arch/sh/kernel/ptrace.c
349  +++ linux-2.4.37.5/arch/sh/kernel/ptrace.c  +++ linux-2.4.37.6/arch/sh/kernel/ptrace.c
350  @@ -26,6 +26,7 @@  @@ -26,6 +26,7 @@
351   #include <asm/system.h>   #include <asm/system.h>
352   #include <asm/processor.h>   #include <asm/processor.h>
# Line 364  Source code for this patch is http://www Line 364  Source code for this patch is http://www
364    
365          lock_kernel();          lock_kernel();
366          ret = -EPERM;          ret = -EPERM;
367  --- linux-2.4.37.5.orig/arch/sh64/kernel/ptrace.c  --- linux-2.4.37.6.orig/arch/sh64/kernel/ptrace.c
368  +++ linux-2.4.37.5/arch/sh64/kernel/ptrace.c  +++ linux-2.4.37.6/arch/sh64/kernel/ptrace.c
369  @@ -32,6 +32,7 @@  @@ -32,6 +32,7 @@
370   #include <asm/system.h>   #include <asm/system.h>
371   #include <asm/processor.h>   #include <asm/processor.h>
# Line 383  Source code for this patch is http://www Line 383  Source code for this patch is http://www
383    
384          lock_kernel();          lock_kernel();
385          ret = -EPERM;          ret = -EPERM;
386  --- linux-2.4.37.5.orig/arch/sparc/kernel/ptrace.c  --- linux-2.4.37.6.orig/arch/sparc/kernel/ptrace.c
387  +++ linux-2.4.37.5/arch/sparc/kernel/ptrace.c  +++ linux-2.4.37.6/arch/sparc/kernel/ptrace.c
388  @@ -21,6 +21,7 @@  @@ -21,6 +21,7 @@
389   #include <asm/pgtable.h>   #include <asm/pgtable.h>
390   #include <asm/system.h>   #include <asm/system.h>
# Line 404  Source code for this patch is http://www Line 404  Source code for this patch is http://www
404    
405          lock_kernel();          lock_kernel();
406   #ifdef DEBUG_PTRACE   #ifdef DEBUG_PTRACE
407  --- linux-2.4.37.5.orig/arch/sparc64/kernel/ptrace.c  --- linux-2.4.37.6.orig/arch/sparc64/kernel/ptrace.c
408  +++ linux-2.4.37.5/arch/sparc64/kernel/ptrace.c  +++ linux-2.4.37.6/arch/sparc64/kernel/ptrace.c
409  @@ -26,6 +26,7 @@  @@ -26,6 +26,7 @@
410   #include <asm/psrcompat.h>   #include <asm/psrcompat.h>
411   #include <asm/visasm.h>   #include <asm/visasm.h>
# Line 425  Source code for this patch is http://www Line 425  Source code for this patch is http://www
425    
426          if (current->thread.flags & SPARC_FLAG_32BIT) {          if (current->thread.flags & SPARC_FLAG_32BIT) {
427                  addr &= 0xffffffffUL;                  addr &= 0xffffffffUL;
428  --- linux-2.4.37.5.orig/arch/x86_64/ia32/ptrace32.c  --- linux-2.4.37.6.orig/arch/x86_64/ia32/ptrace32.c
429  +++ linux-2.4.37.5/arch/x86_64/ia32/ptrace32.c  +++ linux-2.4.37.6/arch/x86_64/ia32/ptrace32.c
430  @@ -24,6 +24,7 @@  @@ -24,6 +24,7 @@
431   #include <asm/i387.h>   #include <asm/i387.h>
432   #include <asm/fpu32.h>   #include <asm/fpu32.h>
# Line 444  Source code for this patch is http://www Line 444  Source code for this patch is http://www
444    
445          switch (request) {          switch (request) {
446          case PTRACE_TRACEME:          case PTRACE_TRACEME:
447  --- linux-2.4.37.5.orig/arch/x86_64/kernel/ptrace.c  --- linux-2.4.37.6.orig/arch/x86_64/kernel/ptrace.c
448  +++ linux-2.4.37.5/arch/x86_64/kernel/ptrace.c  +++ linux-2.4.37.6/arch/x86_64/kernel/ptrace.c
449  @@ -22,6 +22,7 @@  @@ -22,6 +22,7 @@
450   #include <asm/processor.h>   #include <asm/processor.h>
451   #include <asm/i387.h>   #include <asm/i387.h>
# Line 463  Source code for this patch is http://www Line 463  Source code for this patch is http://www
463    
464          /* This lock_kernel fixes a subtle race with suid exec */          /* This lock_kernel fixes a subtle race with suid exec */
465          lock_kernel();          lock_kernel();
466  --- linux-2.4.37.5.orig/fs/Config.in  --- linux-2.4.37.6.orig/fs/Config.in
467  +++ linux-2.4.37.5/fs/Config.in  +++ linux-2.4.37.6/fs/Config.in
468  @@ -176,4 +176,7 @@ comment 'Partition Types'  @@ -176,4 +176,7 @@ comment 'Partition Types'
469   source fs/partitions/Config.in   source fs/partitions/Config.in
470   endmenu   endmenu
# Line 473  Source code for this patch is http://www Line 473  Source code for this patch is http://www
473   endmenu   endmenu
474  +  +
475  +source security/ccsecurity/Config.in  +source security/ccsecurity/Config.in
476  --- linux-2.4.37.5.orig/fs/Makefile  --- linux-2.4.37.6.orig/fs/Makefile
477  +++ linux-2.4.37.5/fs/Makefile  +++ linux-2.4.37.6/fs/Makefile
478  @@ -80,5 +80,7 @@ obj-$(CONFIG_BINFMT_ELF)      += binfmt_elf.o  @@ -80,5 +80,7 @@ obj-$(CONFIG_BINFMT_ELF)      += binfmt_elf.o
479   # persistent filesystems   # persistent filesystems
480   obj-y += $(join $(subdir-y),$(subdir-y:%=/%.o))   obj-y += $(join $(subdir-y),$(subdir-y:%=/%.o))
# Line 483  Source code for this patch is http://www Line 483  Source code for this patch is http://www
483  +obj-$(CONFIG_CCSECURITY)       += ../security/ccsecurity/ccsecurity.o  +obj-$(CONFIG_CCSECURITY)       += ../security/ccsecurity/ccsecurity.o
484    
485   include $(TOPDIR)/Rules.make   include $(TOPDIR)/Rules.make
486  --- linux-2.4.37.5.orig/fs/attr.c  --- linux-2.4.37.6.orig/fs/attr.c
487  +++ linux-2.4.37.5/fs/attr.c  +++ linux-2.4.37.6/fs/attr.c
488  @@ -12,6 +12,7 @@  @@ -12,6 +12,7 @@
489   #include <linux/dnotify.h>   #include <linux/dnotify.h>
490   #include <linux/fcntl.h>   #include <linux/fcntl.h>
# Line 503  Source code for this patch is http://www Line 503  Source code for this patch is http://www
503    
504          lock_kernel();          lock_kernel();
505          if (inode->i_op && inode->i_op->setattr)          if (inode->i_op && inode->i_op->setattr)
506  --- linux-2.4.37.5.orig/fs/exec.c  --- linux-2.4.37.6.orig/fs/exec.c
507  +++ linux-2.4.37.5/fs/exec.c  +++ linux-2.4.37.6/fs/exec.c
508  @@ -48,6 +48,8 @@  @@ -48,6 +48,8 @@
509   #include <linux/kmod.h>   #include <linux/kmod.h>
510   #endif   #endif
# Line 545  Source code for this patch is http://www Line 545  Source code for this patch is http://www
545          if (retval >= 0)          if (retval >= 0)
546                  /* execve success */                  /* execve success */
547                  return retval;                  return retval;
548  --- linux-2.4.37.5.orig/fs/fcntl.c  --- linux-2.4.37.6.orig/fs/fcntl.c
549  +++ linux-2.4.37.5/fs/fcntl.c  +++ linux-2.4.37.6/fs/fcntl.c
550  @@ -16,6 +16,7 @@  @@ -16,6 +16,7 @@
551   #include <asm/poll.h>   #include <asm/poll.h>
552   #include <asm/siginfo.h>   #include <asm/siginfo.h>
# Line 565  Source code for this patch is http://www Line 565  Source code for this patch is http://www
565          /* Did FASYNC state change? */          /* Did FASYNC state change? */
566          if ((arg ^ filp->f_flags) & FASYNC) {          if ((arg ^ filp->f_flags) & FASYNC) {
567                  if (filp->f_op && filp->f_op->fasync) {                  if (filp->f_op && filp->f_op->fasync) {
568  --- linux-2.4.37.5.orig/fs/ioctl.c  --- linux-2.4.37.6.orig/fs/ioctl.c
569  +++ linux-2.4.37.5/fs/ioctl.c  +++ linux-2.4.37.6/fs/ioctl.c
570  @@ -10,6 +10,7 @@  @@ -10,6 +10,7 @@
571    
572   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 598  Source code for this patch is http://www Line 598  Source code for this patch is http://www
598                          error = -ENOTTY;                          error = -ENOTTY;
599                          if (S_ISREG(filp->f_dentry->d_inode->i_mode))                          if (S_ISREG(filp->f_dentry->d_inode->i_mode))
600                                  error = file_ioctl(filp, cmd, arg);                                  error = file_ioctl(filp, cmd, arg);
601  --- linux-2.4.37.5.orig/fs/namei.c  --- linux-2.4.37.6.orig/fs/namei.c
602  +++ linux-2.4.37.5/fs/namei.c  +++ linux-2.4.37.6/fs/namei.c
603  @@ -28,6 +28,9 @@  @@ -28,6 +28,9 @@
604    
605   #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])   #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])
# Line 737  Source code for this patch is http://www Line 737  Source code for this patch is http://www
737          dput(new_dentry);          dput(new_dentry);
738   exit4:   exit4:
739          dput(old_dentry);          dput(old_dentry);
740  --- linux-2.4.37.5.orig/fs/namespace.c  --- linux-2.4.37.6.orig/fs/namespace.c
741  +++ linux-2.4.37.5/fs/namespace.c  +++ linux-2.4.37.6/fs/namespace.c
742  @@ -21,6 +21,8 @@  @@ -21,6 +21,8 @@
743   #include <linux/seq_file.h>   #include <linux/seq_file.h>
744   #include <linux/namespace.h>   #include <linux/namespace.h>
# Line 839  Source code for this patch is http://www Line 839  Source code for this patch is http://www
839          read_lock(&current->fs->lock);          read_lock(&current->fs->lock);
840          user_nd.mnt = mntget(current->fs->rootmnt);          user_nd.mnt = mntget(current->fs->rootmnt);
841          user_nd.dentry = dget(current->fs->root);          user_nd.dentry = dget(current->fs->root);
842  --- linux-2.4.37.5.orig/fs/open.c  --- linux-2.4.37.6.orig/fs/open.c
843  +++ linux-2.4.37.5/fs/open.c  +++ linux-2.4.37.6/fs/open.c
844  @@ -20,6 +20,8 @@  @@ -20,6 +20,8 @@
845    
846   #define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m))   #define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m))
# Line 948  Source code for this patch is http://www Line 948  Source code for this patch is http://www
948          if (capable(CAP_SYS_TTY_CONFIG)) {          if (capable(CAP_SYS_TTY_CONFIG)) {
949                  tty_vhangup(current->tty);                  tty_vhangup(current->tty);
950                  return 0;                  return 0;
951  --- linux-2.4.37.5.orig/fs/proc/proc_misc.c  --- linux-2.4.37.6.orig/fs/proc/proc_misc.c
952  +++ linux-2.4.37.5/fs/proc/proc_misc.c  +++ linux-2.4.37.6/fs/proc/proc_misc.c
953  @@ -670,4 +670,5 @@ void __init proc_misc_init(void)  @@ -670,4 +670,5 @@ void __init proc_misc_init(void)
954                          entry->proc_fops = &ppc_htab_operations;                          entry->proc_fops = &ppc_htab_operations;
955          }          }
956   #endif   #endif
957  +       printk(KERN_INFO "Hook version: 2.4.37.5 2009/09/10\n");  +       printk(KERN_INFO "Hook version: 2.4.37.6 2009/09/13\n");
958   }   }
959  --- linux-2.4.37.5.orig/include/linux/sched.h  --- linux-2.4.37.6.orig/include/linux/sched.h
960  +++ linux-2.4.37.5/include/linux/sched.h  +++ linux-2.4.37.6/include/linux/sched.h
961  @@ -29,6 +29,15 @@ extern unsigned long event;  @@ -29,6 +29,15 @@ extern unsigned long event;
962    
963   struct exec_domain;   struct exec_domain;
# Line 993  Source code for this patch is http://www Line 993  Source code for this patch is http://www
993   }   }
994    
995    
996  --- linux-2.4.37.5.orig/kernel/kmod.c  --- linux-2.4.37.6.orig/kernel/kmod.c
997  +++ linux-2.4.37.5/kernel/kmod.c  +++ linux-2.4.37.6/kernel/kmod.c
998  @@ -134,6 +134,11 @@ int exec_usermodehelper(char *program_pa  @@ -134,6 +134,11 @@ int exec_usermodehelper(char *program_pa
999          /* Allow execve args to be in kernel space. */          /* Allow execve args to be in kernel space. */
1000          set_fs(KERNEL_DS);          set_fs(KERNEL_DS);
# Line 1007  Source code for this patch is http://www Line 1007  Source code for this patch is http://www
1007          /* Go, go, go... */          /* Go, go, go... */
1008          if (execve(program_path, argv, envp) < 0)          if (execve(program_path, argv, envp) < 0)
1009                  return -errno;                  return -errno;
1010  --- linux-2.4.37.5.orig/kernel/module.c  --- linux-2.4.37.6.orig/kernel/module.c
1011  +++ linux-2.4.37.5/kernel/module.c  +++ linux-2.4.37.6/kernel/module.c
1012  @@ -10,6 +10,7 @@  @@ -10,6 +10,7 @@
1013   #include <linux/slab.h>   #include <linux/slab.h>
1014   #include <linux/kmod.h>   #include <linux/kmod.h>
# Line 1044  Source code for this patch is http://www Line 1044  Source code for this patch is http://www
1044    
1045          lock_kernel();          lock_kernel();
1046          if (name_user) {          if (name_user) {
1047  --- linux-2.4.37.5.orig/kernel/sched.c  --- linux-2.4.37.6.orig/kernel/sched.c
1048  +++ linux-2.4.37.5/kernel/sched.c  +++ linux-2.4.37.6/kernel/sched.c
1049  @@ -32,6 +32,7 @@  @@ -32,6 +32,7 @@
1050    
1051   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 1063  Source code for this patch is http://www Line 1063  Source code for this patch is http://www
1063    
1064          /*          /*
1065           *      Setpriority might change our priority at the same moment.           *      Setpriority might change our priority at the same moment.
1066  --- linux-2.4.37.5.orig/kernel/signal.c  --- linux-2.4.37.6.orig/kernel/signal.c
1067  +++ linux-2.4.37.5/kernel/signal.c  +++ linux-2.4.37.6/kernel/signal.c
1068  @@ -15,6 +15,7 @@  @@ -15,6 +15,7 @@
1069   #include <linux/sched.h>   #include <linux/sched.h>
1070    
# Line 1100  Source code for this patch is http://www Line 1100  Source code for this patch is http://www
1100    
1101          /* POSIX.1b doesn't mention process groups.  */          /* POSIX.1b doesn't mention process groups.  */
1102          return kill_proc_info(sig, &info, pid);          return kill_proc_info(sig, &info, pid);
1103  --- linux-2.4.37.5.orig/kernel/sys.c  --- linux-2.4.37.6.orig/kernel/sys.c
1104  +++ linux-2.4.37.5/kernel/sys.c  +++ linux-2.4.37.6/kernel/sys.c
1105  @@ -17,6 +17,7 @@  @@ -17,6 +17,7 @@
1106    
1107   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 1146  Source code for this patch is http://www Line 1146  Source code for this patch is http://www
1146    
1147          down_write(&uts_sem);          down_write(&uts_sem);
1148          errno = -EFAULT;          errno = -EFAULT;
1149  --- linux-2.4.37.5.orig/kernel/sysctl.c  --- linux-2.4.37.6.orig/kernel/sysctl.c
1150  +++ linux-2.4.37.5/kernel/sysctl.c  +++ linux-2.4.37.6/kernel/sysctl.c
1151  @@ -33,6 +33,7 @@  @@ -33,6 +33,7 @@
1152   #include <linux/swap.h>   #include <linux/swap.h>
1153    
# Line 1189  Source code for this patch is http://www Line 1189  Source code for this patch is http://www
1189   }   }
1190    
1191   /*   /*
1192  --- linux-2.4.37.5.orig/kernel/time.c  --- linux-2.4.37.6.orig/kernel/time.c
1193  +++ linux-2.4.37.5/kernel/time.c  +++ linux-2.4.37.6/kernel/time.c
1194  @@ -29,6 +29,7 @@  @@ -29,6 +29,7 @@
1195   #include <linux/smp_lock.h>   #include <linux/smp_lock.h>
1196    
# Line 1226  Source code for this patch is http://www Line 1226  Source code for this patch is http://www
1226                                    
1227          /* Now we validate the data before disabling interrupts */          /* Now we validate the data before disabling interrupts */
1228    
1229  --- linux-2.4.37.5.orig/net/ipv4/raw.c  --- linux-2.4.37.6.orig/net/ipv4/raw.c
1230  +++ linux-2.4.37.5/net/ipv4/raw.c  +++ linux-2.4.37.6/net/ipv4/raw.c
1231  @@ -64,6 +64,7 @@  @@ -64,6 +64,7 @@
1232   #include <net/raw.h>   #include <net/raw.h>
1233   #include <net/inet_common.h>   #include <net/inet_common.h>
# Line 1246  Source code for this patch is http://www Line 1246  Source code for this patch is http://www
1246    
1247          copied = skb->len;          copied = skb->len;
1248          if (len < copied) {          if (len < copied) {
1249  --- linux-2.4.37.5.orig/net/ipv4/tcp_ipv4.c  --- linux-2.4.37.6.orig/net/ipv4/tcp_ipv4.c
1250  +++ linux-2.4.37.5/net/ipv4/tcp_ipv4.c  +++ linux-2.4.37.6/net/ipv4/tcp_ipv4.c
1251  @@ -67,6 +67,7 @@  @@ -67,6 +67,7 @@
1252   #include <linux/inet.h>   #include <linux/inet.h>
1253   #include <linux/stddef.h>   #include <linux/stddef.h>
# Line 1274  Source code for this patch is http://www Line 1274  Source code for this patch is http://www
1274    
1275                          /* Does not bother with rcv_saddr checks,                          /* Does not bother with rcv_saddr checks,
1276                           * because the established check is already                           * because the established check is already
1277  --- linux-2.4.37.5.orig/net/ipv4/udp.c  --- linux-2.4.37.6.orig/net/ipv4/udp.c
1278  +++ linux-2.4.37.5/net/ipv4/udp.c  +++ linux-2.4.37.6/net/ipv4/udp.c
1279  @@ -97,6 +97,7 @@  @@ -97,6 +97,7 @@
1280   #include <net/route.h>   #include <net/route.h>
1281   #include <net/inet_common.h>   #include <net/inet_common.h>
# Line 1312  Source code for this patch is http://www Line 1312  Source code for this patch is http://www
1312        
1313          copied = skb->len - sizeof(struct udphdr);          copied = skb->len - sizeof(struct udphdr);
1314          if (copied > len) {          if (copied > len) {
1315  --- linux-2.4.37.5.orig/net/ipv6/raw.c  --- linux-2.4.37.6.orig/net/ipv6/raw.c
1316  +++ linux-2.4.37.5/net/ipv6/raw.c  +++ linux-2.4.37.6/net/ipv6/raw.c
1317  @@ -45,6 +45,7 @@  @@ -45,6 +45,7 @@
1318   #include <net/inet_common.h>   #include <net/inet_common.h>
1319    
# Line 1332  Source code for this patch is http://www Line 1332  Source code for this patch is http://www
1332    
1333          copied = skb->len;          copied = skb->len;
1334          if (copied > len) {          if (copied > len) {
1335  --- linux-2.4.37.5.orig/net/ipv6/tcp_ipv6.c  --- linux-2.4.37.6.orig/net/ipv6/tcp_ipv6.c
1336  +++ linux-2.4.37.5/net/ipv6/tcp_ipv6.c  +++ linux-2.4.37.6/net/ipv6/tcp_ipv6.c
1337  @@ -52,6 +52,7 @@  @@ -52,6 +52,7 @@
1338   #include <net/inet_ecn.h>   #include <net/inet_ecn.h>
1339    
# Line 1351  Source code for this patch is http://www Line 1351  Source code for this patch is http://www
1351                          for (tb = head->chain; tb; tb = tb->next)                          for (tb = head->chain; tb; tb = tb->next)
1352                                  if (tb->port == rover)                                  if (tb->port == rover)
1353                                          goto next;                                          goto next;
1354  --- linux-2.4.37.5.orig/net/ipv6/udp.c  --- linux-2.4.37.6.orig/net/ipv6/udp.c
1355  +++ linux-2.4.37.5/net/ipv6/udp.c  +++ linux-2.4.37.6/net/ipv6/udp.c
1356  @@ -50,6 +50,7 @@  @@ -50,6 +50,7 @@
1357   #include <net/inet_common.h>   #include <net/inet_common.h>
1358    
# Line 1389  Source code for this patch is http://www Line 1389  Source code for this patch is http://www
1389    
1390          copied = skb->len - sizeof(struct udphdr);          copied = skb->len - sizeof(struct udphdr);
1391          if (copied > len) {          if (copied > len) {
1392  --- linux-2.4.37.5.orig/net/socket.c  --- linux-2.4.37.6.orig/net/socket.c
1393  +++ linux-2.4.37.5/net/socket.c  +++ linux-2.4.37.6/net/socket.c
1394  @@ -84,6 +84,7 @@  @@ -84,6 +84,7 @@
1395   #include <net/sock.h>   #include <net/sock.h>
1396   #include <net/scm.h>   #include <net/scm.h>
# Line 1465  Source code for this patch is http://www Line 1465  Source code for this patch is http://www
1465          err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen,          err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen,
1466                                   sock->file->f_flags);                                   sock->file->f_flags);
1467   out_put:   out_put:
1468  --- linux-2.4.37.5.orig/net/unix/af_unix.c  --- linux-2.4.37.6.orig/net/unix/af_unix.c
1469  +++ linux-2.4.37.5/net/unix/af_unix.c  +++ linux-2.4.37.6/net/unix/af_unix.c
1470  @@ -111,6 +111,7 @@  @@ -111,6 +111,7 @@
1471   #include <linux/rtnetlink.h>   #include <linux/rtnetlink.h>
1472    
Legend:
Removed from v.3027  
changed lines
  Added in v.3028
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
サイト情報
ソフトウェアを探す
ソフトウェアを作る
コミュニティ
ヘルプ