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

TOMOYO

Subversion リポジトリの参照

/[tomoyo]/branches/ccs-patch/patches/ccs-patch-2.4.37.diff

Diff of /branches/ccs-patch/patches/ccs-patch-2.4.37.diff

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

revision 1768 by kumaneko, Thu Oct 30 08:24:09 2008 UTC revision 1811 by kumaneko, Mon Nov 10 01:27:54 2008 UTC
# Line 1  Line 1 
1  This is TOMOYO Linux patch for kernel 2.4.37-rc1.  This is TOMOYO Linux patch for kernel 2.4.37-rc2.
2    
3  Source code for this patch is http://www.kernel.org/pub/linux/kernel/v2.4/testing/patch-2.4.37-rc1.bz2  Source code for this patch is http://www.kernel.org/pub/linux/kernel/v2.4/testing/patch-2.4.37-rc2.bz2
4  ---  ---
5   Documentation/Configure.help |   86 +++++++++++++++++++++++++++++   Documentation/Configure.help |   86 +++++++++++++++++++++++++++++
6   arch/alpha/kernel/ptrace.c   |    9 +++   arch/alpha/kernel/ptrace.c   |    9 +++
# Line 52  Source code for this patch is http://www Line 52  Source code for this patch is http://www
52   net/unix/af_unix.c           |   15 +++++   net/unix/af_unix.c           |   15 +++++
53   48 files changed, 862 insertions(+), 6 deletions(-)   48 files changed, 862 insertions(+), 6 deletions(-)
54    
55  --- linux-2.4.37-rc1.orig/Documentation/Configure.help  --- linux-2.4.37-rc2.orig/Documentation/Configure.help
56  +++ linux-2.4.37-rc1/Documentation/Configure.help  +++ linux-2.4.37-rc2/Documentation/Configure.help
57  @@ -29124,6 +29124,92 @@ CONFIG_SOUND_WM97XX  @@ -29158,6 +29158,92 @@ CONFIG_SOUND_WM97XX
58        
59     If unsure, say N.     If unsure, say N.
60    
# Line 147  Source code for this patch is http://www Line 147  Source code for this patch is http://www
147   #   #
148   # A couple of things I keep forgetting:   # A couple of things I keep forgetting:
149   #   capitalize: AppleTalk, Ethernet, DOS, DMA, FAT, FTP, Internet,   #   capitalize: AppleTalk, Ethernet, DOS, DMA, FAT, FTP, Internet,
150  --- linux-2.4.37-rc1.orig/arch/alpha/kernel/ptrace.c  --- linux-2.4.37-rc2.orig/arch/alpha/kernel/ptrace.c
151  +++ linux-2.4.37-rc1/arch/alpha/kernel/ptrace.c  +++ linux-2.4.37-rc2/arch/alpha/kernel/ptrace.c
152  @@ -18,6 +18,9 @@  @@ -18,6 +18,9 @@
153   #include <asm/pgtable.h>   #include <asm/pgtable.h>
154   #include <asm/system.h>   #include <asm/system.h>
# Line 172  Source code for this patch is http://www Line 172  Source code for this patch is http://www
172    
173          lock_kernel();          lock_kernel();
174          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",
175  --- linux-2.4.37-rc1.orig/arch/arm/kernel/ptrace.c  --- linux-2.4.37-rc2.orig/arch/arm/kernel/ptrace.c
176  +++ linux-2.4.37-rc1/arch/arm/kernel/ptrace.c  +++ linux-2.4.37-rc2/arch/arm/kernel/ptrace.c
177  @@ -22,6 +22,9 @@  @@ -22,6 +22,9 @@
178   #include <asm/uaccess.h>   #include <asm/uaccess.h>
179   #include <asm/pgtable.h>   #include <asm/pgtable.h>
# Line 197  Source code for this patch is http://www Line 197  Source code for this patch is http://www
197    
198          lock_kernel();          lock_kernel();
199          ret = -EPERM;          ret = -EPERM;
200  --- linux-2.4.37-rc1.orig/arch/cris/kernel/ptrace.c  --- linux-2.4.37-rc2.orig/arch/cris/kernel/ptrace.c
201  +++ linux-2.4.37-rc1/arch/cris/kernel/ptrace.c  +++ linux-2.4.37-rc2/arch/cris/kernel/ptrace.c
202  @@ -48,6 +48,9 @@  @@ -48,6 +48,9 @@
203   #include <asm/pgtable.h>   #include <asm/pgtable.h>
204   #include <asm/system.h>   #include <asm/system.h>
# Line 222  Source code for this patch is http://www Line 222  Source code for this patch is http://www
222    
223          lock_kernel();          lock_kernel();
224          ret = -EPERM;          ret = -EPERM;
225  --- linux-2.4.37-rc1.orig/arch/i386/kernel/ptrace.c  --- linux-2.4.37-rc2.orig/arch/i386/kernel/ptrace.c
226  +++ linux-2.4.37-rc1/arch/i386/kernel/ptrace.c  +++ linux-2.4.37-rc2/arch/i386/kernel/ptrace.c
227  @@ -20,6 +20,9 @@  @@ -20,6 +20,9 @@
228   #include <asm/processor.h>   #include <asm/processor.h>
229   #include <asm/i387.h>   #include <asm/i387.h>
# Line 247  Source code for this patch is http://www Line 247  Source code for this patch is http://www
247    
248          lock_kernel();          lock_kernel();
249          ret = -EPERM;          ret = -EPERM;
250  --- linux-2.4.37-rc1.orig/arch/ia64/ia32/sys_ia32.c  --- linux-2.4.37-rc2.orig/arch/ia64/ia32/sys_ia32.c
251  +++ linux-2.4.37-rc1/arch/ia64/ia32/sys_ia32.c  +++ linux-2.4.37-rc2/arch/ia64/ia32/sys_ia32.c
252  @@ -57,6 +57,9 @@  @@ -57,6 +57,9 @@
253   #include <net/scm.h>   #include <net/scm.h>
254   #include <net/sock.h>   #include <net/sock.h>
# Line 272  Source code for this patch is http://www Line 272  Source code for this patch is http://www
272    
273          lock_kernel();          lock_kernel();
274          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
275  --- linux-2.4.37-rc1.orig/arch/ia64/kernel/ptrace.c  --- linux-2.4.37-rc2.orig/arch/ia64/kernel/ptrace.c
276  +++ linux-2.4.37-rc1/arch/ia64/kernel/ptrace.c  +++ linux-2.4.37-rc2/arch/ia64/kernel/ptrace.c
277  @@ -27,6 +27,9 @@  @@ -27,6 +27,9 @@
278   #ifdef CONFIG_PERFMON   #ifdef CONFIG_PERFMON
279   #include <asm/perfmon.h>   #include <asm/perfmon.h>
# Line 297  Source code for this patch is http://www Line 297  Source code for this patch is http://www
297    
298          lock_kernel();          lock_kernel();
299          ret = -EPERM;          ret = -EPERM;
300  --- linux-2.4.37-rc1.orig/arch/m68k/kernel/ptrace.c  --- linux-2.4.37-rc2.orig/arch/m68k/kernel/ptrace.c
301  +++ linux-2.4.37-rc1/arch/m68k/kernel/ptrace.c  +++ linux-2.4.37-rc2/arch/m68k/kernel/ptrace.c
302  @@ -25,6 +25,9 @@  @@ -25,6 +25,9 @@
303   #include <asm/pgtable.h>   #include <asm/pgtable.h>
304   #include <asm/system.h>   #include <asm/system.h>
# Line 322  Source code for this patch is http://www Line 322  Source code for this patch is http://www
322    
323          lock_kernel();          lock_kernel();
324          ret = -EPERM;          ret = -EPERM;
325  --- linux-2.4.37-rc1.orig/arch/mips/kernel/ptrace.c  --- linux-2.4.37-rc2.orig/arch/mips/kernel/ptrace.c
326  +++ linux-2.4.37-rc1/arch/mips/kernel/ptrace.c  +++ linux-2.4.37-rc2/arch/mips/kernel/ptrace.c
327  @@ -28,6 +28,9 @@  @@ -28,6 +28,9 @@
328   #include <asm/bootinfo.h>   #include <asm/bootinfo.h>
329   #include <asm/cpu.h>   #include <asm/cpu.h>
# Line 347  Source code for this patch is http://www Line 347  Source code for this patch is http://www
347    
348          lock_kernel();          lock_kernel();
349   #if 0   #if 0
350  --- linux-2.4.37-rc1.orig/arch/mips64/kernel/ptrace.c  --- linux-2.4.37-rc2.orig/arch/mips64/kernel/ptrace.c
351  +++ linux-2.4.37-rc1/arch/mips64/kernel/ptrace.c  +++ linux-2.4.37-rc2/arch/mips64/kernel/ptrace.c
352  @@ -30,6 +30,9 @@  @@ -30,6 +30,9 @@
353   #include <asm/system.h>   #include <asm/system.h>
354   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 385  Source code for this patch is http://www Line 385  Source code for this patch is http://www
385    
386          lock_kernel();          lock_kernel();
387   #if 0   #if 0
388  --- linux-2.4.37-rc1.orig/arch/parisc/kernel/ptrace.c  --- linux-2.4.37-rc2.orig/arch/parisc/kernel/ptrace.c
389  +++ linux-2.4.37-rc1/arch/parisc/kernel/ptrace.c  +++ linux-2.4.37-rc2/arch/parisc/kernel/ptrace.c
390  @@ -21,6 +21,9 @@  @@ -21,6 +21,9 @@
391   #include <asm/system.h>   #include <asm/system.h>
392   #include <asm/processor.h>   #include <asm/processor.h>
# Line 410  Source code for this patch is http://www Line 410  Source code for this patch is http://www
410    
411          lock_kernel();          lock_kernel();
412          ret = -EPERM;          ret = -EPERM;
413  --- linux-2.4.37-rc1.orig/arch/ppc/kernel/ptrace.c  --- linux-2.4.37-rc2.orig/arch/ppc/kernel/ptrace.c
414  +++ linux-2.4.37-rc1/arch/ppc/kernel/ptrace.c  +++ linux-2.4.37-rc2/arch/ppc/kernel/ptrace.c
415  @@ -29,6 +29,9 @@  @@ -29,6 +29,9 @@
416   #include <asm/page.h>   #include <asm/page.h>
417   #include <asm/pgtable.h>   #include <asm/pgtable.h>
# Line 435  Source code for this patch is http://www Line 435  Source code for this patch is http://www
435    
436          lock_kernel();          lock_kernel();
437          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
438  --- linux-2.4.37-rc1.orig/arch/ppc64/kernel/ptrace.c  --- linux-2.4.37-rc2.orig/arch/ppc64/kernel/ptrace.c
439  +++ linux-2.4.37-rc1/arch/ppc64/kernel/ptrace.c  +++ linux-2.4.37-rc2/arch/ppc64/kernel/ptrace.c
440  @@ -30,6 +30,9 @@  @@ -30,6 +30,9 @@
441   #include <asm/page.h>   #include <asm/page.h>
442   #include <asm/pgtable.h>   #include <asm/pgtable.h>
# Line 460  Source code for this patch is http://www Line 460  Source code for this patch is http://www
460    
461          lock_kernel();          lock_kernel();
462          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
463  --- linux-2.4.37-rc1.orig/arch/ppc64/kernel/ptrace32.c  --- linux-2.4.37-rc2.orig/arch/ppc64/kernel/ptrace32.c
464  +++ linux-2.4.37-rc1/arch/ppc64/kernel/ptrace32.c  +++ linux-2.4.37-rc2/arch/ppc64/kernel/ptrace32.c
465  @@ -30,6 +30,9 @@  @@ -30,6 +30,9 @@
466   #include <asm/page.h>   #include <asm/page.h>
467   #include <asm/pgtable.h>   #include <asm/pgtable.h>
# Line 485  Source code for this patch is http://www Line 485  Source code for this patch is http://www
485    
486          lock_kernel();          lock_kernel();
487          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
488  --- linux-2.4.37-rc1.orig/arch/s390/kernel/ptrace.c  --- linux-2.4.37-rc2.orig/arch/s390/kernel/ptrace.c
489  +++ linux-2.4.37-rc1/arch/s390/kernel/ptrace.c  +++ linux-2.4.37-rc2/arch/s390/kernel/ptrace.c
490  @@ -37,6 +37,9 @@  @@ -37,6 +37,9 @@
491   #include <asm/pgalloc.h>   #include <asm/pgalloc.h>
492   #include <asm/system.h>   #include <asm/system.h>
# Line 510  Source code for this patch is http://www Line 510  Source code for this patch is http://www
510    
511          lock_kernel();          lock_kernel();
512          if (request == PTRACE_TRACEME)          if (request == PTRACE_TRACEME)
513  --- linux-2.4.37-rc1.orig/arch/s390x/kernel/ptrace.c  --- linux-2.4.37-rc2.orig/arch/s390x/kernel/ptrace.c
514  +++ linux-2.4.37-rc1/arch/s390x/kernel/ptrace.c  +++ linux-2.4.37-rc2/arch/s390x/kernel/ptrace.c
515  @@ -43,6 +43,9 @@  @@ -43,6 +43,9 @@
516   #else   #else
517   #define parent_31bit 0   #define parent_31bit 0
# Line 535  Source code for this patch is http://www Line 535  Source code for this patch is http://www
535          lock_kernel();          lock_kernel();
536          if (request == PTRACE_TRACEME)          if (request == PTRACE_TRACEME)
537          {          {
538  --- linux-2.4.37-rc1.orig/arch/sh/kernel/ptrace.c  --- linux-2.4.37-rc2.orig/arch/sh/kernel/ptrace.c
539  +++ linux-2.4.37-rc1/arch/sh/kernel/ptrace.c  +++ linux-2.4.37-rc2/arch/sh/kernel/ptrace.c
540  @@ -26,6 +26,9 @@  @@ -26,6 +26,9 @@
541   #include <asm/system.h>   #include <asm/system.h>
542   #include <asm/processor.h>   #include <asm/processor.h>
# Line 560  Source code for this patch is http://www Line 560  Source code for this patch is http://www
560    
561          lock_kernel();          lock_kernel();
562          ret = -EPERM;          ret = -EPERM;
563  --- linux-2.4.37-rc1.orig/arch/sh64/kernel/ptrace.c  --- linux-2.4.37-rc2.orig/arch/sh64/kernel/ptrace.c
564  +++ linux-2.4.37-rc1/arch/sh64/kernel/ptrace.c  +++ linux-2.4.37-rc2/arch/sh64/kernel/ptrace.c
565  @@ -32,6 +32,9 @@  @@ -32,6 +32,9 @@
566   #include <asm/system.h>   #include <asm/system.h>
567   #include <asm/processor.h>   #include <asm/processor.h>
# Line 585  Source code for this patch is http://www Line 585  Source code for this patch is http://www
585    
586          lock_kernel();          lock_kernel();
587          ret = -EPERM;          ret = -EPERM;
588  --- linux-2.4.37-rc1.orig/arch/sparc/kernel/ptrace.c  --- linux-2.4.37-rc2.orig/arch/sparc/kernel/ptrace.c
589  +++ linux-2.4.37-rc1/arch/sparc/kernel/ptrace.c  +++ linux-2.4.37-rc2/arch/sparc/kernel/ptrace.c
590  @@ -21,6 +21,9 @@  @@ -21,6 +21,9 @@
591   #include <asm/pgtable.h>   #include <asm/pgtable.h>
592   #include <asm/system.h>   #include <asm/system.h>
# Line 612  Source code for this patch is http://www Line 612  Source code for this patch is http://www
612    
613          lock_kernel();          lock_kernel();
614   #ifdef DEBUG_PTRACE   #ifdef DEBUG_PTRACE
615  --- linux-2.4.37-rc1.orig/arch/sparc64/kernel/ptrace.c  --- linux-2.4.37-rc2.orig/arch/sparc64/kernel/ptrace.c
616  +++ linux-2.4.37-rc1/arch/sparc64/kernel/ptrace.c  +++ linux-2.4.37-rc2/arch/sparc64/kernel/ptrace.c
617  @@ -26,6 +26,9 @@  @@ -26,6 +26,9 @@
618   #include <asm/psrcompat.h>   #include <asm/psrcompat.h>
619   #include <asm/visasm.h>   #include <asm/visasm.h>
# Line 639  Source code for this patch is http://www Line 639  Source code for this patch is http://www
639    
640          if (current->thread.flags & SPARC_FLAG_32BIT) {          if (current->thread.flags & SPARC_FLAG_32BIT) {
641                  addr &= 0xffffffffUL;                  addr &= 0xffffffffUL;
642  --- linux-2.4.37-rc1.orig/arch/x86_64/ia32/ptrace32.c  --- linux-2.4.37-rc2.orig/arch/x86_64/ia32/ptrace32.c
643  +++ linux-2.4.37-rc1/arch/x86_64/ia32/ptrace32.c  +++ linux-2.4.37-rc2/arch/x86_64/ia32/ptrace32.c
644  @@ -24,6 +24,9 @@  @@ -24,6 +24,9 @@
645   #include <asm/i387.h>   #include <asm/i387.h>
646   #include <asm/fpu32.h>   #include <asm/fpu32.h>
# Line 664  Source code for this patch is http://www Line 664  Source code for this patch is http://www
664    
665          switch (request) {          switch (request) {
666          case PTRACE_TRACEME:          case PTRACE_TRACEME:
667  --- linux-2.4.37-rc1.orig/arch/x86_64/kernel/ptrace.c  --- linux-2.4.37-rc2.orig/arch/x86_64/kernel/ptrace.c
668  +++ linux-2.4.37-rc1/arch/x86_64/kernel/ptrace.c  +++ linux-2.4.37-rc2/arch/x86_64/kernel/ptrace.c
669  @@ -22,6 +22,9 @@  @@ -22,6 +22,9 @@
670   #include <asm/processor.h>   #include <asm/processor.h>
671   #include <asm/i387.h>   #include <asm/i387.h>
# Line 689  Source code for this patch is http://www Line 689  Source code for this patch is http://www
689    
690          /* This lock_kernel fixes a subtle race with suid exec */          /* This lock_kernel fixes a subtle race with suid exec */
691          lock_kernel();          lock_kernel();
692  --- linux-2.4.37-rc1.orig/fs/Config.in  --- linux-2.4.37-rc2.orig/fs/Config.in
693  +++ linux-2.4.37-rc1/fs/Config.in  +++ linux-2.4.37-rc2/fs/Config.in
694  @@ -176,4 +176,7 @@ comment 'Partition Types'  @@ -176,4 +176,7 @@ comment 'Partition Types'
695   source fs/partitions/Config.in   source fs/partitions/Config.in
696   endmenu   endmenu
# Line 699  Source code for this patch is http://www Line 699  Source code for this patch is http://www
699  +source fs/Config.ccs.in  +source fs/Config.ccs.in
700  +  +
701   endmenu   endmenu
702  --- linux-2.4.37-rc1.orig/fs/Makefile  --- linux-2.4.37-rc2.orig/fs/Makefile
703  +++ linux-2.4.37-rc1/fs/Makefile  +++ linux-2.4.37-rc2/fs/Makefile
704  @@ -80,5 +80,5 @@ obj-$(CONFIG_BINFMT_ELF)      += binfmt_elf.o  @@ -80,5 +80,5 @@ obj-$(CONFIG_BINFMT_ELF)      += binfmt_elf.o
705   # persistent filesystems   # persistent filesystems
706   obj-y += $(join $(subdir-y),$(subdir-y:%=/%.o))   obj-y += $(join $(subdir-y),$(subdir-y:%=/%.o))
# Line 708  Source code for this patch is http://www Line 708  Source code for this patch is http://www
708  -  -
709  +include Makefile-2.4.ccs  +include Makefile-2.4.ccs
710   include $(TOPDIR)/Rules.make   include $(TOPDIR)/Rules.make
711  --- linux-2.4.37-rc1.orig/fs/attr.c  --- linux-2.4.37-rc2.orig/fs/attr.c
712  +++ linux-2.4.37-rc1/fs/attr.c  +++ linux-2.4.37-rc2/fs/attr.c
713  @@ -12,6 +12,9 @@  @@ -12,6 +12,9 @@
714   #include <linux/dnotify.h>   #include <linux/dnotify.h>
715   #include <linux/fcntl.h>   #include <linux/fcntl.h>
# Line 734  Source code for this patch is http://www Line 734  Source code for this patch is http://www
734    
735          lock_kernel();          lock_kernel();
736          if (inode->i_op && inode->i_op->setattr)          if (inode->i_op && inode->i_op->setattr)
737  --- linux-2.4.37-rc1.orig/fs/exec.c  --- linux-2.4.37-rc2.orig/fs/exec.c
738  +++ linux-2.4.37-rc1/fs/exec.c  +++ linux-2.4.37-rc2/fs/exec.c
739  @@ -48,6 +48,10 @@  @@ -48,6 +48,10 @@
740   #include <linux/kmod.h>   #include <linux/kmod.h>
741   #endif   #endif
# Line 785  Source code for this patch is http://www Line 785  Source code for this patch is http://www
785          if (retval >= 0)          if (retval >= 0)
786                  /* execve success */                  /* execve success */
787                  return retval;                  return retval;
788  --- linux-2.4.37-rc1.orig/fs/fcntl.c  --- linux-2.4.37-rc2.orig/fs/fcntl.c
789  +++ linux-2.4.37-rc1/fs/fcntl.c  +++ linux-2.4.37-rc2/fs/fcntl.c
790  @@ -16,6 +16,9 @@  @@ -16,6 +16,9 @@
791   #include <asm/poll.h>   #include <asm/poll.h>
792   #include <asm/siginfo.h>   #include <asm/siginfo.h>
# Line 809  Source code for this patch is http://www Line 809  Source code for this patch is http://www
809          /* Did FASYNC state change? */          /* Did FASYNC state change? */
810          if ((arg ^ filp->f_flags) & FASYNC) {          if ((arg ^ filp->f_flags) & FASYNC) {
811                  if (filp->f_op && filp->f_op->fasync) {                  if (filp->f_op && filp->f_op->fasync) {
812  --- linux-2.4.37-rc1.orig/fs/ioctl.c  --- linux-2.4.37-rc2.orig/fs/ioctl.c
813  +++ linux-2.4.37-rc1/fs/ioctl.c  +++ linux-2.4.37-rc2/fs/ioctl.c
814  @@ -10,6 +10,9 @@  @@ -10,6 +10,9 @@
815    
816   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 834  Source code for this patch is http://www Line 834  Source code for this patch is http://www
834                          error = -ENOTTY;                          error = -ENOTTY;
835                          if (S_ISREG(filp->f_dentry->d_inode->i_mode))                          if (S_ISREG(filp->f_dentry->d_inode->i_mode))
836                                  error = file_ioctl(filp, cmd, arg);                                  error = file_ioctl(filp, cmd, arg);
837  --- linux-2.4.37-rc1.orig/fs/namei.c  --- linux-2.4.37-rc2.orig/fs/namei.c
838  +++ linux-2.4.37-rc1/fs/namei.c  +++ linux-2.4.37-rc2/fs/namei.c
839  @@ -28,6 +28,11 @@  @@ -28,6 +28,11 @@
840    
841   #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])   #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])
# Line 848  Source code for this patch is http://www Line 848  Source code for this patch is http://www
848   /* [Feb-1997 T. Schoebel-Theuer]   /* [Feb-1997 T. Schoebel-Theuer]
849    * Fundamental changes in the pathname lookup mechanisms (namei)    * Fundamental changes in the pathname lookup mechanisms (namei)
850    * were necessary because of omirr.  The reason is that omirr needs    * were necessary because of omirr.  The reason is that omirr needs
851  @@ -988,6 +993,9 @@ exit_lock:  @@ -1003,6 +1008,9 @@ exit_lock:
852          return error;          return error;
853   }   }
854    
# Line 858  Source code for this patch is http://www Line 858  Source code for this patch is http://www
858   /*   /*
859    *     open_namei()    *     open_namei()
860    *    *
861  @@ -1053,6 +1061,13 @@ do_last:  @@ -1068,6 +1076,13 @@ do_last:
862    
863          /* Negative dentry, just create the file */          /* Negative dentry, just create the file */
864          if (!dentry->d_inode) {          if (!dentry->d_inode) {
# Line 872  Source code for this patch is http://www Line 872  Source code for this patch is http://www
872                  error = vfs_create(dir->d_inode, dentry,                  error = vfs_create(dir->d_inode, dentry,
873                                     mode & ~current->fs->umask);                                     mode & ~current->fs->umask);
874                  up(&dir->d_inode->i_sem);                  up(&dir->d_inode->i_sem);
875  @@ -1139,6 +1154,13 @@ ok:  @@ -1154,6 +1169,13 @@ ok:
876                          goto exit;                          goto exit;
877          }          }
878    
# Line 886  Source code for this patch is http://www Line 886  Source code for this patch is http://www
886          /*          /*
887           * Ensure there are no outstanding leases on the file.           * Ensure there are no outstanding leases on the file.
888           */           */
889  @@ -1277,6 +1299,17 @@ asmlinkage long sys_mknod(const char * f  @@ -1292,6 +1314,17 @@ asmlinkage long sys_mknod(const char * f
890    
891          if (S_ISDIR(mode))          if (S_ISDIR(mode))
892                  return -EPERM;                  return -EPERM;
# Line 904  Source code for this patch is http://www Line 904  Source code for this patch is http://www
904          tmp = getname(filename);          tmp = getname(filename);
905          if (IS_ERR(tmp))          if (IS_ERR(tmp))
906                  return PTR_ERR(tmp);                  return PTR_ERR(tmp);
907  @@ -1291,9 +1324,33 @@ asmlinkage long sys_mknod(const char * f  @@ -1306,9 +1339,33 @@ asmlinkage long sys_mknod(const char * f
908          if (!IS_ERR(dentry)) {          if (!IS_ERR(dentry)) {
909                  switch (mode & S_IFMT) {                  switch (mode & S_IFMT) {
910                  case 0: case S_IFREG:                  case 0: case S_IFREG:
# Line 938  Source code for this patch is http://www Line 938  Source code for this patch is http://www
938                          error = vfs_mknod(nd.dentry->d_inode,dentry,mode,dev);                          error = vfs_mknod(nd.dentry->d_inode,dentry,mode,dev);
939                          break;                          break;
940                  case S_IFDIR:                  case S_IFDIR:
941  @@ -1355,6 +1412,13 @@ asmlinkage long sys_mkdir(const char * p  @@ -1370,6 +1427,13 @@ asmlinkage long sys_mkdir(const char * p
942                  dentry = lookup_create(&nd, 1);                  dentry = lookup_create(&nd, 1);
943                  error = PTR_ERR(dentry);                  error = PTR_ERR(dentry);
944                  if (!IS_ERR(dentry)) {                  if (!IS_ERR(dentry)) {
# Line 952  Source code for this patch is http://www Line 952  Source code for this patch is http://www
952                          error = vfs_mkdir(nd.dentry->d_inode, dentry,                          error = vfs_mkdir(nd.dentry->d_inode, dentry,
953                                            mode & ~current->fs->umask);                                            mode & ~current->fs->umask);
954                          dput(dentry);                          dput(dentry);
955  @@ -1464,6 +1528,13 @@ asmlinkage long sys_rmdir(const char * p  @@ -1479,6 +1543,13 @@ asmlinkage long sys_rmdir(const char * p
956          dentry = lookup_hash(&nd.last, nd.dentry);          dentry = lookup_hash(&nd.last, nd.dentry);
957          error = PTR_ERR(dentry);          error = PTR_ERR(dentry);
958          if (!IS_ERR(dentry)) {          if (!IS_ERR(dentry)) {
# Line 966  Source code for this patch is http://www Line 966  Source code for this patch is http://www
966                  error = vfs_rmdir(nd.dentry->d_inode, dentry);                  error = vfs_rmdir(nd.dentry->d_inode, dentry);
967                  dput(dentry);                  dput(dentry);
968          }          }
969  @@ -1515,6 +1586,10 @@ asmlinkage long sys_unlink(const char *  @@ -1530,6 +1601,10 @@ asmlinkage long sys_unlink(const char *
970          char * name;          char * name;
971          struct dentry *dentry;          struct dentry *dentry;
972          struct nameidata nd;          struct nameidata nd;
# Line 977  Source code for this patch is http://www Line 977  Source code for this patch is http://www
977    
978          name = getname(pathname);          name = getname(pathname);
979          if(IS_ERR(name))          if(IS_ERR(name))
980  @@ -1533,6 +1608,14 @@ asmlinkage long sys_unlink(const char *  @@ -1548,6 +1623,14 @@ asmlinkage long sys_unlink(const char *
981                  /* Why not before? Because we want correct error value */                  /* Why not before? Because we want correct error value */
982                  if (nd.last.name[nd.last.len])                  if (nd.last.name[nd.last.len])
983                          goto slashes;                          goto slashes;
# Line 992  Source code for this patch is http://www Line 992  Source code for this patch is http://www
992                  error = vfs_unlink(nd.dentry->d_inode, dentry);                  error = vfs_unlink(nd.dentry->d_inode, dentry);
993          exit2:          exit2:
994                  dput(dentry);                  dput(dentry);
995  @@ -1581,6 +1664,10 @@ asmlinkage long sys_symlink(const char *  @@ -1596,6 +1679,10 @@ asmlinkage long sys_symlink(const char *
996          int error = 0;          int error = 0;
997          char * from;          char * from;
998          char * to;          char * to;
# Line 1003  Source code for this patch is http://www Line 1003  Source code for this patch is http://www
1003    
1004          from = getname(oldname);          from = getname(oldname);
1005          if(IS_ERR(from))          if(IS_ERR(from))
1006  @@ -1597,6 +1684,13 @@ asmlinkage long sys_symlink(const char *  @@ -1612,6 +1699,13 @@ asmlinkage long sys_symlink(const char *
1007                  dentry = lookup_create(&nd, 0);                  dentry = lookup_create(&nd, 0);
1008                  error = PTR_ERR(dentry);                  error = PTR_ERR(dentry);
1009                  if (!IS_ERR(dentry)) {                  if (!IS_ERR(dentry)) {
# Line 1017  Source code for this patch is http://www Line 1017  Source code for this patch is http://www
1017                          error = vfs_symlink(nd.dentry->d_inode, dentry, from);                          error = vfs_symlink(nd.dentry->d_inode, dentry, from);
1018                          dput(dentry);                          dput(dentry);
1019                  }                  }
1020  @@ -1664,6 +1758,10 @@ asmlinkage long sys_link(const char * ol  @@ -1679,6 +1773,10 @@ asmlinkage long sys_link(const char * ol
1021   {   {
1022          int error;          int error;
1023          char * to;          char * to;
# Line 1028  Source code for this patch is http://www Line 1028  Source code for this patch is http://www
1028    
1029          to = getname(newname);          to = getname(newname);
1030          error = PTR_ERR(to);          error = PTR_ERR(to);
1031  @@ -1683,6 +1781,17 @@ asmlinkage long sys_link(const char * ol  @@ -1698,6 +1796,17 @@ asmlinkage long sys_link(const char * ol
1032                  new_dentry = lookup_create(&nd, 0);                  new_dentry = lookup_create(&nd, 0);
1033                  error = PTR_ERR(new_dentry);                  error = PTR_ERR(new_dentry);
1034                  if (!IS_ERR(new_dentry)) {                  if (!IS_ERR(new_dentry)) {
# Line 1046  Source code for this patch is http://www Line 1046  Source code for this patch is http://www
1046                          error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry);                          error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry);
1047                          dput(new_dentry);                          dput(new_dentry);
1048                  }                  }
1049  @@ -1913,6 +2022,20 @@ static inline int do_rename(const char *  @@ -1928,6 +2037,20 @@ static inline int do_rename(const char *
1050          error = PTR_ERR(new_dentry);          error = PTR_ERR(new_dentry);
1051          if (IS_ERR(new_dentry))          if (IS_ERR(new_dentry))
1052                  goto exit4;                  goto exit4;
# Line 1067  Source code for this patch is http://www Line 1067  Source code for this patch is http://www
1067    
1068          lock_kernel();          lock_kernel();
1069          error = vfs_rename(old_dir->d_inode, old_dentry,          error = vfs_rename(old_dir->d_inode, old_dentry,
1070  @@ -1937,6 +2060,10 @@ asmlinkage long sys_rename(const char *  @@ -1952,6 +2075,10 @@ asmlinkage long sys_rename(const char *
1071          int error;          int error;
1072          char * from;          char * from;
1073          char * to;          char * to;
# Line 1078  Source code for this patch is http://www Line 1078  Source code for this patch is http://www
1078    
1079          from = getname(oldname);          from = getname(oldname);
1080          if(IS_ERR(from))          if(IS_ERR(from))
1081  --- linux-2.4.37-rc1.orig/fs/namespace.c  --- linux-2.4.37-rc2.orig/fs/namespace.c
1082  +++ linux-2.4.37-rc1/fs/namespace.c  +++ linux-2.4.37-rc2/fs/namespace.c
1083  @@ -21,6 +21,13 @@  @@ -21,6 +21,13 @@
1084   #include <linux/seq_file.h>   #include <linux/seq_file.h>
1085   #include <linux/namespace.h>   #include <linux/namespace.h>
# Line 1208  Source code for this patch is http://www Line 1208  Source code for this patch is http://www
1208          read_lock(&current->fs->lock);          read_lock(&current->fs->lock);
1209          user_nd.mnt = mntget(current->fs->rootmnt);          user_nd.mnt = mntget(current->fs->rootmnt);
1210          user_nd.dentry = dget(current->fs->root);          user_nd.dentry = dget(current->fs->root);
1211  --- linux-2.4.37-rc1.orig/fs/open.c  --- linux-2.4.37-rc2.orig/fs/open.c
1212  +++ linux-2.4.37-rc1/fs/open.c  +++ linux-2.4.37-rc2/fs/open.c
1213  @@ -20,6 +20,13 @@  @@ -20,6 +20,13 @@
1214    
1215   #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 1224  Source code for this patch is http://www Line 1224  Source code for this patch is http://www
1224   int vfs_statfs(struct super_block *sb, struct statfs *buf)   int vfs_statfs(struct super_block *sb, struct statfs *buf)
1225   {   {
1226          int retval = -ENODEV;          int retval = -ENODEV;
1227  @@ -162,6 +169,11 @@ static inline long do_sys_truncate(const  @@ -164,6 +171,11 @@ static inline long do_sys_truncate(const
1228          if (error)          if (error)
1229                  goto dput_and_out;                  goto dput_and_out;
1230    
# Line 1236  Source code for this patch is http://www Line 1236  Source code for this patch is http://www
1236          error = locks_verify_truncate(inode, NULL, length);          error = locks_verify_truncate(inode, NULL, length);
1237          if (!error) {          if (!error) {
1238                  DQUOT_INIT(inode);                  DQUOT_INIT(inode);
1239  @@ -215,6 +227,11 @@ static inline long do_sys_ftruncate(unsi  @@ -217,6 +229,11 @@ static inline long do_sys_ftruncate(unsi
1240          if (IS_APPEND(inode))          if (IS_APPEND(inode))
1241                  goto out_putf;                  goto out_putf;
1242    
# Line 1248  Source code for this patch is http://www Line 1248  Source code for this patch is http://www
1248          error = locks_verify_truncate(inode, file, length);          error = locks_verify_truncate(inode, file, length);
1249          if (!error)          if (!error)
1250                  error = do_truncate(dentry, length);                  error = do_truncate(dentry, length);
1251  @@ -464,6 +481,14 @@ asmlinkage long sys_chroot(const char *  @@ -466,6 +483,14 @@ asmlinkage long sys_chroot(const char *
1252          error = -EPERM;          error = -EPERM;
1253          if (!capable(CAP_SYS_CHROOT))          if (!capable(CAP_SYS_CHROOT))
1254                  goto dput_and_out;                  goto dput_and_out;
# Line 1263  Source code for this patch is http://www Line 1263  Source code for this patch is http://www
1263    
1264          set_fs_root(current->fs, nd.mnt, nd.dentry);          set_fs_root(current->fs, nd.mnt, nd.dentry);
1265          set_fs_altroot();          set_fs_altroot();
1266  @@ -895,6 +920,10 @@ out_unlock:  @@ -897,6 +922,10 @@ out_unlock:
1267    */    */
1268   asmlinkage long sys_vhangup(void)   asmlinkage long sys_vhangup(void)
1269   {   {
# Line 1274  Source code for this patch is http://www Line 1274  Source code for this patch is http://www
1274          if (capable(CAP_SYS_TTY_CONFIG)) {          if (capable(CAP_SYS_TTY_CONFIG)) {
1275                  tty_vhangup(current->tty);                  tty_vhangup(current->tty);
1276                  return 0;                  return 0;
1277  --- linux-2.4.37-rc1.orig/fs/proc/Makefile  --- linux-2.4.37-rc2.orig/fs/proc/Makefile
1278  +++ linux-2.4.37-rc1/fs/proc/Makefile  +++ linux-2.4.37-rc2/fs/proc/Makefile
1279  @@ -18,4 +18,8 @@ ifeq ($(CONFIG_PROC_DEVICETREE),y)  @@ -18,4 +18,8 @@ ifeq ($(CONFIG_PROC_DEVICETREE),y)
1280   obj-y += proc_devtree.o   obj-y += proc_devtree.o
1281   endif   endif
# Line 1285  Source code for this patch is http://www Line 1285  Source code for this patch is http://www
1285  +obj-$(CONFIG_TOMOYO) += ccs_proc.o  +obj-$(CONFIG_TOMOYO) += ccs_proc.o
1286  +  +
1287   include $(TOPDIR)/Rules.make   include $(TOPDIR)/Rules.make
1288  --- linux-2.4.37-rc1.orig/fs/proc/proc_misc.c  --- linux-2.4.37-rc2.orig/fs/proc/proc_misc.c
1289  +++ linux-2.4.37-rc1/fs/proc/proc_misc.c  +++ linux-2.4.37-rc2/fs/proc/proc_misc.c
1290  @@ -670,4 +670,9 @@ void __init proc_misc_init(void)  @@ -670,4 +670,9 @@ void __init proc_misc_init(void)
1291                          entry->proc_fops = &ppc_htab_operations;                          entry->proc_fops = &ppc_htab_operations;
1292          }          }
1293   #endif   #endif
1294  +       /***** CCS start. *****/  +       /***** CCS start. *****/
1295  +#if defined(CONFIG_SAKURA) || defined(CONFIG_TOMOYO)  +#if defined(CONFIG_SAKURA) || defined(CONFIG_TOMOYO)
1296  +       printk(KERN_INFO "Hook version: 2.4.37-rc1 2008/10/30\n");  +       printk(KERN_INFO "Hook version: 2.4.37-rc2 2008/11/10\n");
1297  +#endif  +#endif
1298  +       /***** CCS end. *****/  +       /***** CCS end. *****/
1299   }   }
1300  --- linux-2.4.37-rc1.orig/include/linux/sched.h  --- linux-2.4.37-rc2.orig/include/linux/sched.h
1301  +++ linux-2.4.37-rc1/include/linux/sched.h  +++ linux-2.4.37-rc2/include/linux/sched.h
1302  @@ -29,6 +29,11 @@ extern unsigned long event;  @@ -29,6 +29,11 @@ extern unsigned long event;
1303    
1304   struct exec_domain;   struct exec_domain;
# Line 1311  Source code for this patch is http://www Line 1311  Source code for this patch is http://www
1311   /*   /*
1312    * cloning flags:    * cloning flags:
1313    */    */
1314  @@ -415,6 +420,10 @@ struct task_struct {  @@ -417,6 +422,10 @@ struct task_struct {
   
  /* journalling filesystem info */  
1315          void *journal_info;          void *journal_info;
1316    
1317            struct list_head *scm_work_list;
1318  +       /***** TOMOYO Linux start. *****/  +       /***** TOMOYO Linux start. *****/
1319  +       struct domain_info *domain_info;  +       struct domain_info *domain_info;
1320  +       u32 tomoyo_flags;  +       u32 tomoyo_flags;
# Line 1322  Source code for this patch is http://www Line 1322  Source code for this patch is http://www
1322   };   };
1323    
1324   /*   /*
1325  @@ -510,6 +519,10 @@ extern struct exec_domain  default_exec_d  @@ -512,6 +521,10 @@ extern struct exec_domain  default_exec_d
1326       blocked:           {{0}},                                          \       blocked:           {{0}},                                          \
1327       alloc_lock:                SPIN_LOCK_UNLOCKED,                             \       alloc_lock:                SPIN_LOCK_UNLOCKED,                             \
1328       journal_info:      NULL,                                           \       journal_info:      NULL,                                           \
# Line 1333  Source code for this patch is http://www Line 1333  Source code for this patch is http://www
1333   }   }
1334    
1335    
1336  --- linux-2.4.37-rc1.orig/kernel/kmod.c  --- linux-2.4.37-rc2.orig/kernel/kmod.c
1337  +++ linux-2.4.37-rc1/kernel/kmod.c  +++ linux-2.4.37-rc2/kernel/kmod.c
1338  @@ -134,6 +134,11 @@ int exec_usermodehelper(char *program_pa  @@ -134,6 +134,11 @@ int exec_usermodehelper(char *program_pa
1339          /* Allow execve args to be in kernel space. */          /* Allow execve args to be in kernel space. */
1340          set_fs(KERNEL_DS);          set_fs(KERNEL_DS);
# Line 1347  Source code for this patch is http://www Line 1347  Source code for this patch is http://www
1347          /* Go, go, go... */          /* Go, go, go... */
1348          if (execve(program_path, argv, envp) < 0)          if (execve(program_path, argv, envp) < 0)
1349                  return -errno;                  return -errno;
1350  --- linux-2.4.37-rc1.orig/kernel/module.c  --- linux-2.4.37-rc2.orig/kernel/module.c
1351  +++ linux-2.4.37-rc1/kernel/module.c  +++ linux-2.4.37-rc2/kernel/module.c
1352  @@ -10,6 +10,9 @@  @@ -10,6 +10,9 @@
1353   #include <linux/slab.h>   #include <linux/slab.h>
1354   #include <linux/kmod.h>   #include <linux/kmod.h>
# Line 1392  Source code for this patch is http://www Line 1392  Source code for this patch is http://www
1392    
1393          lock_kernel();          lock_kernel();
1394          if (name_user) {          if (name_user) {
1395  --- linux-2.4.37-rc1.orig/kernel/sched.c  --- linux-2.4.37-rc2.orig/kernel/sched.c
1396  +++ linux-2.4.37-rc1/kernel/sched.c  +++ linux-2.4.37-rc2/kernel/sched.c
1397  @@ -32,6 +32,9 @@  @@ -32,6 +32,9 @@
1398    
1399   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 1415  Source code for this patch is http://www Line 1415  Source code for this patch is http://www
1415    
1416          /*          /*
1417           *      Setpriority might change our priority at the same moment.           *      Setpriority might change our priority at the same moment.
1418  --- linux-2.4.37-rc1.orig/kernel/signal.c  --- linux-2.4.37-rc2.orig/kernel/signal.c
1419  +++ linux-2.4.37-rc1/kernel/signal.c  +++ linux-2.4.37-rc2/kernel/signal.c
1420  @@ -15,6 +15,9 @@  @@ -15,6 +15,9 @@
1421   #include <linux/sched.h>   #include <linux/sched.h>
1422    
# Line 1453  Source code for this patch is http://www Line 1453  Source code for this patch is http://www
1453          info.si_signo = sig;          info.si_signo = sig;
1454          info.si_errno = 0;          info.si_errno = 0;
1455          info.si_code = SI_TKILL;          info.si_code = SI_TKILL;
1456  --- linux-2.4.37-rc1.orig/kernel/sys.c  --- linux-2.4.37-rc2.orig/kernel/sys.c
1457  +++ linux-2.4.37-rc1/kernel/sys.c  +++ linux-2.4.37-rc2/kernel/sys.c
1458  @@ -17,6 +17,9 @@  @@ -17,6 +17,9 @@
1459    
1460   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 1509  Source code for this patch is http://www Line 1509  Source code for this patch is http://www
1509    
1510          down_write(&uts_sem);          down_write(&uts_sem);
1511          errno = -EFAULT;          errno = -EFAULT;
1512  --- linux-2.4.37-rc1.orig/kernel/sysctl.c  --- linux-2.4.37-rc2.orig/kernel/sysctl.c
1513  +++ linux-2.4.37-rc1/kernel/sysctl.c  +++ linux-2.4.37-rc2/kernel/sysctl.c
1514  @@ -33,6 +33,9 @@  @@ -33,6 +33,9 @@
1515   #include <linux/swap.h>   #include <linux/swap.h>
1516    
# Line 1659  Source code for this patch is http://www Line 1659  Source code for this patch is http://www
1659   }   }
1660    
1661   /*   /*
1662  --- linux-2.4.37-rc1.orig/kernel/time.c  --- linux-2.4.37-rc2.orig/kernel/time.c
1663  +++ linux-2.4.37-rc1/kernel/time.c  +++ linux-2.4.37-rc2/kernel/time.c
1664  @@ -29,6 +29,9 @@  @@ -29,6 +29,9 @@
1665   #include <linux/smp_lock.h>   #include <linux/smp_lock.h>
1666    
# Line 1704  Source code for this patch is http://www Line 1704  Source code for this patch is http://www
1704                                    
1705          /* Now we validate the data before disabling interrupts */          /* Now we validate the data before disabling interrupts */
1706    
1707  --- linux-2.4.37-rc1.orig/net/core/datagram.c  --- linux-2.4.37-rc2.orig/net/core/datagram.c
1708  +++ linux-2.4.37-rc1/net/core/datagram.c  +++ linux-2.4.37-rc2/net/core/datagram.c
1709  @@ -43,6 +43,10 @@  @@ -43,6 +43,10 @@
1710   #include <net/sock.h>   #include <net/sock.h>
1711   #include <net/checksum.h>   #include <net/checksum.h>
# Line 1730  Source code for this patch is http://www Line 1730  Source code for this patch is http://www
1730                  if (skb)                  if (skb)
1731                          return skb;                          return skb;
1732    
1733  --- linux-2.4.37-rc1.orig/net/ipv4/tcp_ipv4.c  --- linux-2.4.37-rc2.orig/net/ipv4/tcp_ipv4.c
1734  +++ linux-2.4.37-rc1/net/ipv4/tcp_ipv4.c  +++ linux-2.4.37-rc2/net/ipv4/tcp_ipv4.c
1735  @@ -67,6 +67,9 @@  @@ -67,6 +67,9 @@
1736   #include <linux/inet.h>   #include <linux/inet.h>
1737   #include <linux/stddef.h>   #include <linux/stddef.h>
# Line 1764  Source code for this patch is http://www Line 1764  Source code for this patch is http://www
1764    
1765                          /* Does not bother with rcv_saddr checks,                          /* Does not bother with rcv_saddr checks,
1766                           * because the established check is already                           * because the established check is already
1767  --- linux-2.4.37-rc1.orig/net/ipv4/udp.c  --- linux-2.4.37-rc2.orig/net/ipv4/udp.c
1768  +++ linux-2.4.37-rc1/net/ipv4/udp.c  +++ linux-2.4.37-rc2/net/ipv4/udp.c
1769  @@ -97,6 +97,9 @@  @@ -97,6 +97,9 @@
1770   #include <net/route.h>   #include <net/route.h>
1771   #include <net/inet_common.h>   #include <net/inet_common.h>
# Line 1798  Source code for this patch is http://www Line 1798  Source code for this patch is http://www
1798                          if (!udp_lport_inuse(result))                          if (!udp_lport_inuse(result))
1799                                  break;                                  break;
1800                  }                  }
1801  --- linux-2.4.37-rc1.orig/net/ipv6/tcp_ipv6.c  --- linux-2.4.37-rc2.orig/net/ipv6/tcp_ipv6.c
1802  +++ linux-2.4.37-rc1/net/ipv6/tcp_ipv6.c  +++ linux-2.4.37-rc2/net/ipv6/tcp_ipv6.c
1803  @@ -52,6 +52,9 @@  @@ -52,6 +52,9 @@
1804   #include <net/inet_ecn.h>   #include <net/inet_ecn.h>
1805    
# Line 1821  Source code for this patch is http://www Line 1821  Source code for this patch is http://www
1821                          for (tb = head->chain; tb; tb = tb->next)                          for (tb = head->chain; tb; tb = tb->next)
1822                                  if (tb->port == rover)                                  if (tb->port == rover)
1823                                          goto next;                                          goto next;
1824  --- linux-2.4.37-rc1.orig/net/ipv6/udp.c  --- linux-2.4.37-rc2.orig/net/ipv6/udp.c
1825  +++ linux-2.4.37-rc1/net/ipv6/udp.c  +++ linux-2.4.37-rc2/net/ipv6/udp.c
1826  @@ -50,6 +50,9 @@  @@ -50,6 +50,9 @@
1827   #include <net/inet_common.h>   #include <net/inet_common.h>
1828    
# Line 1855  Source code for this patch is http://www Line 1855  Source code for this patch is http://www
1855                          if (!udp_lport_inuse(result))                          if (!udp_lport_inuse(result))
1856                                  break;                                  break;
1857                  }                  }
1858  --- linux-2.4.37-rc1.orig/net/socket.c  --- linux-2.4.37-rc2.orig/net/socket.c
1859  +++ linux-2.4.37-rc1/net/socket.c  +++ linux-2.4.37-rc2/net/socket.c
1860  @@ -84,6 +84,10 @@  @@ -84,6 +84,10 @@
1861   #include <net/sock.h>   #include <net/sock.h>
1862   #include <net/scm.h>   #include <net/scm.h>
# Line 1946  Source code for this patch is http://www Line 1946  Source code for this patch is http://www
1946          err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen,          err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen,
1947                                   sock->file->f_flags);                                   sock->file->f_flags);
1948   out_put:   out_put:
1949  --- linux-2.4.37-rc1.orig/net/unix/af_unix.c  --- linux-2.4.37-rc2.orig/net/unix/af_unix.c
1950  +++ linux-2.4.37-rc1/net/unix/af_unix.c  +++ linux-2.4.37-rc2/net/unix/af_unix.c
1951  @@ -111,6 +111,9 @@  @@ -111,6 +111,9 @@
1952   #include <linux/rtnetlink.h>   #include <linux/rtnetlink.h>
1953    
Legend:
Removed from v.1768  
changed lines
  Added in v.1811
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
サイト情報
ソフトウェアを探す
ソフトウェアを作る
コミュニティ
ヘルプ