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

TOMOYO

Subversion リポジトリの参照

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

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

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

trunk/1.5.x/ccs-patch/patches/ccs-patch-2.6.21.txt revision 559 by kumaneko, Fri Oct 12 08:48:41 2007 UTC trunk/1.5.x/ccs-patch/patches/ccs-patch-2.6.21.diff revision 862 by kumaneko, Fri Jan 4 07:56:57 2008 UTC
# Line 1  Line 1 
1  diff -ubBpEr linux-2.6.21/Makefile linux-2.6.21-ccs/Makefile  ---
2  --- linux-2.6.21/Makefile       2007-04-28 04:02:41.000000000 +0900   Makefile                        |    2
3  +++ linux-2.6.21-ccs/Makefile   2007-04-26 17:11:12.000000000 +0900   fs/Kconfig                      |    2
4     fs/Makefile                     |    2
5     fs/attr.c                       |   11 +++++
6     fs/compat.c                     |    8 +++
7     fs/exec.c                       |   14 ++++++
8     fs/fcntl.c                      |    7 +++
9     fs/ioctl.c                      |    6 ++
10     fs/namei.c                      |   60 +++++++++++++++++++++++++++++
11     fs/namespace.c                  |   38 ++++++++++++++++++
12     fs/open.c                       |   21 ++++++++++
13     fs/proc/Makefile                |    3 +
14     fs/proc/proc_misc.c             |    9 ++++
15     include/linux/init_task.h       |    4 +
16     include/linux/sched.h           |    9 ++++
17     kernel/compat.c                 |    6 ++
18     kernel/kexec.c                  |    6 ++
19     kernel/kmod.c                   |    5 ++
20     kernel/module.c                 |    9 ++++
21     kernel/sched.c                  |    6 ++
22     kernel/signal.c                 |   15 +++++++
23     kernel/sys.c                    |   15 +++++++
24     kernel/sysctl.c                 |   81 ++++++++++++++++++++++++++++++++++++++++
25     kernel/time.c                   |    9 ++++
26     kernel/time/ntp.c               |    6 ++
27     net/core/datagram.c             |    9 ++++
28     net/ipv4/inet_connection_sock.c |    6 ++
29     net/ipv4/inet_hashtables.c      |    6 ++
30     net/ipv4/udp.c                  |    9 ++++
31     net/ipv6/inet6_hashtables.c     |    6 ++
32     net/socket.c                    |   28 +++++++++++++
33     net/unix/af_unix.c              |   10 ++++
34     32 files changed, 425 insertions(+), 3 deletions(-)
35    
36    --- linux-2.6.21.orig/Makefile
37    +++ linux-2.6.21/Makefile
38  @@ -1,7 +1,7 @@  @@ -1,7 +1,7 @@
39   VERSION = 2   VERSION = 2
40   PATCHLEVEL = 6   PATCHLEVEL = 6
# Line 10  diff -ubBpEr linux-2.6.21/Makefile linux Line 44  diff -ubBpEr linux-2.6.21/Makefile linux
44   NAME = Nocturnal Monster Puppy   NAME = Nocturnal Monster Puppy
45    
46   # *DOCUMENTATION*   # *DOCUMENTATION*
47  diff -ubBpEr linux-2.6.21/fs/Kconfig linux-2.6.21-ccs/fs/Kconfig  --- linux-2.6.21.orig/fs/Kconfig
48  --- linux-2.6.21/fs/Kconfig     2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/fs/Kconfig
 +++ linux-2.6.21-ccs/fs/Kconfig 2007-04-26 17:17:25.000000000 +0900  
49  @@ -2055,5 +2055,7 @@ endif  @@ -2055,5 +2055,7 @@ endif
50   source "fs/nls/Kconfig"   source "fs/nls/Kconfig"
51   source "fs/dlm/Kconfig"   source "fs/dlm/Kconfig"
# Line 21  diff -ubBpEr linux-2.6.21/fs/Kconfig lin Line 54  diff -ubBpEr linux-2.6.21/fs/Kconfig lin
54  +  +
55   endmenu   endmenu
56    
57  diff -ubBpEr linux-2.6.21/fs/Makefile linux-2.6.21-ccs/fs/Makefile  --- linux-2.6.21.orig/fs/Makefile
58  --- linux-2.6.21/fs/Makefile    2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/fs/Makefile
 +++ linux-2.6.21-ccs/fs/Makefile        2007-04-28 04:02:47.000000000 +0900  
59  @@ -114,3 +114,5 @@ obj-$(CONFIG_HPPFS)         += hppfs/  @@ -114,3 +114,5 @@ obj-$(CONFIG_HPPFS)         += hppfs/
60   obj-$(CONFIG_DEBUG_FS)         += debugfs/   obj-$(CONFIG_DEBUG_FS)         += debugfs/
61   obj-$(CONFIG_OCFS2_FS)         += ocfs2/   obj-$(CONFIG_OCFS2_FS)         += ocfs2/
62   obj-$(CONFIG_GFS2_FS)           += gfs2/   obj-$(CONFIG_GFS2_FS)           += gfs2/
63  +  +
64  +include $(srctree)/fs/Makefile-2.6.ccs  +include $(srctree)/fs/Makefile-2.6.ccs
65  diff -ubBpEr linux-2.6.21/fs/attr.c linux-2.6.21-ccs/fs/attr.c  --- linux-2.6.21.orig/fs/attr.c
66  --- linux-2.6.21/fs/attr.c      2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/fs/attr.c
 +++ linux-2.6.21-ccs/fs/attr.c  2007-04-28 04:02:47.000000000 +0900  
67  @@ -15,6 +15,9 @@  @@ -15,6 +15,9 @@
68   #include <linux/fcntl.h>   #include <linux/fcntl.h>
69   #include <linux/quotaops.h>   #include <linux/quotaops.h>
# Line 64  diff -ubBpEr linux-2.6.21/fs/attr.c linu Line 95  diff -ubBpEr linux-2.6.21/fs/attr.c linu
95                  if (!error) {                  if (!error) {
96                          if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||                          if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
97                              (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))                              (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))
98  diff -ubBpEr linux-2.6.21/fs/compat.c linux-2.6.21-ccs/fs/compat.c  --- linux-2.6.21.orig/fs/compat.c
99  --- linux-2.6.21/fs/compat.c    2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/fs/compat.c
 +++ linux-2.6.21-ccs/fs/compat.c        2007-04-28 04:02:47.000000000 +0900  
100  @@ -56,6 +56,9 @@  @@ -56,6 +56,9 @@
101   #include <asm/mmu_context.h>   #include <asm/mmu_context.h>
102   #include <asm/ioctls.h>   #include <asm/ioctls.h>
# Line 96  diff -ubBpEr linux-2.6.21/fs/compat.c li Line 126  diff -ubBpEr linux-2.6.21/fs/compat.c li
126          if (retval >= 0) {          if (retval >= 0) {
127                  free_arg_pages(bprm);                  free_arg_pages(bprm);
128    
129  diff -ubBpEr linux-2.6.21/fs/exec.c linux-2.6.21-ccs/fs/exec.c  --- linux-2.6.21.orig/fs/exec.c
130  --- linux-2.6.21/fs/exec.c      2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/fs/exec.c
 +++ linux-2.6.21-ccs/fs/exec.c  2007-04-28 04:02:47.000000000 +0900  
131  @@ -58,6 +58,10 @@  @@ -58,6 +58,10 @@
132   #include <linux/kmod.h>   #include <linux/kmod.h>
133   #endif   #endif
# Line 141  diff -ubBpEr linux-2.6.21/fs/exec.c linu Line 170  diff -ubBpEr linux-2.6.21/fs/exec.c linu
170          if (retval >= 0) {          if (retval >= 0) {
171                  free_arg_pages(bprm);                  free_arg_pages(bprm);
172    
173  diff -ubBpEr linux-2.6.21/fs/fcntl.c linux-2.6.21-ccs/fs/fcntl.c  --- linux-2.6.21.orig/fs/fcntl.c
174  --- linux-2.6.21/fs/fcntl.c     2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/fs/fcntl.c
 +++ linux-2.6.21-ccs/fs/fcntl.c 2007-04-28 04:02:47.000000000 +0900  
175  @@ -22,6 +22,9 @@  @@ -22,6 +22,9 @@
176   #include <asm/poll.h>   #include <asm/poll.h>
177   #include <asm/siginfo.h>   #include <asm/siginfo.h>
# Line 165  diff -ubBpEr linux-2.6.21/fs/fcntl.c lin Line 193  diff -ubBpEr linux-2.6.21/fs/fcntl.c lin
193          /* O_NOATIME can only be set by the owner or superuser */          /* O_NOATIME can only be set by the owner or superuser */
194          if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))          if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))
195                  if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))                  if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
196  diff -ubBpEr linux-2.6.21/fs/ioctl.c linux-2.6.21-ccs/fs/ioctl.c  --- linux-2.6.21.orig/fs/ioctl.c
197  --- linux-2.6.21/fs/ioctl.c     2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/fs/ioctl.c
 +++ linux-2.6.21-ccs/fs/ioctl.c 2007-04-28 04:02:47.000000000 +0900  
198  @@ -15,6 +15,9 @@  @@ -15,6 +15,9 @@
199    
200   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 188  diff -ubBpEr linux-2.6.21/fs/ioctl.c lin Line 215  diff -ubBpEr linux-2.6.21/fs/ioctl.c lin
215    
216          if (filp->f_op->unlocked_ioctl) {          if (filp->f_op->unlocked_ioctl) {
217                  error = filp->f_op->unlocked_ioctl(filp, cmd, arg);                  error = filp->f_op->unlocked_ioctl(filp, cmd, arg);
218  diff -ubBpEr linux-2.6.21/fs/namei.c linux-2.6.21-ccs/fs/namei.c  --- linux-2.6.21.orig/fs/namei.c
219  --- linux-2.6.21/fs/namei.c     2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/fs/namei.c
 +++ linux-2.6.21-ccs/fs/namei.c 2007-04-28 04:02:47.000000000 +0900  
220  @@ -37,6 +37,10 @@  @@ -37,6 +37,10 @@
221    
222   #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])   #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])
# Line 367  diff -ubBpEr linux-2.6.21/fs/namei.c lin Line 393  diff -ubBpEr linux-2.6.21/fs/namei.c lin
393    
394          from = getname(oldname);          from = getname(oldname);
395          if(IS_ERR(from))          if(IS_ERR(from))
396  diff -ubBpEr linux-2.6.21/fs/namespace.c linux-2.6.21-ccs/fs/namespace.c  --- linux-2.6.21.orig/fs/namespace.c
397  --- linux-2.6.21/fs/namespace.c 2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/fs/namespace.c
 +++ linux-2.6.21-ccs/fs/namespace.c     2007-09-05 14:52:13.677479112 +0900  
398  @@ -28,6 +28,12 @@  @@ -28,6 +28,12 @@
399   #include <asm/uaccess.h>   #include <asm/uaccess.h>
400   #include <asm/unistd.h>   #include <asm/unistd.h>
# Line 471  diff -ubBpEr linux-2.6.21/fs/namespace.c Line 496  diff -ubBpEr linux-2.6.21/fs/namespace.c
496          if (error) {          if (error) {
497                  path_release(&old_nd);                  path_release(&old_nd);
498                  goto out1;                  goto out1;
499  diff -ubBpEr linux-2.6.21/fs/open.c linux-2.6.21-ccs/fs/open.c  --- linux-2.6.21.orig/fs/open.c
500  --- linux-2.6.21/fs/open.c      2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/fs/open.c
 +++ linux-2.6.21-ccs/fs/open.c  2007-04-28 04:02:47.000000000 +0900  
501  @@ -27,6 +27,12 @@  @@ -27,6 +27,12 @@
502   #include <linux/syscalls.h>   #include <linux/syscalls.h>
503   #include <linux/rcupdate.h>   #include <linux/rcupdate.h>
# Line 530  diff -ubBpEr linux-2.6.21/fs/open.c linu Line 554  diff -ubBpEr linux-2.6.21/fs/open.c linu
554          if (capable(CAP_SYS_TTY_CONFIG)) {          if (capable(CAP_SYS_TTY_CONFIG)) {
555                  /* XXX: this needs locking */                  /* XXX: this needs locking */
556                  tty_vhangup(current->signal->tty);                  tty_vhangup(current->signal->tty);
557  diff -ubBpEr linux-2.6.21/fs/proc/Makefile linux-2.6.21-ccs/fs/proc/Makefile  --- linux-2.6.21.orig/fs/proc/Makefile
558  --- linux-2.6.21/fs/proc/Makefile       2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/fs/proc/Makefile
 +++ linux-2.6.21-ccs/fs/proc/Makefile   2007-04-28 04:02:47.000000000 +0900  
559  @@ -15,3 +15,6 @@ proc-$(CONFIG_PROC_KCORE)     += kcore.o  @@ -15,3 +15,6 @@ proc-$(CONFIG_PROC_KCORE)     += kcore.o
560   proc-$(CONFIG_PROC_VMCORE)     += vmcore.o   proc-$(CONFIG_PROC_VMCORE)     += vmcore.o
561   proc-$(CONFIG_PROC_DEVICETREE) += proc_devtree.o   proc-$(CONFIG_PROC_DEVICETREE) += proc_devtree.o
# Line 540  diff -ubBpEr linux-2.6.21/fs/proc/Makefi Line 563  diff -ubBpEr linux-2.6.21/fs/proc/Makefi
563  +  +
564  +proc-$(CONFIG_SAKURA) += ccs_proc.o  +proc-$(CONFIG_SAKURA) += ccs_proc.o
565  +proc-$(CONFIG_TOMOYO) += ccs_proc.o  +proc-$(CONFIG_TOMOYO) += ccs_proc.o
566  diff -ubBpEr linux-2.6.21/fs/proc/proc_misc.c linux-2.6.21-ccs/fs/proc/proc_misc.c  --- linux-2.6.21.orig/fs/proc/proc_misc.c
567  --- linux-2.6.21/fs/proc/proc_misc.c    2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/fs/proc/proc_misc.c
 +++ linux-2.6.21-ccs/fs/proc/proc_misc.c        2007-09-05 14:49:39.022990168 +0900  
568  @@ -747,4 +747,13 @@ void __init proc_misc_init(void)  @@ -747,4 +747,13 @@ void __init proc_misc_init(void)
569                          entry->proc_fops = &proc_sysrq_trigger_operations;                          entry->proc_fops = &proc_sysrq_trigger_operations;
570          }          }
# Line 557  diff -ubBpEr linux-2.6.21/fs/proc/proc_m Line 579  diff -ubBpEr linux-2.6.21/fs/proc/proc_m
579  +#endif  +#endif
580  +       /***** CCS end. *****/  +       /***** CCS end. *****/
581   }   }
582  diff -ubBpEr linux-2.6.21/include/linux/init_task.h linux-2.6.21-ccs/include/linux/init_task.h  --- linux-2.6.21.orig/include/linux/init_task.h
583  --- linux-2.6.21/include/linux/init_task.h      2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/include/linux/init_task.h
 +++ linux-2.6.21-ccs/include/linux/init_task.h  2007-04-28 04:02:47.000000000 +0900  
584  @@ -141,6 +141,10 @@ extern struct group_info init_groups;  @@ -141,6 +141,10 @@ extern struct group_info init_groups;
585          .pi_lock        = SPIN_LOCK_UNLOCKED,                           \          .pi_lock        = SPIN_LOCK_UNLOCKED,                           \
586          INIT_TRACE_IRQFLAGS                                             \          INIT_TRACE_IRQFLAGS                                             \
# Line 571  diff -ubBpEr linux-2.6.21/include/linux/ Line 592  diff -ubBpEr linux-2.6.21/include/linux/
592   }   }
593    
594    
595  diff -ubBpEr linux-2.6.21/include/linux/sched.h linux-2.6.21-ccs/include/linux/sched.h  --- linux-2.6.21.orig/include/linux/sched.h
596  --- linux-2.6.21/include/linux/sched.h  2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/include/linux/sched.h
 +++ linux-2.6.21-ccs/include/linux/sched.h      2007-04-28 04:02:47.000000000 +0900  
597  @@ -27,6 +27,11 @@  @@ -27,6 +27,11 @@
598   #define CLONE_NEWUTS           0x04000000      /* New utsname group? */   #define CLONE_NEWUTS           0x04000000      /* New utsname group? */
599   #define CLONE_NEWIPC           0x08000000      /* New ipcs */   #define CLONE_NEWIPC           0x08000000      /* New ipcs */
# Line 597  diff -ubBpEr linux-2.6.21/include/linux/ Line 617  diff -ubBpEr linux-2.6.21/include/linux/
617   };   };
618    
619   static inline pid_t process_group(struct task_struct *tsk)   static inline pid_t process_group(struct task_struct *tsk)
620  diff -ubBpEr linux-2.6.21/kernel/compat.c linux-2.6.21-ccs/kernel/compat.c  --- linux-2.6.21.orig/kernel/compat.c
621  --- linux-2.6.21/kernel/compat.c        2007-04-26 12:08:32.000000000 +0900  +++ linux-2.6.21/kernel/compat.c
 +++ linux-2.6.21-ccs/kernel/compat.c    2007-07-10 09:02:19.000000000 +0900  
622  @@ -25,6 +25,9 @@  @@ -25,6 +25,9 @@
623   #include <linux/posix-timers.h>   #include <linux/posix-timers.h>
624    
# Line 620  diff -ubBpEr linux-2.6.21/kernel/compat. Line 639  diff -ubBpEr linux-2.6.21/kernel/compat.
639    
640          do_settimeofday(&tv);          do_settimeofday(&tv);
641          return 0;          return 0;
642  diff -ubBpEr linux-2.6.21/kernel/kexec.c linux-2.6.21-ccs/kernel/kexec.c  --- linux-2.6.21.orig/kernel/kexec.c
643  --- linux-2.6.21/kernel/kexec.c 2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/kernel/kexec.c
 +++ linux-2.6.21-ccs/kernel/kexec.c     2007-04-28 04:02:47.000000000 +0900  
644  @@ -28,6 +28,9 @@  @@ -28,6 +28,9 @@
645   #include <asm/io.h>   #include <asm/io.h>
646   #include <asm/system.h>   #include <asm/system.h>
# Line 643  diff -ubBpEr linux-2.6.21/kernel/kexec.c Line 661  diff -ubBpEr linux-2.6.21/kernel/kexec.c
661    
662          /*          /*
663           * Verify we have a legal set of flags           * Verify we have a legal set of flags
664  diff -ubBpEr linux-2.6.21/kernel/kmod.c linux-2.6.21-ccs/kernel/kmod.c  --- linux-2.6.21.orig/kernel/kmod.c
665  --- linux-2.6.21/kernel/kmod.c  2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/kernel/kmod.c
 +++ linux-2.6.21-ccs/kernel/kmod.c      2007-05-16 14:30:01.000000000 +0900  
666  @@ -166,6 +166,11 @@ static int ____call_usermodehelper(void  @@ -166,6 +166,11 @@ static int ____call_usermodehelper(void
667          /* We can run anywhere, unlike our parent keventd(). */          /* We can run anywhere, unlike our parent keventd(). */
668          set_cpus_allowed(current, CPU_MASK_ALL);          set_cpus_allowed(current, CPU_MASK_ALL);
# Line 658  diff -ubBpEr linux-2.6.21/kernel/kmod.c Line 675  diff -ubBpEr linux-2.6.21/kernel/kmod.c
675          retval = -EPERM;          retval = -EPERM;
676          if (current->fs->root)          if (current->fs->root)
677                  retval = kernel_execve(sub_info->path,                  retval = kernel_execve(sub_info->path,
678  diff -ubBpEr linux-2.6.21/kernel/module.c linux-2.6.21-ccs/kernel/module.c  --- linux-2.6.21.orig/kernel/module.c
679  --- linux-2.6.21/kernel/module.c        2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/kernel/module.c
 +++ linux-2.6.21-ccs/kernel/module.c    2007-04-28 04:02:47.000000000 +0900  
680  @@ -44,6 +44,9 @@  @@ -44,6 +44,9 @@
681   #include <asm/semaphore.h>   #include <asm/semaphore.h>
682   #include <asm/cacheflush.h>   #include <asm/cacheflush.h>
# Line 691  diff -ubBpEr linux-2.6.21/kernel/module. Line 707  diff -ubBpEr linux-2.6.21/kernel/module.
707    
708          /* Only one module load at a time, please */          /* Only one module load at a time, please */
709          if (mutex_lock_interruptible(&module_mutex) != 0)          if (mutex_lock_interruptible(&module_mutex) != 0)
710  diff -ubBpEr linux-2.6.21/kernel/sched.c linux-2.6.21-ccs/kernel/sched.c  --- linux-2.6.21.orig/kernel/sched.c
711  --- linux-2.6.21/kernel/sched.c 2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/kernel/sched.c
 +++ linux-2.6.21-ccs/kernel/sched.c     2007-04-28 04:02:47.000000000 +0900  
712  @@ -55,6 +55,9 @@  @@ -55,6 +55,9 @@
713   #include <asm/tlb.h>   #include <asm/tlb.h>
714    
# Line 714  diff -ubBpEr linux-2.6.21/kernel/sched.c Line 729  diff -ubBpEr linux-2.6.21/kernel/sched.c
729    
730          /*          /*
731           * Setpriority might change our priority at the same moment.           * Setpriority might change our priority at the same moment.
732  diff -ubBpEr linux-2.6.21/kernel/signal.c linux-2.6.21-ccs/kernel/signal.c  --- linux-2.6.21.orig/kernel/signal.c
733  --- linux-2.6.21/kernel/signal.c        2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/kernel/signal.c
 +++ linux-2.6.21-ccs/kernel/signal.c    2007-04-28 04:02:47.000000000 +0900  
734  @@ -32,6 +32,9 @@  @@ -32,6 +32,9 @@
735   #include <asm/unistd.h>   #include <asm/unistd.h>
736   #include <asm/siginfo.h>   #include <asm/siginfo.h>
# Line 760  diff -ubBpEr linux-2.6.21/kernel/signal. Line 774  diff -ubBpEr linux-2.6.21/kernel/signal.
774    
775          return do_tkill(0, pid, sig);          return do_tkill(0, pid, sig);
776   }   }
777  diff -ubBpEr linux-2.6.21/kernel/sys.c linux-2.6.21-ccs/kernel/sys.c  --- linux-2.6.21.orig/kernel/sys.c
778  --- linux-2.6.21/kernel/sys.c   2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/kernel/sys.c
 +++ linux-2.6.21-ccs/kernel/sys.c       2007-04-28 04:02:47.000000000 +0900  
779  @@ -37,6 +37,9 @@  @@ -37,6 +37,9 @@
780   #include <asm/uaccess.h>   #include <asm/uaccess.h>
781   #include <asm/io.h>   #include <asm/io.h>
# Line 813  diff -ubBpEr linux-2.6.21/kernel/sys.c l Line 826  diff -ubBpEr linux-2.6.21/kernel/sys.c l
826    
827          down_write(&uts_sem);          down_write(&uts_sem);
828          errno = -EFAULT;          errno = -EFAULT;
829  diff -ubBpEr linux-2.6.21/kernel/sysctl.c linux-2.6.21-ccs/kernel/sysctl.c  --- linux-2.6.21.orig/kernel/sysctl.c
830  --- linux-2.6.21/kernel/sysctl.c        2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/kernel/sysctl.c
 +++ linux-2.6.21-ccs/kernel/sysctl.c    2007-04-28 04:02:47.000000000 +0900  
831  @@ -48,6 +48,9 @@  @@ -48,6 +48,9 @@
832    
833   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 918  diff -ubBpEr linux-2.6.21/kernel/sysctl. Line 930  diff -ubBpEr linux-2.6.21/kernel/sysctl.
930                  error = parse_table(name, nlen, oldval, oldlenp,                  error = parse_table(name, nlen, oldval, oldlenp,
931                                          newval, newlen, head->ctl_table);                                          newval, newlen, head->ctl_table);
932                  if (error != -ENOTDIR) {                  if (error != -ENOTDIR) {
933  diff -ubBpEr linux-2.6.21/kernel/time/ntp.c linux-2.6.21-ccs/kernel/time/ntp.c  --- linux-2.6.21.orig/kernel/time.c
934  --- linux-2.6.21/kernel/time/ntp.c      2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/kernel/time.c
 +++ linux-2.6.21-ccs/kernel/time/ntp.c  2007-04-28 04:02:47.000000000 +0900  
 @@ -14,6 +14,9 @@  
   
  #include <asm/div64.h>  
  #include <asm/timex.h>  
 +/***** TOMOYO Linux start. *****/  
 +#include <linux/tomoyo.h>  
 +/***** TOMOYO Linux end. *****/  
   
  /*  
   * Timekeeping variables  
 @@ -203,6 +206,9 @@ int do_adjtimex(struct timex *txc)  
         /* In order to modify anything, you gotta be super-user! */  
         if (txc->modes && !capable(CAP_SYS_TIME))  
                 return -EPERM;  
 +       /***** TOMOYO Linux start. *****/  
 +       if (txc->modes && CheckCapabilityACL(TOMOYO_SYS_SETTIME)) return -EPERM;  
 +       /***** TOMOYO Linux end. *****/  
   
         /* Now we validate the data before disabling interrupts */  
   
 diff -ubBpEr linux-2.6.21/kernel/time.c linux-2.6.21-ccs/kernel/time.c  
 --- linux-2.6.21/kernel/time.c  2007-04-28 04:02:41.000000000 +0900  
 +++ linux-2.6.21-ccs/kernel/time.c      2007-04-28 04:02:47.000000000 +0900  
935  @@ -39,6 +39,9 @@  @@ -39,6 +39,9 @@
936    
937   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 974  diff -ubBpEr linux-2.6.21/kernel/time.c Line 962  diff -ubBpEr linux-2.6.21/kernel/time.c
962    
963          if (tz) {          if (tz) {
964                  /* SMP safe, global irq locking makes it work. */                  /* SMP safe, global irq locking makes it work. */
965  diff -ubBpEr linux-2.6.21/net/core/datagram.c linux-2.6.21-ccs/net/core/datagram.c  --- linux-2.6.21.orig/kernel/time/ntp.c
966  --- linux-2.6.21/net/core/datagram.c    2007-04-26 12:08:32.000000000 +0900  +++ linux-2.6.21/kernel/time/ntp.c
967  +++ linux-2.6.21-ccs/net/core/datagram.c        2007-09-05 14:46:28.016027640 +0900  @@ -14,6 +14,9 @@
968    
969     #include <asm/div64.h>
970     #include <asm/timex.h>
971    +/***** TOMOYO Linux start. *****/
972    +#include <linux/tomoyo.h>
973    +/***** TOMOYO Linux end. *****/
974    
975     /*
976      * Timekeeping variables
977    @@ -203,6 +206,9 @@ int do_adjtimex(struct timex *txc)
978            /* In order to modify anything, you gotta be super-user! */
979            if (txc->modes && !capable(CAP_SYS_TIME))
980                    return -EPERM;
981    +       /***** TOMOYO Linux start. *****/
982    +       if (txc->modes && CheckCapabilityACL(TOMOYO_SYS_SETTIME)) return -EPERM;
983    +       /***** TOMOYO Linux end. *****/
984    
985            /* Now we validate the data before disabling interrupts */
986    
987    --- linux-2.6.21.orig/net/core/datagram.c
988    +++ linux-2.6.21/net/core/datagram.c
989  @@ -56,6 +56,11 @@  @@ -56,6 +56,11 @@
990   #include <net/sock.h>   #include <net/sock.h>
991   #include <net/tcp_states.h>   #include <net/tcp_states.h>
# Line 1000  diff -ubBpEr linux-2.6.21/net/core/datag Line 1009  diff -ubBpEr linux-2.6.21/net/core/datag
1009                  if (skb)                  if (skb)
1010                          return skb;                          return skb;
1011    
1012  diff -ubBpEr linux-2.6.21/net/ipv4/inet_connection_sock.c linux-2.6.21-ccs/net/ipv4/inet_connection_sock.c  --- linux-2.6.21.orig/net/ipv4/inet_connection_sock.c
1013  --- linux-2.6.21/net/ipv4/inet_connection_sock.c        2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/net/ipv4/inet_connection_sock.c
 +++ linux-2.6.21-ccs/net/ipv4/inet_connection_sock.c    2007-04-28 04:02:47.000000000 +0900  
1014  @@ -23,6 +23,9 @@  @@ -23,6 +23,9 @@
1015   #include <net/route.h>   #include <net/route.h>
1016   #include <net/tcp_states.h>   #include <net/tcp_states.h>
# Line 1023  diff -ubBpEr linux-2.6.21/net/ipv4/inet_ Line 1031  diff -ubBpEr linux-2.6.21/net/ipv4/inet_
1031                          inet_bind_bucket_for_each(tb, node, &head->chain)                          inet_bind_bucket_for_each(tb, node, &head->chain)
1032                                  if (tb->port == rover)                                  if (tb->port == rover)
1033                                          goto next;                                          goto next;
1034  diff -ubBpEr linux-2.6.21/net/ipv4/inet_hashtables.c linux-2.6.21-ccs/net/ipv4/inet_hashtables.c  --- linux-2.6.21.orig/net/ipv4/inet_hashtables.c
1035  --- linux-2.6.21/net/ipv4/inet_hashtables.c     2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/net/ipv4/inet_hashtables.c
 +++ linux-2.6.21-ccs/net/ipv4/inet_hashtables.c 2007-04-28 04:02:47.000000000 +0900  
1036  @@ -22,6 +22,9 @@  @@ -22,6 +22,9 @@
1037   #include <net/inet_connection_sock.h>   #include <net/inet_connection_sock.h>
1038   #include <net/inet_hashtables.h>   #include <net/inet_hashtables.h>
# Line 1046  diff -ubBpEr linux-2.6.21/net/ipv4/inet_ Line 1053  diff -ubBpEr linux-2.6.21/net/ipv4/inet_
1053                          head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];                          head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];
1054                          spin_lock(&head->lock);                          spin_lock(&head->lock);
1055    
1056  diff -ubBpEr linux-2.6.21/net/ipv4/udp.c linux-2.6.21-ccs/net/ipv4/udp.c  --- linux-2.6.21.orig/net/ipv4/udp.c
1057  --- linux-2.6.21/net/ipv4/udp.c 2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/net/ipv4/udp.c
 +++ linux-2.6.21-ccs/net/ipv4/udp.c     2007-08-15 16:15:01.000000000 +0900  
1058  @@ -102,6 +102,9 @@  @@ -102,6 +102,9 @@
1059   #include <net/checksum.h>   #include <net/checksum.h>
1060   #include <net/xfrm.h>   #include <net/xfrm.h>
# Line 1079  diff -ubBpEr linux-2.6.21/net/ipv4/udp.c Line 1085  diff -ubBpEr linux-2.6.21/net/ipv4/udp.c
1085                          if (! __udp_lib_lport_inuse(result, udptable))                          if (! __udp_lib_lport_inuse(result, udptable))
1086                                  break;                                  break;
1087                  }                  }
1088  diff -ubBpEr linux-2.6.21/net/ipv6/inet6_hashtables.c linux-2.6.21-ccs/net/ipv6/inet6_hashtables.c  --- linux-2.6.21.orig/net/ipv6/inet6_hashtables.c
1089  --- linux-2.6.21/net/ipv6/inet6_hashtables.c    2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/net/ipv6/inet6_hashtables.c
 +++ linux-2.6.21-ccs/net/ipv6/inet6_hashtables.c        2007-04-28 04:02:47.000000000 +0900  
1090  @@ -21,6 +21,9 @@  @@ -21,6 +21,9 @@
1091   #include <net/inet_hashtables.h>   #include <net/inet_hashtables.h>
1092   #include <net/inet6_hashtables.h>   #include <net/inet6_hashtables.h>
# Line 1102  diff -ubBpEr linux-2.6.21/net/ipv6/inet6 Line 1107  diff -ubBpEr linux-2.6.21/net/ipv6/inet6
1107                          head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];                          head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)];
1108                          spin_lock(&head->lock);                          spin_lock(&head->lock);
1109    
1110  diff -ubBpEr linux-2.6.21/net/socket.c linux-2.6.21-ccs/net/socket.c  --- linux-2.6.21.orig/net/socket.c
1111  --- linux-2.6.21/net/socket.c   2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/net/socket.c
 +++ linux-2.6.21-ccs/net/socket.c       2007-08-27 16:06:11.000000000 +0900  
1112  @@ -93,6 +93,11 @@  @@ -93,6 +93,11 @@
1113   #include <net/sock.h>   #include <net/sock.h>
1114   #include <linux/netfilter.h>   #include <linux/netfilter.h>
# Line 1182  diff -ubBpEr linux-2.6.21/net/socket.c l Line 1186  diff -ubBpEr linux-2.6.21/net/socket.c l
1186    
1187          err = sock->ops->connect(sock, (struct sockaddr *)address, addrlen,          err = sock->ops->connect(sock, (struct sockaddr *)address, addrlen,
1188                                   sock->file->f_flags);                                   sock->file->f_flags);
1189  diff -ubBpEr linux-2.6.21/net/unix/af_unix.c linux-2.6.21-ccs/net/unix/af_unix.c  --- linux-2.6.21.orig/net/unix/af_unix.c
1190  --- linux-2.6.21/net/unix/af_unix.c     2007-04-28 04:02:41.000000000 +0900  +++ linux-2.6.21/net/unix/af_unix.c
 +++ linux-2.6.21-ccs/net/unix/af_unix.c 2007-04-28 04:02:47.000000000 +0900  
1191  @@ -116,6 +116,9 @@  @@ -116,6 +116,9 @@
1192   #include <linux/mount.h>   #include <linux/mount.h>
1193   #include <net/checksum.h>   #include <net/checksum.h>
Legend:
Removed from v.559  
changed lines
  Added in v.862
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
サイト情報
ソフトウェアを探す
ソフトウェアを作る
コミュニティ
ヘルプ