Open-Source-Software-Entwicklung und Downloads

TOMOYO

Browse Subversion Repository

/[tomoyo]/trunk/ccs-patch/ccs-patch-2.6.12-2.3.legacy_FC3.txt

Diff of /trunk/ccs-patch/ccs-patch-2.6.12-2.3.legacy_FC3.txt

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

revision 289 by kumaneko, Thu May 24 11:28:09 2007 UTC revision 290 by kumaneko, Tue Jul 10 11:52:21 2007 UTC
# Line 1  Line 1 
1  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/Makefile linux-2.6.12-2.3.legacy_FC3-ccs/Makefile  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/Makefile linux-2.6.12-2.3.legacy_FC3-ccs/Makefile
2  --- linux-2.6.12-2.3.legacy_FC3/Makefile        2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/Makefile        2007-07-10 14:37:25.000000000 +0900
3  +++ linux-2.6.12-2.3.legacy_FC3-ccs/Makefile    2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/Makefile    2007-07-10 14:37:31.000000000 +0900
4  @@ -1,7 +1,7 @@  @@ -1,7 +1,7 @@
5   VERSION = 2   VERSION = 2
6   PATCHLEVEL = 6   PATCHLEVEL = 6
# Line 11  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 11  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
11    
12   # *DOCUMENTATION*   # *DOCUMENTATION*
13  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/fs/Kconfig linux-2.6.12-2.3.legacy_FC3-ccs/fs/Kconfig  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/fs/Kconfig linux-2.6.12-2.3.legacy_FC3-ccs/fs/Kconfig
14  --- linux-2.6.12-2.3.legacy_FC3/fs/Kconfig      2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/fs/Kconfig      2007-07-10 14:37:25.000000000 +0900
15  +++ linux-2.6.12-2.3.legacy_FC3-ccs/fs/Kconfig  2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/fs/Kconfig  2007-07-10 14:37:31.000000000 +0900
16  @@ -1725,5 +1725,7 @@ endmenu  @@ -1725,5 +1725,7 @@ endmenu
17    
18   source "fs/nls/Kconfig"   source "fs/nls/Kconfig"
# Line 22  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 22  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
22   endmenu   endmenu
23    
24  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/fs/Makefile linux-2.6.12-2.3.legacy_FC3-ccs/fs/Makefile  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/fs/Makefile linux-2.6.12-2.3.legacy_FC3-ccs/fs/Makefile
25  --- linux-2.6.12-2.3.legacy_FC3/fs/Makefile     2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/fs/Makefile     2007-07-10 14:37:25.000000000 +0900
26  +++ linux-2.6.12-2.3.legacy_FC3-ccs/fs/Makefile 2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/fs/Makefile 2007-07-10 14:37:31.000000000 +0900
27  @@ -95,3 +95,5 @@ obj-$(CONFIG_BEFS_FS)         += befs/  @@ -95,3 +95,5 @@ obj-$(CONFIG_BEFS_FS)         += befs/
28   obj-$(CONFIG_HOSTFS)           += hostfs/   obj-$(CONFIG_HOSTFS)           += hostfs/
29   obj-$(CONFIG_HPPFS)            += hppfs/   obj-$(CONFIG_HPPFS)            += hppfs/
# Line 31  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 31  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
31  +  +
32  +include $(srctree)/fs/Makefile-2.6.ccs  +include $(srctree)/fs/Makefile-2.6.ccs
33  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/fs/attr.c linux-2.6.12-2.3.legacy_FC3-ccs/fs/attr.c  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/fs/attr.c linux-2.6.12-2.3.legacy_FC3-ccs/fs/attr.c
34  --- linux-2.6.12-2.3.legacy_FC3/fs/attr.c       2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/fs/attr.c       2007-07-10 14:37:25.000000000 +0900
35  +++ linux-2.6.12-2.3.legacy_FC3-ccs/fs/attr.c   2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/fs/attr.c   2007-07-10 14:37:31.000000000 +0900
36  @@ -15,6 +15,9 @@  @@ -15,6 +15,9 @@
37   #include <linux/quotaops.h>   #include <linux/quotaops.h>
38   #include <linux/security.h>   #include <linux/security.h>
# Line 65  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 65  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
65                          if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||                          if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
66                              (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))                              (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))
67  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/fs/compat.c linux-2.6.12-2.3.legacy_FC3-ccs/fs/compat.c  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/fs/compat.c linux-2.6.12-2.3.legacy_FC3-ccs/fs/compat.c
68  --- linux-2.6.12-2.3.legacy_FC3/fs/compat.c     2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/fs/compat.c     2007-07-10 14:37:25.000000000 +0900
69  +++ linux-2.6.12-2.3.legacy_FC3-ccs/fs/compat.c 2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/fs/compat.c 2007-07-10 14:37:31.000000000 +0900
70  @@ -50,6 +50,9 @@  @@ -50,6 +50,9 @@
71   #include <asm/uaccess.h>   #include <asm/uaccess.h>
72   #include <asm/mmu_context.h>   #include <asm/mmu_context.h>
# Line 97  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 97  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
97                  free_arg_pages(bprm);                  free_arg_pages(bprm);
98    
99  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/fs/exec.c linux-2.6.12-2.3.legacy_FC3-ccs/fs/exec.c  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/fs/exec.c linux-2.6.12-2.3.legacy_FC3-ccs/fs/exec.c
100  --- linux-2.6.12-2.3.legacy_FC3/fs/exec.c       2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/fs/exec.c       2007-07-10 14:37:25.000000000 +0900
101  +++ linux-2.6.12-2.3.legacy_FC3-ccs/fs/exec.c   2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/fs/exec.c   2007-07-10 14:37:31.000000000 +0900
102  @@ -56,6 +56,10 @@  @@ -56,6 +56,10 @@
103   #include <linux/kmod.h>   #include <linux/kmod.h>
104   #endif   #endif
# Line 143  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 143  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
143                  free_arg_pages(bprm);                  free_arg_pages(bprm);
144    
145  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/fs/fcntl.c linux-2.6.12-2.3.legacy_FC3-ccs/fs/fcntl.c  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/fs/fcntl.c linux-2.6.12-2.3.legacy_FC3-ccs/fs/fcntl.c
146  --- linux-2.6.12-2.3.legacy_FC3/fs/fcntl.c      2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/fs/fcntl.c      2007-07-10 14:37:25.000000000 +0900
147  +++ linux-2.6.12-2.3.legacy_FC3-ccs/fs/fcntl.c  2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/fs/fcntl.c  2007-07-10 14:37:31.000000000 +0900
148  @@ -20,6 +20,9 @@  @@ -20,6 +20,9 @@
149   #include <asm/poll.h>   #include <asm/poll.h>
150   #include <asm/siginfo.h>   #include <asm/siginfo.h>
# Line 167  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 167  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
167          if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))          if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))
168                  if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))                  if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
169  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/fs/ioctl.c linux-2.6.12-2.3.legacy_FC3-ccs/fs/ioctl.c  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/fs/ioctl.c linux-2.6.12-2.3.legacy_FC3-ccs/fs/ioctl.c
170  --- linux-2.6.12-2.3.legacy_FC3/fs/ioctl.c      2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/fs/ioctl.c      2007-07-10 14:37:25.000000000 +0900
171  +++ linux-2.6.12-2.3.legacy_FC3-ccs/fs/ioctl.c  2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/fs/ioctl.c  2007-07-10 14:37:31.000000000 +0900
172  @@ -15,6 +15,9 @@  @@ -15,6 +15,9 @@
173    
174   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 190  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 190  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
190          if (filp->f_op->unlocked_ioctl) {          if (filp->f_op->unlocked_ioctl) {
191                  error = filp->f_op->unlocked_ioctl(filp, cmd, arg);                  error = filp->f_op->unlocked_ioctl(filp, cmd, arg);
192  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/fs/namei.c linux-2.6.12-2.3.legacy_FC3-ccs/fs/namei.c  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/fs/namei.c linux-2.6.12-2.3.legacy_FC3-ccs/fs/namei.c
193  --- linux-2.6.12-2.3.legacy_FC3/fs/namei.c      2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/fs/namei.c      2007-07-10 14:37:25.000000000 +0900
194  +++ linux-2.6.12-2.3.legacy_FC3-ccs/fs/namei.c  2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/fs/namei.c  2007-07-10 14:37:31.000000000 +0900
195  @@ -33,6 +33,10 @@  @@ -33,6 +33,10 @@
196    
197   #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])   #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])
# Line 370  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 370  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
370          from = getname(oldname);          from = getname(oldname);
371          if(IS_ERR(from))          if(IS_ERR(from))
372  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/fs/namespace.c linux-2.6.12-2.3.legacy_FC3-ccs/fs/namespace.c  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/fs/namespace.c linux-2.6.12-2.3.legacy_FC3-ccs/fs/namespace.c
373  --- linux-2.6.12-2.3.legacy_FC3/fs/namespace.c  2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/fs/namespace.c  2007-07-10 14:37:25.000000000 +0900
374  +++ linux-2.6.12-2.3.legacy_FC3-ccs/fs/namespace.c      2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/fs/namespace.c      2007-07-10 14:37:31.000000000 +0900
375  @@ -24,6 +24,12 @@  @@ -24,6 +24,12 @@
376   #include <linux/mount.h>   #include <linux/mount.h>
377   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 486  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 486  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
486                  path_release(&old_nd);                  path_release(&old_nd);
487                  goto out1;                  goto out1;
488  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/fs/open.c linux-2.6.12-2.3.legacy_FC3-ccs/fs/open.c  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/fs/open.c linux-2.6.12-2.3.legacy_FC3-ccs/fs/open.c
489  --- linux-2.6.12-2.3.legacy_FC3/fs/open.c       2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/fs/open.c       2007-07-10 14:37:25.000000000 +0900
490  +++ linux-2.6.12-2.3.legacy_FC3-ccs/fs/open.c   2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/fs/open.c   2007-07-10 14:37:31.000000000 +0900
491  @@ -26,6 +26,13 @@  @@ -26,6 +26,13 @@
492    
493   #include <asm/unistd.h>   #include <asm/unistd.h>
# Line 546  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 546  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
546                  tty_vhangup(current->signal->tty);                  tty_vhangup(current->signal->tty);
547                  return 0;                  return 0;
548  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/fs/proc/Makefile linux-2.6.12-2.3.legacy_FC3-ccs/fs/proc/Makefile  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/fs/proc/Makefile linux-2.6.12-2.3.legacy_FC3-ccs/fs/proc/Makefile
549  --- linux-2.6.12-2.3.legacy_FC3/fs/proc/Makefile        2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/fs/proc/Makefile        2007-07-10 14:37:25.000000000 +0900
550  +++ linux-2.6.12-2.3.legacy_FC3-ccs/fs/proc/Makefile    2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/fs/proc/Makefile    2007-07-10 14:37:31.000000000 +0900
551  @@ -12,3 +12,6 @@ proc-y       += inode.o root.o base.o ge  @@ -12,3 +12,6 @@ proc-y       += inode.o root.o base.o ge
552    
553   proc-$(CONFIG_PROC_KCORE)      += kcore.o   proc-$(CONFIG_PROC_KCORE)      += kcore.o
# Line 556  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 556  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
556  +proc-$(CONFIG_SAKURA) += ccs_proc.o  +proc-$(CONFIG_SAKURA) += ccs_proc.o
557  +proc-$(CONFIG_TOMOYO) += ccs_proc.o  +proc-$(CONFIG_TOMOYO) += ccs_proc.o
558  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/fs/proc/proc_misc.c linux-2.6.12-2.3.legacy_FC3-ccs/fs/proc/proc_misc.c  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/fs/proc/proc_misc.c linux-2.6.12-2.3.legacy_FC3-ccs/fs/proc/proc_misc.c
559  --- linux-2.6.12-2.3.legacy_FC3/fs/proc/proc_misc.c     2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/fs/proc/proc_misc.c     2007-07-10 14:37:25.000000000 +0900
560  +++ linux-2.6.12-2.3.legacy_FC3-ccs/fs/proc/proc_misc.c 2007-05-25 02:19:36.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/fs/proc/proc_misc.c 2007-07-10 14:38:59.000000000 +0900
561  @@ -617,4 +617,13 @@ void __init proc_misc_init(void)  @@ -617,4 +617,13 @@ void __init proc_misc_init(void)
562                          entry->proc_fops = &ppc_htab_operations;                          entry->proc_fops = &ppc_htab_operations;
563          }          }
# Line 567  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 567  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
567  +       {  +       {
568  +               extern void CCSProc_Init(void);  +               extern void CCSProc_Init(void);
569  +               CCSProc_Init();  +               CCSProc_Init();
570  +               printk("Hook version: 2.6.12-2.3.legacy_FC3 2007/05/24\n");  +               printk("Hook version: 2.6.12-2.3.legacy_FC3 2007/07/10\n");
571  +       }  +       }
572  +#endif  +#endif
573  +       /***** CCS end. *****/  +       /***** CCS end. *****/
574   }   }
575  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/include/linux/init_task.h linux-2.6.12-2.3.legacy_FC3-ccs/include/linux/init_task.h  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/include/linux/init_task.h linux-2.6.12-2.3.legacy_FC3-ccs/include/linux/init_task.h
576  --- linux-2.6.12-2.3.legacy_FC3/include/linux/init_task.h       2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/include/linux/init_task.h       2007-07-10 14:37:25.000000000 +0900
577  +++ linux-2.6.12-2.3.legacy_FC3-ccs/include/linux/init_task.h   2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/include/linux/init_task.h   2007-07-10 14:37:31.000000000 +0900
578  @@ -111,6 +111,10 @@ extern struct group_info init_groups;  @@ -111,6 +111,10 @@ extern struct group_info init_groups;
579          .switch_lock    = SPIN_LOCK_UNLOCKED,                           \          .switch_lock    = SPIN_LOCK_UNLOCKED,                           \
580          .journal_info   = NULL,                                         \          .journal_info   = NULL,                                         \
# Line 587  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 587  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
587    
588    
589  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/include/linux/sched.h linux-2.6.12-2.3.legacy_FC3-ccs/include/linux/sched.h  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/include/linux/sched.h linux-2.6.12-2.3.legacy_FC3-ccs/include/linux/sched.h
590  --- linux-2.6.12-2.3.legacy_FC3/include/linux/sched.h   2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/include/linux/sched.h   2007-07-10 14:37:25.000000000 +0900
591  +++ linux-2.6.12-2.3.legacy_FC3-ccs/include/linux/sched.h       2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/include/linux/sched.h       2007-07-10 14:37:31.000000000 +0900
592  @@ -39,6 +39,11 @@ struct exec_domain;  @@ -39,6 +39,11 @@ struct exec_domain;
593   extern int exec_shield;   extern int exec_shield;
594   extern int print_fatal_signals;   extern int print_fatal_signals;
# Line 612  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 612  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
612   };   };
613    
614   static inline pid_t process_group(struct task_struct *tsk)   static inline pid_t process_group(struct task_struct *tsk)
615    diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/kernel/compat.c linux-2.6.12-2.3.legacy_FC3-ccs/kernel/compat.c
616    --- linux-2.6.12-2.3.legacy_FC3/kernel/compat.c 2005-06-18 04:48:29.000000000 +0900
617    +++ linux-2.6.12-2.3.legacy_FC3-ccs/kernel/compat.c     2007-07-10 14:37:57.000000000 +0900
618    @@ -24,6 +24,9 @@
619    
620     #include <asm/uaccess.h>
621     #include <asm/bug.h>
622    +/***** TOMOYO Linux start. *****/
623    +#include <linux/tomoyo.h>
624    +/***** TOMOYO Linux end. *****/
625    
626     int get_compat_timespec(struct timespec *ts, const struct compat_timespec __user *cts)
627     {
628    @@ -852,6 +855,9 @@ asmlinkage long compat_sys_stime(compat_
629            err = security_settime(&tv, NULL);
630            if (err)
631                    return err;
632    +       /***** TOMOYO Linux start. *****/
633    +       if (CheckCapabilityACL(TOMOYO_SYS_SETTIME)) return -EPERM;
634    +       /***** TOMOYO Linux end. *****/
635    
636            do_settimeofday(&tv);
637            return 0;
638  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/kernel/kmod.c linux-2.6.12-2.3.legacy_FC3-ccs/kernel/kmod.c  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/kernel/kmod.c linux-2.6.12-2.3.legacy_FC3-ccs/kernel/kmod.c
639  --- linux-2.6.12-2.3.legacy_FC3/kernel/kmod.c   2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/kernel/kmod.c   2007-07-10 14:37:25.000000000 +0900
640  +++ linux-2.6.12-2.3.legacy_FC3-ccs/kernel/kmod.c       2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/kernel/kmod.c       2007-07-10 14:37:31.000000000 +0900
641  @@ -139,6 +139,11 @@ int __exec_usermodehelper(char *path, ch  @@ -139,6 +139,11 @@ int __exec_usermodehelper(char *path, ch
642          recalc_sigpending();          recalc_sigpending();
643          spin_unlock_irq(&current->sighand->siglock);          spin_unlock_irq(&current->sighand->siglock);
# Line 628  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 651  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
651          if (current->fs->root)          if (current->fs->root)
652                  retval = execve(path, argv, envp);                  retval = execve(path, argv, envp);
653  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/kernel/module.c linux-2.6.12-2.3.legacy_FC3-ccs/kernel/module.c  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/kernel/module.c linux-2.6.12-2.3.legacy_FC3-ccs/kernel/module.c
654  --- linux-2.6.12-2.3.legacy_FC3/kernel/module.c 2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/kernel/module.c 2007-07-10 14:37:25.000000000 +0900
655  +++ linux-2.6.12-2.3.legacy_FC3-ccs/kernel/module.c     2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/kernel/module.c     2007-07-10 14:37:31.000000000 +0900
656  @@ -39,6 +39,9 @@  @@ -39,6 +39,9 @@
657   #include <asm/semaphore.h>   #include <asm/semaphore.h>
658   #include <asm/cacheflush.h>   #include <asm/cacheflush.h>
# Line 663  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 686  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
686          if (down_interruptible(&module_mutex) != 0)          if (down_interruptible(&module_mutex) != 0)
687                  return -EINTR;                  return -EINTR;
688  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/kernel/sched.c linux-2.6.12-2.3.legacy_FC3-ccs/kernel/sched.c  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/kernel/sched.c linux-2.6.12-2.3.legacy_FC3-ccs/kernel/sched.c
689  --- linux-2.6.12-2.3.legacy_FC3/kernel/sched.c  2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/kernel/sched.c  2007-07-10 14:37:25.000000000 +0900
690  +++ linux-2.6.12-2.3.legacy_FC3-ccs/kernel/sched.c      2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/kernel/sched.c      2007-07-10 14:37:31.000000000 +0900
691  @@ -50,6 +50,9 @@  @@ -50,6 +50,9 @@
692   #include <asm/tlb.h>   #include <asm/tlb.h>
693    
# Line 686  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 709  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
709          /*          /*
710           * Setpriority might change our priority at the same moment.           * Setpriority might change our priority at the same moment.
711  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/kernel/signal.c linux-2.6.12-2.3.legacy_FC3-ccs/kernel/signal.c  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/kernel/signal.c linux-2.6.12-2.3.legacy_FC3-ccs/kernel/signal.c
712  --- linux-2.6.12-2.3.legacy_FC3/kernel/signal.c 2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/kernel/signal.c 2007-07-10 14:37:25.000000000 +0900
713  +++ linux-2.6.12-2.3.legacy_FC3-ccs/kernel/signal.c     2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/kernel/signal.c     2007-07-10 14:37:31.000000000 +0900
714  @@ -29,6 +29,9 @@  @@ -29,6 +29,9 @@
715   #include <asm/uaccess.h>   #include <asm/uaccess.h>
716   #include <asm/unistd.h>   #include <asm/unistd.h>
# Line 733  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 756  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
756          info.si_errno = 0;          info.si_errno = 0;
757          info.si_code = SI_TKILL;          info.si_code = SI_TKILL;
758  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/kernel/sys.c linux-2.6.12-2.3.legacy_FC3-ccs/kernel/sys.c  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/kernel/sys.c linux-2.6.12-2.3.legacy_FC3-ccs/kernel/sys.c
759  --- linux-2.6.12-2.3.legacy_FC3/kernel/sys.c    2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/kernel/sys.c    2007-07-10 14:37:25.000000000 +0900
760  +++ linux-2.6.12-2.3.legacy_FC3-ccs/kernel/sys.c        2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/kernel/sys.c        2007-07-10 14:37:31.000000000 +0900
761  @@ -33,6 +33,9 @@  @@ -33,6 +33,9 @@
762   #include <asm/uaccess.h>   #include <asm/uaccess.h>
763   #include <asm/io.h>   #include <asm/io.h>
# Line 786  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 809  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
809          down_write(&uts_sem);          down_write(&uts_sem);
810          errno = -EFAULT;          errno = -EFAULT;
811  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/kernel/sysctl.c linux-2.6.12-2.3.legacy_FC3-ccs/kernel/sysctl.c  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/kernel/sysctl.c linux-2.6.12-2.3.legacy_FC3-ccs/kernel/sysctl.c
812  --- linux-2.6.12-2.3.legacy_FC3/kernel/sysctl.c 2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/kernel/sysctl.c 2007-07-10 14:37:25.000000000 +0900
813  +++ linux-2.6.12-2.3.legacy_FC3-ccs/kernel/sysctl.c     2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/kernel/sysctl.c     2007-07-10 14:37:31.000000000 +0900
814  @@ -44,6 +44,9 @@  @@ -44,6 +44,9 @@
815    
816   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 919  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 942  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
942    
943   /*   /*
944  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/kernel/time.c linux-2.6.12-2.3.legacy_FC3-ccs/kernel/time.c  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/kernel/time.c linux-2.6.12-2.3.legacy_FC3-ccs/kernel/time.c
945  --- linux-2.6.12-2.3.legacy_FC3/kernel/time.c   2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/kernel/time.c   2007-07-10 14:37:25.000000000 +0900
946  +++ linux-2.6.12-2.3.legacy_FC3-ccs/kernel/time.c       2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/kernel/time.c       2007-07-10 14:37:31.000000000 +0900
947  @@ -38,6 +38,9 @@  @@ -38,6 +38,9 @@
948    
949   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 962  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 985  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
985          /* Now we validate the data before disabling interrupts */          /* Now we validate the data before disabling interrupts */
986    
987  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/net/ipv4/tcp_ipv4.c linux-2.6.12-2.3.legacy_FC3-ccs/net/ipv4/tcp_ipv4.c  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/net/ipv4/tcp_ipv4.c linux-2.6.12-2.3.legacy_FC3-ccs/net/ipv4/tcp_ipv4.c
988  --- linux-2.6.12-2.3.legacy_FC3/net/ipv4/tcp_ipv4.c     2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/net/ipv4/tcp_ipv4.c     2007-07-10 14:37:25.000000000 +0900
989  +++ linux-2.6.12-2.3.legacy_FC3-ccs/net/ipv4/tcp_ipv4.c 2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/net/ipv4/tcp_ipv4.c 2007-07-10 14:37:31.000000000 +0900
990  @@ -74,6 +74,9 @@  @@ -74,6 +74,9 @@
991   #include <linux/stddef.h>   #include <linux/stddef.h>
992   #include <linux/proc_fs.h>   #include <linux/proc_fs.h>
# Line 995  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 1018  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
1018                          spin_lock(&head->lock);                          spin_lock(&head->lock);
1019    
1020  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/net/ipv4/udp.c linux-2.6.12-2.3.legacy_FC3-ccs/net/ipv4/udp.c  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/net/ipv4/udp.c linux-2.6.12-2.3.legacy_FC3-ccs/net/ipv4/udp.c
1021  --- linux-2.6.12-2.3.legacy_FC3/net/ipv4/udp.c  2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/net/ipv4/udp.c  2007-07-10 14:37:25.000000000 +0900
1022  +++ linux-2.6.12-2.3.legacy_FC3-ccs/net/ipv4/udp.c      2007-05-25 02:19:23.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/net/ipv4/udp.c      2007-07-10 14:37:31.000000000 +0900
1023  @@ -107,6 +107,9 @@  @@ -107,6 +107,9 @@
1024   #include <net/inet_common.h>   #include <net/inet_common.h>
1025   #include <net/checksum.h>   #include <net/checksum.h>
# Line 1028  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 1051  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
1051                                  break;                                  break;
1052                  }                  }
1053  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/net/ipv6/tcp_ipv6.c linux-2.6.12-2.3.legacy_FC3-ccs/net/ipv6/tcp_ipv6.c  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/net/ipv6/tcp_ipv6.c linux-2.6.12-2.3.legacy_FC3-ccs/net/ipv6/tcp_ipv6.c
1054  --- linux-2.6.12-2.3.legacy_FC3/net/ipv6/tcp_ipv6.c     2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/net/ipv6/tcp_ipv6.c     2007-07-10 14:37:25.000000000 +0900
1055  +++ linux-2.6.12-2.3.legacy_FC3-ccs/net/ipv6/tcp_ipv6.c 2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/net/ipv6/tcp_ipv6.c 2007-07-10 14:37:31.000000000 +0900
1056  @@ -63,6 +63,9 @@  @@ -63,6 +63,9 @@
1057    
1058   #include <linux/proc_fs.h>   #include <linux/proc_fs.h>
# Line 1061  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 1084  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
1084                          spin_lock(&head->lock);                          spin_lock(&head->lock);
1085    
1086  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/net/ipv6/udp.c linux-2.6.12-2.3.legacy_FC3-ccs/net/ipv6/udp.c  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/net/ipv6/udp.c linux-2.6.12-2.3.legacy_FC3-ccs/net/ipv6/udp.c
1087  --- linux-2.6.12-2.3.legacy_FC3/net/ipv6/udp.c  2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/net/ipv6/udp.c  2007-07-10 14:37:25.000000000 +0900
1088  +++ linux-2.6.12-2.3.legacy_FC3-ccs/net/ipv6/udp.c      2007-05-26 04:18:13.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/net/ipv6/udp.c      2007-07-10 14:37:31.000000000 +0900
1089  @@ -57,6 +57,9 @@  @@ -57,6 +57,9 @@
1090    
1091   #include <linux/proc_fs.h>   #include <linux/proc_fs.h>
# Line 1094  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 1117  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
1117                                  break;                                  break;
1118                  }                  }
1119  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/net/socket.c linux-2.6.12-2.3.legacy_FC3-ccs/net/socket.c  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/net/socket.c linux-2.6.12-2.3.legacy_FC3-ccs/net/socket.c
1120  --- linux-2.6.12-2.3.legacy_FC3/net/socket.c    2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/net/socket.c    2007-07-10 14:37:25.000000000 +0900
1121  +++ linux-2.6.12-2.3.legacy_FC3-ccs/net/socket.c        2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/net/socket.c        2007-07-10 14:37:31.000000000 +0900
1122  @@ -96,6 +96,11 @@  @@ -96,6 +96,11 @@
1123   #include <net/sock.h>   #include <net/sock.h>
1124   #include <linux/netfilter.h>   #include <linux/netfilter.h>
# Line 1188  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3 Line 1211  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3
1211                                   sock->file->f_flags);                                   sock->file->f_flags);
1212   out_put:   out_put:
1213  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/net/unix/af_unix.c linux-2.6.12-2.3.legacy_FC3-ccs/net/unix/af_unix.c  diff -ubBpEr linux-2.6.12-2.3.legacy_FC3/net/unix/af_unix.c linux-2.6.12-2.3.legacy_FC3-ccs/net/unix/af_unix.c
1214  --- linux-2.6.12-2.3.legacy_FC3/net/unix/af_unix.c      2007-05-25 02:18:54.000000000 +0900  --- linux-2.6.12-2.3.legacy_FC3/net/unix/af_unix.c      2007-07-10 14:37:25.000000000 +0900
1215  +++ linux-2.6.12-2.3.legacy_FC3-ccs/net/unix/af_unix.c  2007-05-25 02:19:01.000000000 +0900  +++ linux-2.6.12-2.3.legacy_FC3-ccs/net/unix/af_unix.c  2007-07-10 14:37:31.000000000 +0900
1216  @@ -117,6 +117,9 @@  @@ -117,6 +117,9 @@
1217   #include <linux/mount.h>   #include <linux/mount.h>
1218   #include <net/checksum.h>   #include <net/checksum.h>
Legend:
Removed from v.289  
changed lines
  Added in v.290
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
Über OSDN
Software suchen
Entwickeln Software
Hilfeseiten