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

TOMOYO

Subversion リポジトリの参照

/[tomoyo]/trunk/1.6.x/ccs-patch/patches/ccs-patch-2.6.27-fedora-10.diff

Diff of /trunk/1.6.x/ccs-patch/patches/ccs-patch-2.6.27-fedora-10.diff

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

revision 2940 by kumaneko, Thu Aug 20 06:56:14 2009 UTC revision 2941 by kumaneko, Sun Aug 23 12:35:02 2009 UTC
# Line 1  Line 1 
1  This is TOMOYO Linux patch for Fedora 10.  This is TOMOYO Linux patch for Fedora 10.
2    
3  Source code for this patch is http://ftp.riken.jp/Linux/fedora/updates/10/SRPMS/kernel-2.6.27.29-170.2.79.fc10.src.rpm  Source code for this patch is http://ftp.riken.jp/Linux/fedora/updates/10/SRPMS/kernel-2.6.27.30-170.2.82.fc10.src.rpm
4  ---  ---
5   arch/ia64/ia32/sys_ia32.c       |    7 ++++   arch/ia64/ia32/sys_ia32.c       |    7 ++++
6   arch/mips/kernel/ptrace32.c     |    7 ++++   arch/mips/kernel/ptrace32.c     |    7 ++++
# Line 40  Source code for this patch is http://ftp Line 40  Source code for this patch is http://ftp
40   net/unix/af_unix.c              |    8 +++++   net/unix/af_unix.c              |    8 +++++
41   36 files changed, 465 insertions(+), 2 deletions(-)   36 files changed, 465 insertions(+), 2 deletions(-)
42    
43  --- linux-2.6.27.29-170.2.79.fc10.orig/arch/ia64/ia32/sys_ia32.c  --- linux-2.6.27.30-170.2.82.fc10.orig/arch/ia64/ia32/sys_ia32.c
44  +++ linux-2.6.27.29-170.2.79.fc10/arch/ia64/ia32/sys_ia32.c  +++ linux-2.6.27.30-170.2.82.fc10/arch/ia64/ia32/sys_ia32.c
45  @@ -51,6 +51,9 @@  @@ -51,6 +51,9 @@
46   #include <asm/types.h>   #include <asm/types.h>
47   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 63  Source code for this patch is http://ftp Line 63  Source code for this patch is http://ftp
63    
64          lock_kernel();          lock_kernel();
65          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
66  --- linux-2.6.27.29-170.2.79.fc10.orig/arch/mips/kernel/ptrace32.c  --- linux-2.6.27.30-170.2.82.fc10.orig/arch/mips/kernel/ptrace32.c
67  +++ linux-2.6.27.29-170.2.79.fc10/arch/mips/kernel/ptrace32.c  +++ linux-2.6.27.30-170.2.82.fc10/arch/mips/kernel/ptrace32.c
68  @@ -35,6 +35,9 @@  @@ -35,6 +35,9 @@
69   #include <asm/system.h>   #include <asm/system.h>
70   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 86  Source code for this patch is http://ftp Line 86  Source code for this patch is http://ftp
86    
87   #if 0   #if 0
88          printk("ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n",          printk("ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n",
89  --- linux-2.6.27.29-170.2.79.fc10.orig/fs/Kconfig  --- linux-2.6.27.30-170.2.82.fc10.orig/fs/Kconfig
90  +++ linux-2.6.27.29-170.2.79.fc10/fs/Kconfig  +++ linux-2.6.27.30-170.2.82.fc10/fs/Kconfig
91  @@ -2157,4 +2157,6 @@ endif  @@ -2157,4 +2157,6 @@ endif
92   source "fs/nls/Kconfig"   source "fs/nls/Kconfig"
93   source "fs/dlm/Kconfig"   source "fs/dlm/Kconfig"
# Line 95  Source code for this patch is http://ftp Line 95  Source code for this patch is http://ftp
95  +source "fs/Kconfig.ccs"  +source "fs/Kconfig.ccs"
96  +  +
97   endmenu   endmenu
98  --- linux-2.6.27.29-170.2.79.fc10.orig/fs/Makefile  --- linux-2.6.27.30-170.2.82.fc10.orig/fs/Makefile
99  +++ linux-2.6.27.29-170.2.79.fc10/fs/Makefile  +++ linux-2.6.27.30-170.2.82.fc10/fs/Makefile
100  @@ -123,3 +123,5 @@ obj-$(CONFIG_HPPFS)         += hppfs/  @@ -123,3 +123,5 @@ obj-$(CONFIG_HPPFS)         += hppfs/
101   obj-$(CONFIG_DEBUG_FS)         += debugfs/   obj-$(CONFIG_DEBUG_FS)         += debugfs/
102   obj-$(CONFIG_OCFS2_FS)         += ocfs2/   obj-$(CONFIG_OCFS2_FS)         += ocfs2/
103   obj-$(CONFIG_GFS2_FS)           += gfs2/   obj-$(CONFIG_GFS2_FS)           += gfs2/
104  +  +
105  +include $(srctree)/fs/Makefile-2.6.ccs  +include $(srctree)/fs/Makefile-2.6.ccs
106  --- linux-2.6.27.29-170.2.79.fc10.orig/fs/attr.c  --- linux-2.6.27.30-170.2.82.fc10.orig/fs/attr.c
107  +++ linux-2.6.27.29-170.2.79.fc10/fs/attr.c  +++ linux-2.6.27.30-170.2.82.fc10/fs/attr.c
108  @@ -14,6 +14,9 @@  @@ -14,6 +14,9 @@
109   #include <linux/fcntl.h>   #include <linux/fcntl.h>
110   #include <linux/quotaops.h>   #include <linux/quotaops.h>
# Line 144  Source code for this patch is http://ftp Line 144  Source code for this patch is http://ftp
144                  if (!error) {                  if (!error) {
145                          if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||                          if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
146                              (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))                              (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))
147  --- linux-2.6.27.29-170.2.79.fc10.orig/fs/compat.c  --- linux-2.6.27.30-170.2.82.fc10.orig/fs/compat.c
148  +++ linux-2.6.27.29-170.2.79.fc10/fs/compat.c  +++ linux-2.6.27.30-170.2.82.fc10/fs/compat.c
149  @@ -56,6 +56,9 @@  @@ -56,6 +56,9 @@
150   #include <asm/mmu_context.h>   #include <asm/mmu_context.h>
151   #include <asm/ioctls.h>   #include <asm/ioctls.h>
# Line 165  Source code for this patch is http://ftp Line 165  Source code for this patch is http://ftp
165          if (retval >= 0) {          if (retval >= 0) {
166                  /* execve success */                  /* execve success */
167                  security_bprm_free(bprm);                  security_bprm_free(bprm);
168  --- linux-2.6.27.29-170.2.79.fc10.orig/fs/compat_ioctl.c  --- linux-2.6.27.30-170.2.82.fc10.orig/fs/compat_ioctl.c
169  +++ linux-2.6.27.29-170.2.79.fc10/fs/compat_ioctl.c  +++ linux-2.6.27.30-170.2.82.fc10/fs/compat_ioctl.c
170  @@ -113,6 +113,9 @@  @@ -113,6 +113,9 @@
171   #ifdef CONFIG_SPARC   #ifdef CONFIG_SPARC
172   #include <asm/fbio.h>   #include <asm/fbio.h>
# Line 201  Source code for this patch is http://ftp Line 201  Source code for this patch is http://ftp
201                  if (filp->f_op && filp->f_op->compat_ioctl) {                  if (filp->f_op && filp->f_op->compat_ioctl) {
202                          error = filp->f_op->compat_ioctl(filp, cmd, arg);                          error = filp->f_op->compat_ioctl(filp, cmd, arg);
203                          if (error != -ENOIOCTLCMD)                          if (error != -ENOIOCTLCMD)
204  --- linux-2.6.27.29-170.2.79.fc10.orig/fs/exec.c  --- linux-2.6.27.30-170.2.82.fc10.orig/fs/exec.c
205  +++ linux-2.6.27.29-170.2.79.fc10/fs/exec.c  +++ linux-2.6.27.30-170.2.82.fc10/fs/exec.c
206  @@ -64,6 +64,10 @@  @@ -64,6 +64,10 @@
207   #include <linux/a.out.h>   #include <linux/a.out.h>
208   #endif   #endif
# Line 247  Source code for this patch is http://ftp Line 247  Source code for this patch is http://ftp
247          if (retval >= 0) {          if (retval >= 0) {
248                  /* execve success */                  /* execve success */
249                  security_bprm_free(bprm);                  security_bprm_free(bprm);
250  --- linux-2.6.27.29-170.2.79.fc10.orig/fs/fcntl.c  --- linux-2.6.27.30-170.2.82.fc10.orig/fs/fcntl.c
251  +++ linux-2.6.27.29-170.2.79.fc10/fs/fcntl.c  +++ linux-2.6.27.30-170.2.82.fc10/fs/fcntl.c
252  @@ -24,6 +24,9 @@  @@ -24,6 +24,9 @@
253   #include <asm/poll.h>   #include <asm/poll.h>
254   #include <asm/siginfo.h>   #include <asm/siginfo.h>
# Line 272  Source code for this patch is http://ftp Line 272  Source code for this patch is http://ftp
272          /* O_NOATIME can only be set by the owner or superuser */          /* O_NOATIME can only be set by the owner or superuser */
273          if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))          if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))
274                  if (!is_owner_or_cap(inode))                  if (!is_owner_or_cap(inode))
275  --- linux-2.6.27.29-170.2.79.fc10.orig/fs/ioctl.c  --- linux-2.6.27.30-170.2.82.fc10.orig/fs/ioctl.c
276  +++ linux-2.6.27.29-170.2.79.fc10/fs/ioctl.c  +++ linux-2.6.27.30-170.2.82.fc10/fs/ioctl.c
277  @@ -15,6 +15,9 @@  @@ -15,6 +15,9 @@
278   #include <linux/uaccess.h>   #include <linux/uaccess.h>
279    
# Line 306  Source code for this patch is http://ftp Line 306  Source code for this patch is http://ftp
306          if (error)          if (error)
307                  goto out_fput;                  goto out_fput;
308    
309  --- linux-2.6.27.29-170.2.79.fc10.orig/fs/namei.c  --- linux-2.6.27.30-170.2.82.fc10.orig/fs/namei.c
310  +++ linux-2.6.27.29-170.2.79.fc10/fs/namei.c  +++ linux-2.6.27.30-170.2.82.fc10/fs/namei.c
311  @@ -35,6 +35,10 @@  @@ -35,6 +35,10 @@
312    
313   #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])   #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])
# Line 442  Source code for this patch is http://ftp Line 442  Source code for this patch is http://ftp
442          error = vfs_rename(old_dir->d_inode, old_dentry,          error = vfs_rename(old_dir->d_inode, old_dentry,
443                                     new_dir->d_inode, new_dentry);                                     new_dir->d_inode, new_dentry);
444          mnt_drop_write(oldnd.path.mnt);          mnt_drop_write(oldnd.path.mnt);
445  --- linux-2.6.27.29-170.2.79.fc10.orig/fs/namespace.c  --- linux-2.6.27.30-170.2.82.fc10.orig/fs/namespace.c
446  +++ linux-2.6.27.29-170.2.79.fc10/fs/namespace.c  +++ linux-2.6.27.30-170.2.82.fc10/fs/namespace.c
447  @@ -31,6 +31,12 @@  @@ -31,6 +31,12 @@
448   #include <asm/unistd.h>   #include <asm/unistd.h>
449   #include "pnode.h"   #include "pnode.h"
# Line 556  Source code for this patch is http://ftp Line 556  Source code for this patch is http://ftp
556          if (error) {          if (error) {
557                  path_put(&old);                  path_put(&old);
558                  goto out1;                  goto out1;
559  --- linux-2.6.27.29-170.2.79.fc10.orig/fs/open.c  --- linux-2.6.27.30-170.2.82.fc10.orig/fs/open.c
560  +++ linux-2.6.27.29-170.2.79.fc10/fs/open.c  +++ linux-2.6.27.30-170.2.82.fc10/fs/open.c
561  @@ -29,6 +29,12 @@  @@ -29,6 +29,12 @@
562   #include <linux/rcupdate.h>   #include <linux/rcupdate.h>
563   #include <linux/audit.h>   #include <linux/audit.h>
# Line 622  Source code for this patch is http://ftp Line 622  Source code for this patch is http://ftp
622          if (capable(CAP_SYS_TTY_CONFIG)) {          if (capable(CAP_SYS_TTY_CONFIG)) {
623                  /* XXX: this needs locking */                  /* XXX: this needs locking */
624                  tty_vhangup(current->signal->tty);                  tty_vhangup(current->signal->tty);
625  --- linux-2.6.27.29-170.2.79.fc10.orig/fs/proc/Makefile  --- linux-2.6.27.30-170.2.82.fc10.orig/fs/proc/Makefile
626  +++ linux-2.6.27.29-170.2.79.fc10/fs/proc/Makefile  +++ linux-2.6.27.30-170.2.82.fc10/fs/proc/Makefile
627  @@ -16,3 +16,6 @@ proc-$(CONFIG_PROC_KCORE)     += kcore.o  @@ -16,3 +16,6 @@ proc-$(CONFIG_PROC_KCORE)     += kcore.o
628   proc-$(CONFIG_PROC_VMCORE)     += vmcore.o   proc-$(CONFIG_PROC_VMCORE)     += vmcore.o
629   proc-$(CONFIG_PROC_DEVICETREE) += proc_devtree.o   proc-$(CONFIG_PROC_DEVICETREE) += proc_devtree.o
# Line 631  Source code for this patch is http://ftp Line 631  Source code for this patch is http://ftp
631  +  +
632  +proc-$(CONFIG_SAKURA) += ccs_proc.o  +proc-$(CONFIG_SAKURA) += ccs_proc.o
633  +proc-$(CONFIG_TOMOYO) += ccs_proc.o  +proc-$(CONFIG_TOMOYO) += ccs_proc.o
634  --- linux-2.6.27.29-170.2.79.fc10.orig/fs/proc/proc_misc.c  --- linux-2.6.27.30-170.2.82.fc10.orig/fs/proc/proc_misc.c
635  +++ linux-2.6.27.29-170.2.79.fc10/fs/proc/proc_misc.c  +++ linux-2.6.27.30-170.2.82.fc10/fs/proc/proc_misc.c
636  @@ -934,4 +934,9 @@ void __init proc_misc_init(void)  @@ -934,4 +934,9 @@ void __init proc_misc_init(void)
637   #ifdef CONFIG_MAGIC_SYSRQ   #ifdef CONFIG_MAGIC_SYSRQ
638          proc_create("sysrq-trigger", S_IWUSR, NULL, &proc_sysrq_trigger_operations);          proc_create("sysrq-trigger", S_IWUSR, NULL, &proc_sysrq_trigger_operations);
639   #endif   #endif
640  +       /***** CCS start. *****/  +       /***** CCS start. *****/
641  +#if defined(CONFIG_SAKURA) || defined(CONFIG_TOMOYO)  +#if defined(CONFIG_SAKURA) || defined(CONFIG_TOMOYO)
642  +       printk(KERN_INFO "Hook version: 2.6.27.29-170.2.79.fc10 2009/08/20\n");  +       printk(KERN_INFO "Hook version: 2.6.27.30-170.2.82.fc10 2009/08/23\n");
643  +#endif  +#endif
644  +       /***** CCS end. *****/  +       /***** CCS end. *****/
645   }   }
646  --- linux-2.6.27.29-170.2.79.fc10.orig/include/linux/init_task.h  --- linux-2.6.27.30-170.2.82.fc10.orig/include/linux/init_task.h
647  +++ linux-2.6.27.29-170.2.79.fc10/include/linux/init_task.h  +++ linux-2.6.27.30-170.2.82.fc10/include/linux/init_task.h
648  @@ -179,6 +179,10 @@ extern struct group_info init_groups;  @@ -179,6 +179,10 @@ extern struct group_info init_groups;
649          INIT_IDS                                                        \          INIT_IDS                                                        \
650          INIT_TRACE_IRQFLAGS                                             \          INIT_TRACE_IRQFLAGS                                             \
# Line 656  Source code for this patch is http://ftp Line 656  Source code for this patch is http://ftp
656   }   }
657    
658    
659  --- linux-2.6.27.29-170.2.79.fc10.orig/include/linux/sched.h  --- linux-2.6.27.30-170.2.82.fc10.orig/include/linux/sched.h
660  +++ linux-2.6.27.29-170.2.79.fc10/include/linux/sched.h  +++ linux-2.6.27.30-170.2.82.fc10/include/linux/sched.h
661  @@ -29,6 +29,10 @@  @@ -29,6 +29,10 @@
662   #define CLONE_NEWNET           0x40000000      /* New network namespace */   #define CLONE_NEWNET           0x40000000      /* New network namespace */
663   #define CLONE_IO               0x80000000      /* Clone io context */   #define CLONE_IO               0x80000000      /* Clone io context */
# Line 680  Source code for this patch is http://ftp Line 680  Source code for this patch is http://ftp
680   };   };
681    
682   /*   /*
683  --- linux-2.6.27.29-170.2.79.fc10.orig/kernel/compat.c  --- linux-2.6.27.30-170.2.82.fc10.orig/kernel/compat.c
684  +++ linux-2.6.27.29-170.2.79.fc10/kernel/compat.c  +++ linux-2.6.27.30-170.2.82.fc10/kernel/compat.c
685  @@ -25,6 +25,9 @@  @@ -25,6 +25,9 @@
686   #include <linux/posix-timers.h>   #include <linux/posix-timers.h>
687    
# Line 703  Source code for this patch is http://ftp Line 703  Source code for this patch is http://ftp
703    
704          do_settimeofday(&tv);          do_settimeofday(&tv);
705          return 0;          return 0;
706  --- linux-2.6.27.29-170.2.79.fc10.orig/kernel/kexec.c  --- linux-2.6.27.30-170.2.82.fc10.orig/kernel/kexec.c
707  +++ linux-2.6.27.29-170.2.79.fc10/kernel/kexec.c  +++ linux-2.6.27.30-170.2.82.fc10/kernel/kexec.c
708  @@ -36,6 +36,9 @@  @@ -36,6 +36,9 @@
709   #include <asm/io.h>   #include <asm/io.h>
710   #include <asm/system.h>   #include <asm/system.h>
# Line 726  Source code for this patch is http://ftp Line 726  Source code for this patch is http://ftp
726    
727          /*          /*
728           * Verify we have a legal set of flags           * Verify we have a legal set of flags
729  --- linux-2.6.27.29-170.2.79.fc10.orig/kernel/kmod.c  --- linux-2.6.27.30-170.2.82.fc10.orig/kernel/kmod.c
730  +++ linux-2.6.27.29-170.2.79.fc10/kernel/kmod.c  +++ linux-2.6.27.30-170.2.82.fc10/kernel/kmod.c
731  @@ -174,6 +174,11 @@ static int ____call_usermodehelper(void  @@ -174,6 +174,11 @@ static int ____call_usermodehelper(void
732           */           */
733          set_user_nice(current, 0);          set_user_nice(current, 0);
# Line 740  Source code for this patch is http://ftp Line 740  Source code for this patch is http://ftp
740          retval = kernel_execve(sub_info->path, sub_info->argv, sub_info->envp);          retval = kernel_execve(sub_info->path, sub_info->argv, sub_info->envp);
741    
742          /* Exec failed? */          /* Exec failed? */
743  --- linux-2.6.27.29-170.2.79.fc10.orig/kernel/module.c  --- linux-2.6.27.30-170.2.82.fc10.orig/kernel/module.c
744  +++ linux-2.6.27.29-170.2.79.fc10/kernel/module.c  +++ linux-2.6.27.30-170.2.82.fc10/kernel/module.c
745  @@ -46,6 +46,9 @@  @@ -46,6 +46,9 @@
746   #include <asm/cacheflush.h>   #include <asm/cacheflush.h>
747   #include <linux/license.h>   #include <linux/license.h>
# Line 774  Source code for this patch is http://ftp Line 774  Source code for this patch is http://ftp
774    
775          /* Only one module load at a time, please */          /* Only one module load at a time, please */
776          if (mutex_lock_interruptible(&module_mutex) != 0)          if (mutex_lock_interruptible(&module_mutex) != 0)
777  --- linux-2.6.27.29-170.2.79.fc10.orig/kernel/ptrace.c  --- linux-2.6.27.30-170.2.82.fc10.orig/kernel/ptrace.c
778  +++ linux-2.6.27.29-170.2.79.fc10/kernel/ptrace.c  +++ linux-2.6.27.30-170.2.82.fc10/kernel/ptrace.c
779  @@ -25,6 +25,9 @@  @@ -25,6 +25,9 @@
780    
781   #include <asm/pgtable.h>   #include <asm/pgtable.h>
# Line 808  Source code for this patch is http://ftp Line 808  Source code for this patch is http://ftp
808          lock_kernel();          lock_kernel();
809          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
810                  ret = ptrace_traceme();                  ret = ptrace_traceme();
811  --- linux-2.6.27.29-170.2.79.fc10.orig/kernel/sched.c  --- linux-2.6.27.30-170.2.82.fc10.orig/kernel/sched.c
812  +++ linux-2.6.27.29-170.2.79.fc10/kernel/sched.c  +++ linux-2.6.27.30-170.2.82.fc10/kernel/sched.c
813  @@ -74,6 +74,9 @@  @@ -74,6 +74,9 @@
814    
815   #include <asm/tlb.h>   #include <asm/tlb.h>
# Line 831  Source code for this patch is http://ftp Line 831  Source code for this patch is http://ftp
831    
832          /*          /*
833           * Setpriority might change our priority at the same moment.           * Setpriority might change our priority at the same moment.
834  --- linux-2.6.27.29-170.2.79.fc10.orig/kernel/signal.c  --- linux-2.6.27.30-170.2.82.fc10.orig/kernel/signal.c
835  +++ linux-2.6.27.29-170.2.79.fc10/kernel/signal.c  +++ linux-2.6.27.30-170.2.82.fc10/kernel/signal.c
836  @@ -33,6 +33,9 @@  @@ -33,6 +33,9 @@
837   #include <asm/unistd.h>   #include <asm/unistd.h>
838   #include <asm/siginfo.h>   #include <asm/siginfo.h>
# Line 882  Source code for this patch is http://ftp Line 882  Source code for this patch is http://ftp
882    
883          return do_tkill(0, pid, sig);          return do_tkill(0, pid, sig);
884   }   }
885  --- linux-2.6.27.29-170.2.79.fc10.orig/kernel/sys.c  --- linux-2.6.27.30-170.2.82.fc10.orig/kernel/sys.c
886  +++ linux-2.6.27.29-170.2.79.fc10/kernel/sys.c  +++ linux-2.6.27.30-170.2.82.fc10/kernel/sys.c
887  @@ -42,6 +42,9 @@  @@ -42,6 +42,9 @@
888   #include <asm/uaccess.h>   #include <asm/uaccess.h>
889   #include <asm/io.h>   #include <asm/io.h>
# Line 940  Source code for this patch is http://ftp Line 940  Source code for this patch is http://ftp
940    
941          down_write(&uts_sem);          down_write(&uts_sem);
942          errno = -EFAULT;          errno = -EFAULT;
943  --- linux-2.6.27.29-170.2.79.fc10.orig/kernel/sysctl.c  --- linux-2.6.27.30-170.2.82.fc10.orig/kernel/sysctl.c
944  +++ linux-2.6.27.29-170.2.79.fc10/kernel/sysctl.c  +++ linux-2.6.27.30-170.2.82.fc10/kernel/sysctl.c
945  @@ -51,6 +51,9 @@  @@ -51,6 +51,9 @@
946    
947   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 964  Source code for this patch is http://ftp Line 964  Source code for this patch is http://ftp
964                  error = parse_table(name, nlen, oldval, oldlenp,                  error = parse_table(name, nlen, oldval, oldlenp,
965                                          newval, newlen,                                          newval, newlen,
966                                          head->root, head->ctl_table);                                          head->root, head->ctl_table);
967  --- linux-2.6.27.29-170.2.79.fc10.orig/kernel/time.c  --- linux-2.6.27.30-170.2.82.fc10.orig/kernel/time.c
968  +++ linux-2.6.27.29-170.2.79.fc10/kernel/time.c  +++ linux-2.6.27.30-170.2.82.fc10/kernel/time.c
969  @@ -40,6 +40,9 @@  @@ -40,6 +40,9 @@
970    
971   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 998  Source code for this patch is http://ftp Line 998  Source code for this patch is http://ftp
998    
999          if (tz) {          if (tz) {
1000                  /* SMP safe, global irq locking makes it work. */                  /* SMP safe, global irq locking makes it work. */
1001  --- linux-2.6.27.29-170.2.79.fc10.orig/kernel/time/ntp.c  --- linux-2.6.27.30-170.2.82.fc10.orig/kernel/time/ntp.c
1002  +++ linux-2.6.27.29-170.2.79.fc10/kernel/time/ntp.c  +++ linux-2.6.27.30-170.2.82.fc10/kernel/time/ntp.c
1003  @@ -18,6 +18,9 @@  @@ -18,6 +18,9 @@
1004   #include <linux/math64.h>   #include <linux/math64.h>
1005   #include <linux/clocksource.h>   #include <linux/clocksource.h>
# Line 1021  Source code for this patch is http://ftp Line 1021  Source code for this patch is http://ftp
1021    
1022          /* Now we validate the data before disabling interrupts */          /* Now we validate the data before disabling interrupts */
1023    
1024  --- linux-2.6.27.29-170.2.79.fc10.orig/net/ipv4/inet_connection_sock.c  --- linux-2.6.27.30-170.2.82.fc10.orig/net/ipv4/inet_connection_sock.c
1025  +++ linux-2.6.27.29-170.2.79.fc10/net/ipv4/inet_connection_sock.c  +++ linux-2.6.27.30-170.2.82.fc10/net/ipv4/inet_connection_sock.c
1026  @@ -23,6 +23,9 @@  @@ -23,6 +23,9 @@
1027   #include <net/route.h>   #include <net/route.h>
1028   #include <net/tcp_states.h>   #include <net/tcp_states.h>
# Line 1044  Source code for this patch is http://ftp Line 1044  Source code for this patch is http://ftp
1044                          inet_bind_bucket_for_each(tb, node, &head->chain)                          inet_bind_bucket_for_each(tb, node, &head->chain)
1045                                  if (tb->ib_net == net && tb->port == rover)                                  if (tb->ib_net == net && tb->port == rover)
1046                                          goto next;                                          goto next;
1047  --- linux-2.6.27.29-170.2.79.fc10.orig/net/ipv4/inet_hashtables.c  --- linux-2.6.27.30-170.2.82.fc10.orig/net/ipv4/inet_hashtables.c
1048  +++ linux-2.6.27.29-170.2.79.fc10/net/ipv4/inet_hashtables.c  +++ linux-2.6.27.30-170.2.82.fc10/net/ipv4/inet_hashtables.c
1049  @@ -22,6 +22,9 @@  @@ -22,6 +22,9 @@
1050   #include <net/inet_connection_sock.h>   #include <net/inet_connection_sock.h>
1051   #include <net/inet_hashtables.h>   #include <net/inet_hashtables.h>
# Line 1067  Source code for this patch is http://ftp Line 1067  Source code for this patch is http://ftp
1067                          head = &hinfo->bhash[inet_bhashfn(net, port,                          head = &hinfo->bhash[inet_bhashfn(net, port,
1068                                          hinfo->bhash_size)];                                          hinfo->bhash_size)];
1069                          spin_lock(&head->lock);                          spin_lock(&head->lock);
1070  --- linux-2.6.27.29-170.2.79.fc10.orig/net/ipv4/raw.c  --- linux-2.6.27.30-170.2.82.fc10.orig/net/ipv4/raw.c
1071  +++ linux-2.6.27.29-170.2.79.fc10/net/ipv4/raw.c  +++ linux-2.6.27.30-170.2.82.fc10/net/ipv4/raw.c
1072  @@ -77,6 +77,9 @@  @@ -77,6 +77,9 @@
1073   #include <linux/seq_file.h>   #include <linux/seq_file.h>
1074   #include <linux/netfilter.h>   #include <linux/netfilter.h>
# Line 1091  Source code for this patch is http://ftp Line 1091  Source code for this patch is http://ftp
1091    
1092          copied = skb->len;          copied = skb->len;
1093          if (len < copied) {          if (len < copied) {
1094  --- linux-2.6.27.29-170.2.79.fc10.orig/net/ipv4/udp.c  --- linux-2.6.27.30-170.2.82.fc10.orig/net/ipv4/udp.c
1095  +++ linux-2.6.27.29-170.2.79.fc10/net/ipv4/udp.c  +++ linux-2.6.27.30-170.2.82.fc10/net/ipv4/udp.c
1096  @@ -103,6 +103,12 @@  @@ -103,6 +103,12 @@
1097   #include <net/checksum.h>   #include <net/checksum.h>
1098   #include <net/xfrm.h>   #include <net/xfrm.h>
# Line 1139  Source code for this patch is http://ftp Line 1139  Source code for this patch is http://ftp
1139    
1140          ulen = skb->len - sizeof(struct udphdr);          ulen = skb->len - sizeof(struct udphdr);
1141          copied = len;          copied = len;
1142  --- linux-2.6.27.29-170.2.79.fc10.orig/net/ipv6/raw.c  --- linux-2.6.27.30-170.2.82.fc10.orig/net/ipv6/raw.c
1143  +++ linux-2.6.27.29-170.2.79.fc10/net/ipv6/raw.c  +++ linux-2.6.27.30-170.2.82.fc10/net/ipv6/raw.c
1144  @@ -59,6 +59,9 @@  @@ -59,6 +59,9 @@
1145    
1146   #include <linux/proc_fs.h>   #include <linux/proc_fs.h>
# Line 1163  Source code for this patch is http://ftp Line 1163  Source code for this patch is http://ftp
1163    
1164          copied = skb->len;          copied = skb->len;
1165          if (copied > len) {          if (copied > len) {
1166  --- linux-2.6.27.29-170.2.79.fc10.orig/net/ipv6/udp.c  --- linux-2.6.27.30-170.2.82.fc10.orig/net/ipv6/udp.c
1167  +++ linux-2.6.27.29-170.2.79.fc10/net/ipv6/udp.c  +++ linux-2.6.27.30-170.2.82.fc10/net/ipv6/udp.c
1168  @@ -48,6 +48,9 @@  @@ -48,6 +48,9 @@
1169   #include <linux/proc_fs.h>   #include <linux/proc_fs.h>
1170   #include <linux/seq_file.h>   #include <linux/seq_file.h>
# Line 1187  Source code for this patch is http://ftp Line 1187  Source code for this patch is http://ftp
1187    
1188          ulen = skb->len - sizeof(struct udphdr);          ulen = skb->len - sizeof(struct udphdr);
1189          copied = len;          copied = len;
1190  --- linux-2.6.27.29-170.2.79.fc10.orig/net/socket.c  --- linux-2.6.27.30-170.2.82.fc10.orig/net/socket.c
1191  +++ linux-2.6.27.29-170.2.79.fc10/net/socket.c  +++ linux-2.6.27.30-170.2.82.fc10/net/socket.c
1192  @@ -97,6 +97,11 @@  @@ -97,6 +97,11 @@
1193   #include <net/sock.h>   #include <net/sock.h>
1194   #include <linux/netfilter.h>   #include <linux/netfilter.h>
# Line 1279  Source code for this patch is http://ftp Line 1279  Source code for this patch is http://ftp
1279    
1280          err =          err =
1281              security_socket_connect(sock, (struct sockaddr *)&address, addrlen);              security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
1282  --- linux-2.6.27.29-170.2.79.fc10.orig/net/unix/af_unix.c  --- linux-2.6.27.30-170.2.82.fc10.orig/net/unix/af_unix.c
1283  +++ linux-2.6.27.29-170.2.79.fc10/net/unix/af_unix.c  +++ linux-2.6.27.30-170.2.82.fc10/net/unix/af_unix.c
1284  @@ -114,6 +114,9 @@  @@ -114,6 +114,9 @@
1285   #include <linux/mount.h>   #include <linux/mount.h>
1286   #include <net/checksum.h>   #include <net/checksum.h>
Legend:
Removed from v.2940  
changed lines
  Added in v.2941
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
サイト情報
ソフトウェアを探す
ソフトウェアを作る
コミュニティ
ヘルプ