• R/O
  • SSH
  • HTTPS

tomoyo: Commit


Commit MetaInfo

Revision6646 (tree)
Time2018-05-14 06:48:55
Authorkumaneko

Log Message

(empty log message)

Change Summary

Incremental Difference

--- trunk/1.7.x/ccs-patch/patches/ccs-patch-2.6.32-centos-6.diff (revision 6645)
+++ trunk/1.7.x/ccs-patch/patches/ccs-patch-2.6.32-centos-6.diff (revision 6646)
@@ -1,6 +1,6 @@
11 This is TOMOYO Linux patch for CentOS 6.
22
3-Source code for this patch is http://vault.centos.org/6.9/updates/Source/SPackages/kernel-2.6.32-696.23.1.el6.src.rpm
3+Source code for this patch is http://vault.centos.org/6.9/updates/Source/SPackages/kernel-2.6.32-696.28.1.el6.src.rpm
44 ---
55 fs/compat.c | 3 ++-
66 fs/compat_ioctl.c | 7 +++++++
@@ -35,8 +35,8 @@
3535 security/Makefile | 3 +++
3636 31 files changed, 228 insertions(+), 2 deletions(-)
3737
38---- linux-2.6.32-696.23.1.el6.orig/fs/compat.c
39-+++ linux-2.6.32-696.23.1.el6/fs/compat.c
38+--- linux-2.6.32-696.28.1.el6.orig/fs/compat.c
39++++ linux-2.6.32-696.28.1.el6/fs/compat.c
4040 @@ -55,6 +55,7 @@
4141 #include <asm/mmu_context.h>
4242 #include <asm/ioctls.h>
@@ -54,8 +54,8 @@
5454 if (retval < 0)
5555 goto out;
5656
57---- linux-2.6.32-696.23.1.el6.orig/fs/compat_ioctl.c
58-+++ linux-2.6.32-696.23.1.el6/fs/compat_ioctl.c
57+--- linux-2.6.32-696.28.1.el6.orig/fs/compat_ioctl.c
58++++ linux-2.6.32-696.28.1.el6/fs/compat_ioctl.c
5959 @@ -114,6 +114,7 @@
6060 #ifdef CONFIG_SPARC
6161 #include <asm/fbio.h>
@@ -84,8 +84,8 @@
8484 if (filp->f_op && filp->f_op->compat_ioctl) {
8585 error = filp->f_op->compat_ioctl(filp, cmd, arg);
8686 if (error != -ENOIOCTLCMD)
87---- linux-2.6.32-696.23.1.el6.orig/fs/exec.c
88-+++ linux-2.6.32-696.23.1.el6/fs/exec.c
87+--- linux-2.6.32-696.28.1.el6.orig/fs/exec.c
88++++ linux-2.6.32-696.28.1.el6/fs/exec.c
8989 @@ -61,6 +61,7 @@
9090 #include <asm/mmu_context.h>
9191 #include <asm/tlb.h>
@@ -103,8 +103,8 @@
103103 if (retval < 0)
104104 goto out;
105105
106---- linux-2.6.32-696.23.1.el6.orig/fs/fcntl.c
107-+++ linux-2.6.32-696.23.1.el6/fs/fcntl.c
106+--- linux-2.6.32-696.28.1.el6.orig/fs/fcntl.c
107++++ linux-2.6.32-696.28.1.el6/fs/fcntl.c
108108 @@ -23,6 +23,7 @@
109109 #include <asm/poll.h>
110110 #include <asm/siginfo.h>
@@ -123,8 +123,8 @@
123123 /* O_NOATIME can only be set by the owner or superuser */
124124 if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))
125125 if (!is_owner_or_cap(inode))
126---- linux-2.6.32-696.23.1.el6.orig/fs/ioctl.c
127-+++ linux-2.6.32-696.23.1.el6/fs/ioctl.c
126+--- linux-2.6.32-696.28.1.el6.orig/fs/ioctl.c
127++++ linux-2.6.32-696.28.1.el6/fs/ioctl.c
128128 @@ -18,6 +18,7 @@
129129 #include <linux/falloc.h>
130130
@@ -151,8 +151,8 @@
151151 if (error)
152152 goto out_fput;
153153
154---- linux-2.6.32-696.23.1.el6.orig/fs/namei.c
155-+++ linux-2.6.32-696.23.1.el6/fs/namei.c
154+--- linux-2.6.32-696.28.1.el6.orig/fs/namei.c
155++++ linux-2.6.32-696.28.1.el6/fs/namei.c
156156 @@ -39,6 +39,8 @@
157157
158158 #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])
@@ -256,8 +256,8 @@
256256 if (error)
257257 goto exit5;
258258 error = vfs_rename(old_dir->d_inode, old_dentry,
259---- linux-2.6.32-696.23.1.el6.orig/fs/namespace.c
260-+++ linux-2.6.32-696.23.1.el6/fs/namespace.c
259+--- linux-2.6.32-696.28.1.el6.orig/fs/namespace.c
260++++ linux-2.6.32-696.28.1.el6/fs/namespace.c
261261 @@ -34,6 +34,7 @@
262262 #include <asm/unistd.h>
263263 #include "pnode.h"
@@ -341,8 +341,8 @@
341341 if (error) {
342342 path_put(&old);
343343 goto out1;
344---- linux-2.6.32-696.23.1.el6.orig/fs/open.c
345-+++ linux-2.6.32-696.23.1.el6/fs/open.c
344+--- linux-2.6.32-696.28.1.el6.orig/fs/open.c
345++++ linux-2.6.32-696.28.1.el6/fs/open.c
346346 @@ -31,6 +31,7 @@
347347 #include <linux/falloc.h>
348348 #include <linux/fs_struct.h>
@@ -443,8 +443,8 @@
443443 if (capable(CAP_SYS_TTY_CONFIG)) {
444444 tty_vhangup_self();
445445 return 0;
446---- linux-2.6.32-696.23.1.el6.orig/fs/proc/version.c
447-+++ linux-2.6.32-696.23.1.el6/fs/proc/version.c
446+--- linux-2.6.32-696.28.1.el6.orig/fs/proc/version.c
447++++ linux-2.6.32-696.28.1.el6/fs/proc/version.c
448448 @@ -32,3 +32,10 @@ static int __init proc_version_init(void
449449 return 0;
450450 }
@@ -452,12 +452,12 @@
452452 +
453453 +static int __init ccs_show_version(void)
454454 +{
455-+ printk(KERN_INFO "Hook version: 2.6.32-696.23.1.el6 2018/03/19\n");
455++ printk(KERN_INFO "Hook version: 2.6.32-696.28.1.el6 2018/05/13\n");
456456 + return 0;
457457 +}
458458 +module_init(ccs_show_version);
459---- linux-2.6.32-696.23.1.el6.orig/include/linux/init_task.h
460-+++ linux-2.6.32-696.23.1.el6/include/linux/init_task.h
459+--- linux-2.6.32-696.28.1.el6.orig/include/linux/init_task.h
460++++ linux-2.6.32-696.28.1.el6/include/linux/init_task.h
461461 @@ -123,6 +123,14 @@ extern struct cred init_cred;
462462 # define INIT_PERF_EVENTS(tsk)
463463 #endif
@@ -481,8 +481,8 @@
481481 }
482482
483483
484---- linux-2.6.32-696.23.1.el6.orig/include/linux/sched.h
485-+++ linux-2.6.32-696.23.1.el6/include/linux/sched.h
484+--- linux-2.6.32-696.28.1.el6.orig/include/linux/sched.h
485++++ linux-2.6.32-696.28.1.el6/include/linux/sched.h
486486 @@ -43,6 +43,8 @@
487487
488488 #ifdef __KERNEL__
@@ -503,8 +503,8 @@
503503 };
504504
505505 /* Future-safe accessor for struct task_struct's cpus_allowed. */
506---- linux-2.6.32-696.23.1.el6.orig/include/net/ip.h
507-+++ linux-2.6.32-696.23.1.el6/include/net/ip.h
506+--- linux-2.6.32-696.28.1.el6.orig/include/net/ip.h
507++++ linux-2.6.32-696.28.1.el6/include/net/ip.h
508508 @@ -33,6 +33,7 @@
509509 #endif
510510 #include <net/snmp.h>
@@ -522,8 +522,8 @@
522522 return test_bit(port, sysctl_local_reserved_ports);
523523 }
524524
525---- linux-2.6.32-696.23.1.el6.orig/kernel/compat.c
526-+++ linux-2.6.32-696.23.1.el6/kernel/compat.c
525+--- linux-2.6.32-696.28.1.el6.orig/kernel/compat.c
526++++ linux-2.6.32-696.28.1.el6/kernel/compat.c
527527 @@ -28,6 +28,7 @@
528528 #include <linux/module.h>
529529
@@ -541,8 +541,8 @@
541541
542542 do_settimeofday(&tv);
543543 return 0;
544---- linux-2.6.32-696.23.1.el6.orig/kernel/kexec.c
545-+++ linux-2.6.32-696.23.1.el6/kernel/kexec.c
544+--- linux-2.6.32-696.28.1.el6.orig/kernel/kexec.c
545++++ linux-2.6.32-696.28.1.el6/kernel/kexec.c
546546 @@ -41,6 +41,7 @@
547547 #include <asm/system.h>
548548 #include <asm/sections.h>
@@ -560,8 +560,8 @@
560560
561561 if (kexec_load_disabled)
562562 return -EPERM;
563---- linux-2.6.32-696.23.1.el6.orig/kernel/kmod.c
564-+++ linux-2.6.32-696.23.1.el6/kernel/kmod.c
563+--- linux-2.6.32-696.28.1.el6.orig/kernel/kmod.c
564++++ linux-2.6.32-696.28.1.el6/kernel/kmod.c
565565 @@ -210,6 +210,11 @@ static int ____call_usermodehelper(void
566566 */
567567 set_user_nice(current, 0);
@@ -574,8 +574,8 @@
574574 retval = kernel_execve(sub_info->path, sub_info->argv, sub_info->envp);
575575
576576 /* Exec failed? */
577---- linux-2.6.32-696.23.1.el6.orig/kernel/module.c
578-+++ linux-2.6.32-696.23.1.el6/kernel/module.c
577+--- linux-2.6.32-696.28.1.el6.orig/kernel/module.c
578++++ linux-2.6.32-696.28.1.el6/kernel/module.c
579579 @@ -56,6 +56,7 @@
580580 #include <linux/percpu.h>
581581 #include <linux/kmemleak.h>
@@ -602,8 +602,8 @@
602602
603603 /* Only one module load at a time, please */
604604 if (mutex_lock_interruptible(&module_mutex) != 0)
605---- linux-2.6.32-696.23.1.el6.orig/kernel/ptrace.c
606-+++ linux-2.6.32-696.23.1.el6/kernel/ptrace.c
605+--- linux-2.6.32-696.28.1.el6.orig/kernel/ptrace.c
606++++ linux-2.6.32-696.28.1.el6/kernel/ptrace.c
607607 @@ -23,6 +23,7 @@
608608 #include <linux/uaccess.h>
609609 #include <linux/regset.h>
@@ -630,8 +630,8 @@
630630
631631 if (request == PTRACE_TRACEME) {
632632 ret = ptrace_traceme();
633---- linux-2.6.32-696.23.1.el6.orig/kernel/sched.c
634-+++ linux-2.6.32-696.23.1.el6/kernel/sched.c
633+--- linux-2.6.32-696.28.1.el6.orig/kernel/sched.c
634++++ linux-2.6.32-696.28.1.el6/kernel/sched.c
635635 @@ -79,6 +79,7 @@
636636 #ifdef CONFIG_PARAVIRT
637637 #include <asm/paravirt.h>
@@ -640,7 +640,7 @@
640640
641641 #include "sched_cpupri.h"
642642 #include "sched_autogroup.h"
643-@@ -6852,6 +6853,8 @@ int can_nice(const struct task_struct *p
643+@@ -6868,6 +6869,8 @@ int can_nice(const struct task_struct *p
644644 SYSCALL_DEFINE1(nice, int, increment)
645645 {
646646 long nice, retval;
@@ -649,8 +649,8 @@
649649
650650 /*
651651 * Setpriority might change our priority at the same moment.
652---- linux-2.6.32-696.23.1.el6.orig/kernel/signal.c
653-+++ linux-2.6.32-696.23.1.el6/kernel/signal.c
652+--- linux-2.6.32-696.28.1.el6.orig/kernel/signal.c
653++++ linux-2.6.32-696.28.1.el6/kernel/signal.c
654654 @@ -35,6 +35,7 @@
655655 #include <asm/unistd.h>
656656 #include <asm/siginfo.h>
@@ -704,8 +704,8 @@
704704
705705 return do_send_specific(tgid, pid, sig, info);
706706 }
707---- linux-2.6.32-696.23.1.el6.orig/kernel/sys.c
708-+++ linux-2.6.32-696.23.1.el6/kernel/sys.c
707+--- linux-2.6.32-696.28.1.el6.orig/kernel/sys.c
708++++ linux-2.6.32-696.28.1.el6/kernel/sys.c
709709 @@ -47,6 +47,7 @@
710710 #include <asm/uaccess.h>
711711 #include <asm/io.h>
@@ -752,8 +752,8 @@
752752
753753 down_write(&uts_sem);
754754 errno = -EFAULT;
755---- linux-2.6.32-696.23.1.el6.orig/kernel/sysctl.c
756-+++ linux-2.6.32-696.23.1.el6/kernel/sysctl.c
755+--- linux-2.6.32-696.28.1.el6.orig/kernel/sysctl.c
756++++ linux-2.6.32-696.28.1.el6/kernel/sysctl.c
757757 @@ -57,6 +57,7 @@
758758
759759 #include <asm/uaccess.h>
@@ -772,8 +772,8 @@
772772 error = parse_table(name, nlen, oldval, oldlenp,
773773 newval, newlen,
774774 head->root, head->ctl_table);
775---- linux-2.6.32-696.23.1.el6.orig/kernel/time.c
776-+++ linux-2.6.32-696.23.1.el6/kernel/time.c
775+--- linux-2.6.32-696.28.1.el6.orig/kernel/time.c
776++++ linux-2.6.32-696.28.1.el6/kernel/time.c
777777 @@ -41,6 +41,7 @@
778778
779779 #include <asm/uaccess.h>
@@ -800,8 +800,8 @@
800800
801801 if (tz) {
802802 /* SMP safe, global irq locking makes it work. */
803---- linux-2.6.32-696.23.1.el6.orig/kernel/time/ntp.c
804-+++ linux-2.6.32-696.23.1.el6/kernel/time/ntp.c
803+--- linux-2.6.32-696.28.1.el6.orig/kernel/time/ntp.c
804++++ linux-2.6.32-696.28.1.el6/kernel/time/ntp.c
805805 @@ -14,6 +14,7 @@
806806 #include <linux/timex.h>
807807 #include <linux/time.h>
@@ -826,8 +826,8 @@
826826
827827 /*
828828 * if the quartz is off by more than 10% then
829---- linux-2.6.32-696.23.1.el6.orig/net/ipv4/raw.c
830-+++ linux-2.6.32-696.23.1.el6/net/ipv4/raw.c
829+--- linux-2.6.32-696.28.1.el6.orig/net/ipv4/raw.c
830++++ linux-2.6.32-696.28.1.el6/net/ipv4/raw.c
831831 @@ -77,6 +77,7 @@
832832 #include <linux/seq_file.h>
833833 #include <linux/netfilter.h>
@@ -846,8 +846,8 @@
846846
847847 copied = skb->len;
848848 if (len < copied) {
849---- linux-2.6.32-696.23.1.el6.orig/net/ipv4/udp.c
850-+++ linux-2.6.32-696.23.1.el6/net/ipv4/udp.c
849+--- linux-2.6.32-696.28.1.el6.orig/net/ipv4/udp.c
850++++ linux-2.6.32-696.28.1.el6/net/ipv4/udp.c
851851 @@ -108,6 +108,7 @@
852852 #include <trace/events/udp.h>
853853 #include <net/busy_poll.h>
@@ -866,8 +866,8 @@
866866
867867 ulen = skb->len - sizeof(struct udphdr);
868868 copied = len;
869---- linux-2.6.32-696.23.1.el6.orig/net/ipv6/raw.c
870-+++ linux-2.6.32-696.23.1.el6/net/ipv6/raw.c
869+--- linux-2.6.32-696.28.1.el6.orig/net/ipv6/raw.c
870++++ linux-2.6.32-696.28.1.el6/net/ipv6/raw.c
871871 @@ -59,6 +59,7 @@
872872
873873 #include <linux/proc_fs.h>
@@ -886,8 +886,8 @@
886886
887887 copied = skb->len;
888888 if (copied > len) {
889---- linux-2.6.32-696.23.1.el6.orig/net/ipv6/udp.c
890-+++ linux-2.6.32-696.23.1.el6/net/ipv6/udp.c
889+--- linux-2.6.32-696.28.1.el6.orig/net/ipv6/udp.c
890++++ linux-2.6.32-696.28.1.el6/net/ipv6/udp.c
891891 @@ -50,6 +50,7 @@
892892 #include <linux/proc_fs.h>
893893 #include <linux/seq_file.h>
@@ -906,8 +906,8 @@
906906
907907 ulen = skb->len - sizeof(struct udphdr);
908908 copied = len;
909---- linux-2.6.32-696.23.1.el6.orig/net/socket.c
910-+++ linux-2.6.32-696.23.1.el6/net/socket.c
909+--- linux-2.6.32-696.28.1.el6.orig/net/socket.c
910++++ linux-2.6.32-696.28.1.el6/net/socket.c
911911 @@ -100,6 +100,7 @@
912912 #ifndef __GENKSYMS__
913913 #include <net/busy_poll.h>
@@ -977,8 +977,8 @@
977977 if (err)
978978 goto out_put;
979979
980---- linux-2.6.32-696.23.1.el6.orig/net/unix/af_unix.c
981-+++ linux-2.6.32-696.23.1.el6/net/unix/af_unix.c
980+--- linux-2.6.32-696.28.1.el6.orig/net/unix/af_unix.c
981++++ linux-2.6.32-696.28.1.el6/net/unix/af_unix.c
982982 @@ -114,6 +114,7 @@
983983 #include <linux/mount.h>
984984 #include <net/checksum.h>
@@ -998,8 +998,8 @@
998998 if (err)
999999 goto out_mknod_dput;
10001000 err = vfs_mknod(nd.path.dentry->d_inode, dentry, mode, 0);
1001---- linux-2.6.32-696.23.1.el6.orig/security/Kconfig
1002-+++ linux-2.6.32-696.23.1.el6/security/Kconfig
1001+--- linux-2.6.32-696.28.1.el6.orig/security/Kconfig
1002++++ linux-2.6.32-696.28.1.el6/security/Kconfig
10031003 @@ -188,5 +188,7 @@ source security/tomoyo/Kconfig
10041004
10051005 source security/integrity/ima/Kconfig
@@ -1008,8 +1008,8 @@
10081008 +
10091009 endmenu
10101010
1011---- linux-2.6.32-696.23.1.el6.orig/security/Makefile
1012-+++ linux-2.6.32-696.23.1.el6/security/Makefile
1011+--- linux-2.6.32-696.28.1.el6.orig/security/Makefile
1012++++ linux-2.6.32-696.28.1.el6/security/Makefile
10131013 @@ -25,3 +25,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
10141014 # Object integrity file lists
10151015 subdir-$(CONFIG_IMA) += integrity/ima
--- trunk/1.7.x/ccs-patch/specs/build-c6-2.6.32.sh (revision 6645)
+++ trunk/1.7.x/ccs-patch/specs/build-c6-2.6.32.sh (revision 6646)
@@ -10,12 +10,12 @@
1010
1111 cd /tmp/ || die "Can't chdir to /tmp/ ."
1212
13-if [ ! -r kernel-2.6.32-696.23.1.el6.src.rpm ]
13+if [ ! -r kernel-2.6.32-696.28.1.el6.src.rpm ]
1414 then
15- wget http://vault.centos.org/6.9/updates/Source/SPackages/kernel-2.6.32-696.23.1.el6.src.rpm || die "Can't download source package."
15+ wget http://vault.centos.org/6.9/updates/Source/SPackages/kernel-2.6.32-696.28.1.el6.src.rpm || die "Can't download source package."
1616 fi
17-LANG=C rpm --checksig kernel-2.6.32-696.23.1.el6.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature."
18-rpm -ivh kernel-2.6.32-696.23.1.el6.src.rpm || die "Can't install source package."
17+LANG=C rpm --checksig kernel-2.6.32-696.28.1.el6.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature."
18+rpm -ivh kernel-2.6.32-696.28.1.el6.src.rpm || die "Can't install source package."
1919
2020 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
2121 if [ ! -r ccs-patch-1.7.3-20171111.tar.gz ]
@@ -35,7 +35,7 @@
3535 -# % define buildid .local
3636 +%define buildid _tomoyo_1.7.3p5
3737
38- %define distro_build 696.23.1
38+ %define distro_build 696.28.1
3939 %define signmodules 1
4040 @@ -437,7 +437,7 @@
4141 # Packages that need to be installed before the kernel is, because the %post
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-3.13-ubuntu-14.04.diff (revision 6645)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-3.13-ubuntu-14.04.diff (revision 6646)
@@ -29,8 +29,8 @@
2929 security/security.c | 107 ++++++++++++++++++++++++++++++++++++++++------
3030 25 files changed, 236 insertions(+), 37 deletions(-)
3131
32---- linux-3.13.0-145.194.orig/fs/exec.c
33-+++ linux-3.13.0-145.194/fs/exec.c
32+--- linux-3.13.0-147.196.orig/fs/exec.c
33++++ linux-3.13.0-147.196/fs/exec.c
3434 @@ -1482,7 +1482,7 @@ static int exec_binprm(struct linux_binp
3535 old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
3636 rcu_read_unlock();
@@ -40,8 +40,8 @@
4040 if (ret >= 0) {
4141 audit_bprm(bprm);
4242 trace_sched_process_exec(current, old_pid, bprm);
43---- linux-3.13.0-145.194.orig/fs/open.c
44-+++ linux-3.13.0-145.194/fs/open.c
43+--- linux-3.13.0-147.196.orig/fs/open.c
44++++ linux-3.13.0-147.196/fs/open.c
4545 @@ -1088,6 +1088,8 @@ EXPORT_SYMBOL(sys_close);
4646 */
4747 SYSCALL_DEFINE0(vhangup)
@@ -51,8 +51,8 @@
5151 if (capable(CAP_SYS_TTY_CONFIG)) {
5252 tty_vhangup_self();
5353 return 0;
54---- linux-3.13.0-145.194.orig/fs/proc/version.c
55-+++ linux-3.13.0-145.194/fs/proc/version.c
54+--- linux-3.13.0-147.196.orig/fs/proc/version.c
55++++ linux-3.13.0-147.196/fs/proc/version.c
5656 @@ -32,3 +32,10 @@ static int __init proc_version_init(void
5757 return 0;
5858 }
@@ -60,12 +60,12 @@
6060 +
6161 +static int __init ccs_show_version(void)
6262 +{
63-+ printk(KERN_INFO "Hook version: 3.13.0-145.194 2018/04/24\n");
63++ printk(KERN_INFO "Hook version: 3.13.0-147.196 2018/05/13\n");
6464 + return 0;
6565 +}
6666 +module_init(ccs_show_version);
67---- linux-3.13.0-145.194.orig/include/linux/init_task.h
68-+++ linux-3.13.0-145.194/include/linux/init_task.h
67+--- linux-3.13.0-147.196.orig/include/linux/init_task.h
68++++ linux-3.13.0-147.196/include/linux/init_task.h
6969 @@ -155,6 +155,14 @@ extern struct task_group root_task_group
7070
7171 #define INIT_TASK_COMM "swapper"
@@ -89,8 +89,8 @@
8989 }
9090
9191
92---- linux-3.13.0-145.194.orig/include/linux/sched.h
93-+++ linux-3.13.0-145.194/include/linux/sched.h
92+--- linux-3.13.0-147.196.orig/include/linux/sched.h
93++++ linux-3.13.0-147.196/include/linux/sched.h
9494 @@ -4,6 +4,8 @@
9595 #include <uapi/linux/sched.h>
9696
@@ -111,8 +111,8 @@
111111 };
112112
113113 /* Future-safe accessor for struct task_struct's cpus_allowed. */
114---- linux-3.13.0-145.194.orig/include/linux/security.h
115-+++ linux-3.13.0-145.194/include/linux/security.h
114+--- linux-3.13.0-147.196.orig/include/linux/security.h
115++++ linux-3.13.0-147.196/include/linux/security.h
116116 @@ -53,6 +53,7 @@ struct msg_queue;
117117 struct xattr;
118118 struct xfrm_sec_ctx;
@@ -314,8 +314,8 @@
314314 }
315315 #endif /* CONFIG_SECURITY_PATH */
316316
317---- linux-3.13.0-145.194.orig/include/net/ip.h
318-+++ linux-3.13.0-145.194/include/net/ip.h
317+--- linux-3.13.0-147.196.orig/include/net/ip.h
318++++ linux-3.13.0-147.196/include/net/ip.h
319319 @@ -225,6 +225,8 @@ void inet_get_local_port_range(struct ne
320320 extern unsigned long *sysctl_local_reserved_ports;
321321 static inline int inet_is_reserved_local_port(int port)
@@ -325,8 +325,8 @@
325325 return test_bit(port, sysctl_local_reserved_ports);
326326 }
327327
328---- linux-3.13.0-145.194.orig/kernel/fork.c
329-+++ linux-3.13.0-145.194/kernel/fork.c
328+--- linux-3.13.0-147.196.orig/kernel/fork.c
329++++ linux-3.13.0-147.196/kernel/fork.c
330330 @@ -250,6 +250,7 @@ void __put_task_struct(struct task_struc
331331 delayacct_tsk_free(tsk);
332332 put_signal_struct(tsk->signal);
@@ -353,8 +353,8 @@
353353 bad_fork_cleanup_perf:
354354 perf_event_free_task(p);
355355 bad_fork_cleanup_policy:
356---- linux-3.13.0-145.194.orig/kernel/kexec.c
357-+++ linux-3.13.0-145.194/kernel/kexec.c
356+--- linux-3.13.0-147.196.orig/kernel/kexec.c
357++++ linux-3.13.0-147.196/kernel/kexec.c
358358 @@ -38,6 +38,7 @@
359359 #include <asm/uaccess.h>
360360 #include <asm/io.h>
@@ -372,8 +372,8 @@
372372
373373 /*
374374 * Verify we have a legal set of flags
375---- linux-3.13.0-145.194.orig/kernel/module.c
376-+++ linux-3.13.0-145.194/kernel/module.c
375+--- linux-3.13.0-147.196.orig/kernel/module.c
376++++ linux-3.13.0-147.196/kernel/module.c
377377 @@ -63,6 +63,7 @@
378378 #include <linux/fips.h>
379379 #include <uapi/linux/module.h>
@@ -400,8 +400,8 @@
400400
401401 return 0;
402402 }
403---- linux-3.13.0-145.194.orig/kernel/ptrace.c
404-+++ linux-3.13.0-145.194/kernel/ptrace.c
403+--- linux-3.13.0-147.196.orig/kernel/ptrace.c
404++++ linux-3.13.0-147.196/kernel/ptrace.c
405405 @@ -1055,6 +1055,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
406406 {
407407 struct task_struct *child;
@@ -426,8 +426,8 @@
426426
427427 if (request == PTRACE_TRACEME) {
428428 ret = ptrace_traceme();
429---- linux-3.13.0-145.194.orig/kernel/reboot.c
430-+++ linux-3.13.0-145.194/kernel/reboot.c
429+--- linux-3.13.0-147.196.orig/kernel/reboot.c
430++++ linux-3.13.0-147.196/kernel/reboot.c
431431 @@ -16,6 +16,7 @@
432432 #include <linux/syscalls.h>
433433 #include <linux/syscore_ops.h>
@@ -445,8 +445,8 @@
445445
446446 /*
447447 * If pid namespaces are enabled and the current task is in a child
448---- linux-3.13.0-145.194.orig/kernel/sched/core.c
449-+++ linux-3.13.0-145.194/kernel/sched/core.c
448+--- linux-3.13.0-147.196.orig/kernel/sched/core.c
449++++ linux-3.13.0-147.196/kernel/sched/core.c
450450 @@ -2922,6 +2922,8 @@ int can_nice(const struct task_struct *p
451451 SYSCALL_DEFINE1(nice, int, increment)
452452 {
@@ -456,8 +456,8 @@
456456
457457 /*
458458 * Setpriority might change our priority at the same moment.
459---- linux-3.13.0-145.194.orig/kernel/signal.c
460-+++ linux-3.13.0-145.194/kernel/signal.c
459+--- linux-3.13.0-147.196.orig/kernel/signal.c
460++++ linux-3.13.0-147.196/kernel/signal.c
461461 @@ -2909,6 +2909,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
462462 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
463463 {
@@ -503,8 +503,8 @@
503503
504504 return do_send_specific(tgid, pid, sig, info);
505505 }
506---- linux-3.13.0-145.194.orig/kernel/sys.c
507-+++ linux-3.13.0-145.194/kernel/sys.c
506+--- linux-3.13.0-147.196.orig/kernel/sys.c
507++++ linux-3.13.0-147.196/kernel/sys.c
508508 @@ -171,6 +171,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
509509
510510 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -534,8 +534,8 @@
534534
535535 down_write(&uts_sem);
536536 errno = -EFAULT;
537---- linux-3.13.0-145.194.orig/kernel/time/ntp.c
538-+++ linux-3.13.0-145.194/kernel/time/ntp.c
537+--- linux-3.13.0-147.196.orig/kernel/time/ntp.c
538++++ linux-3.13.0-147.196/kernel/time/ntp.c
539539 @@ -16,6 +16,7 @@
540540 #include <linux/mm.h>
541541 #include <linux/module.h>
@@ -569,8 +569,8 @@
569569
570570 /*
571571 * Check for potential multiplication overflows that can
572---- linux-3.13.0-145.194.orig/net/ipv4/raw.c
573-+++ linux-3.13.0-145.194/net/ipv4/raw.c
572+--- linux-3.13.0-147.196.orig/net/ipv4/raw.c
573++++ linux-3.13.0-147.196/net/ipv4/raw.c
574574 @@ -706,6 +706,10 @@ static int raw_recvmsg(struct kiocb *ioc
575575 skb = skb_recv_datagram(sk, flags, noblock, &err);
576576 if (!skb)
@@ -582,8 +582,8 @@
582582
583583 copied = skb->len;
584584 if (len < copied) {
585---- linux-3.13.0-145.194.orig/net/ipv4/udp.c
586-+++ linux-3.13.0-145.194/net/ipv4/udp.c
585+--- linux-3.13.0-147.196.orig/net/ipv4/udp.c
586++++ linux-3.13.0-147.196/net/ipv4/udp.c
587587 @@ -1247,6 +1247,10 @@ try_again:
588588 &peeked, &off, &err);
589589 if (!skb)
@@ -595,8 +595,8 @@
595595
596596 ulen = skb->len - sizeof(struct udphdr);
597597 copied = len;
598---- linux-3.13.0-145.194.orig/net/ipv6/raw.c
599-+++ linux-3.13.0-145.194/net/ipv6/raw.c
598+--- linux-3.13.0-147.196.orig/net/ipv6/raw.c
599++++ linux-3.13.0-147.196/net/ipv6/raw.c
600600 @@ -474,6 +474,10 @@ static int rawv6_recvmsg(struct kiocb *i
601601 skb = skb_recv_datagram(sk, flags, noblock, &err);
602602 if (!skb)
@@ -608,8 +608,8 @@
608608
609609 copied = skb->len;
610610 if (copied > len) {
611---- linux-3.13.0-145.194.orig/net/ipv6/udp.c
612-+++ linux-3.13.0-145.194/net/ipv6/udp.c
611+--- linux-3.13.0-147.196.orig/net/ipv6/udp.c
612++++ linux-3.13.0-147.196/net/ipv6/udp.c
613613 @@ -404,6 +404,10 @@ try_again:
614614 &peeked, &off, &err);
615615 if (!skb)
@@ -621,8 +621,8 @@
621621
622622 ulen = skb->len - sizeof(struct udphdr);
623623 copied = len;
624---- linux-3.13.0-145.194.orig/net/socket.c
625-+++ linux-3.13.0-145.194/net/socket.c
624+--- linux-3.13.0-147.196.orig/net/socket.c
625++++ linux-3.13.0-147.196/net/socket.c
626626 @@ -1616,6 +1616,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
627627 if (err < 0)
628628 goto out_fd;
@@ -634,8 +634,8 @@
634634 if (upeer_sockaddr) {
635635 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
636636 &len, 2) < 0) {
637---- linux-3.13.0-145.194.orig/net/unix/af_unix.c
638-+++ linux-3.13.0-145.194/net/unix/af_unix.c
637+--- linux-3.13.0-147.196.orig/net/unix/af_unix.c
638++++ linux-3.13.0-147.196/net/unix/af_unix.c
639639 @@ -1973,6 +1973,10 @@ static int unix_dgram_recvmsg(struct kio
640640 wake_up_interruptible_sync_poll(&u->peer_wait,
641641 POLLOUT | POLLWRNORM | POLLWRBAND);
@@ -647,8 +647,8 @@
647647 if (msg->msg_name)
648648 unix_copy_addr(msg, skb->sk);
649649
650---- linux-3.13.0-145.194.orig/security/Kconfig
651-+++ linux-3.13.0-145.194/security/Kconfig
650+--- linux-3.13.0-147.196.orig/security/Kconfig
651++++ linux-3.13.0-147.196/security/Kconfig
652652 @@ -177,5 +177,7 @@ config DEFAULT_SECURITY
653653 default "yama" if DEFAULT_SECURITY_YAMA
654654 default "" if DEFAULT_SECURITY_DAC
@@ -657,8 +657,8 @@
657657 +
658658 endmenu
659659
660---- linux-3.13.0-145.194.orig/security/Makefile
661-+++ linux-3.13.0-145.194/security/Makefile
660+--- linux-3.13.0-147.196.orig/security/Makefile
661++++ linux-3.13.0-147.196/security/Makefile
662662 @@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
663663 # Object integrity file lists
664664 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -666,8 +666,8 @@
666666 +
667667 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
668668 +obj-$(CONFIG_CCSECURITY) += ccsecurity/built-in.o
669---- linux-3.13.0-145.194.orig/security/security.c
670-+++ linux-3.13.0-145.194/security/security.c
669+--- linux-3.13.0-147.196.orig/security/security.c
670++++ linux-3.13.0-147.196/security/security.c
671671 @@ -203,7 +203,10 @@ int security_syslog(int type)
672672
673673 int security_settime(const struct timespec *ts, const struct timezone *tz)
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.14.diff (revision 6645)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.14.diff (revision 6646)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.14.39.
1+This is TOMOYO Linux patch for kernel 4.14.40.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.39.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.40.tar.xz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,8 +28,8 @@
2828 security/security.c | 9 +++++-
2929 24 files changed, 153 insertions(+), 29 deletions(-)
3030
31---- linux-4.14.39.orig/fs/exec.c
32-+++ linux-4.14.39/fs/exec.c
31+--- linux-4.14.40.orig/fs/exec.c
32++++ linux-4.14.40/fs/exec.c
3333 @@ -1677,7 +1677,7 @@ static int exec_binprm(struct linux_binp
3434 old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
3535 rcu_read_unlock();
@@ -39,8 +39,8 @@
3939 if (ret >= 0) {
4040 audit_bprm(bprm);
4141 trace_sched_process_exec(current, old_pid, bprm);
42---- linux-4.14.39.orig/fs/open.c
43-+++ linux-4.14.39/fs/open.c
42+--- linux-4.14.40.orig/fs/open.c
43++++ linux-4.14.40/fs/open.c
4444 @@ -1171,6 +1171,8 @@ EXPORT_SYMBOL(sys_close);
4545 */
4646 SYSCALL_DEFINE0(vhangup)
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-4.14.39.orig/fs/proc/version.c
54-+++ linux-4.14.39/fs/proc/version.c
53+--- linux-4.14.40.orig/fs/proc/version.c
54++++ linux-4.14.40/fs/proc/version.c
5555 @@ -33,3 +33,10 @@ static int __init proc_version_init(void
5656 return 0;
5757 }
@@ -59,12 +59,12 @@
5959 +
6060 +static int __init ccs_show_version(void)
6161 +{
62-+ printk(KERN_INFO "Hook version: 4.14.39 2018/05/07\n");
62++ printk(KERN_INFO "Hook version: 4.14.40 2018/05/13\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.14.39.orig/include/linux/init_task.h
67-+++ linux-4.14.39/include/linux/init_task.h
66+--- linux-4.14.40.orig/include/linux/init_task.h
67++++ linux-4.14.40/include/linux/init_task.h
6868 @@ -219,6 +219,14 @@ extern struct cred init_cred;
6969 #define INIT_TASK_SECURITY
7070 #endif
@@ -88,8 +88,8 @@
8888 }
8989
9090
91---- linux-4.14.39.orig/include/linux/sched.h
92-+++ linux-4.14.39/include/linux/sched.h
91+--- linux-4.14.40.orig/include/linux/sched.h
92++++ linux-4.14.40/include/linux/sched.h
9393 @@ -33,6 +33,7 @@ struct audit_context;
9494 struct backing_dev_info;
9595 struct bio_list;
@@ -109,8 +109,8 @@
109109
110110 /*
111111 * New fields for task_struct should be added above here, so that
112---- linux-4.14.39.orig/include/linux/security.h
113-+++ linux-4.14.39/include/linux/security.h
112+--- linux-4.14.40.orig/include/linux/security.h
113++++ linux-4.14.40/include/linux/security.h
114114 @@ -56,6 +56,7 @@ struct msg_queue;
115115 struct xattr;
116116 struct xfrm_sec_ctx;
@@ -331,8 +331,8 @@
331331 }
332332 #endif /* CONFIG_SECURITY_PATH */
333333
334---- linux-4.14.39.orig/include/net/ip.h
335-+++ linux-4.14.39/include/net/ip.h
334+--- linux-4.14.40.orig/include/net/ip.h
335++++ linux-4.14.40/include/net/ip.h
336336 @@ -266,6 +266,8 @@ void inet_get_local_port_range(struct ne
337337 #ifdef CONFIG_SYSCTL
338338 static inline int inet_is_local_reserved_port(struct net *net, int port)
@@ -351,8 +351,8 @@
351351 return 0;
352352 }
353353
354---- linux-4.14.39.orig/kernel/kexec.c
355-+++ linux-4.14.39/kernel/kexec.c
354+--- linux-4.14.40.orig/kernel/kexec.c
355++++ linux-4.14.40/kernel/kexec.c
356356 @@ -17,7 +17,7 @@
357357 #include <linux/syscalls.h>
358358 #include <linux/vmalloc.h>
@@ -371,8 +371,8 @@
371371
372372 /*
373373 * Verify we have a legal set of flags
374---- linux-4.14.39.orig/kernel/module.c
375-+++ linux-4.14.39/kernel/module.c
374+--- linux-4.14.40.orig/kernel/module.c
375++++ linux-4.14.40/kernel/module.c
376376 @@ -66,6 +66,7 @@
377377 #include <linux/audit.h>
378378 #include <uapi/linux/module.h>
@@ -399,8 +399,8 @@
399399
400400 return 0;
401401 }
402---- linux-4.14.39.orig/kernel/ptrace.c
403-+++ linux-4.14.39/kernel/ptrace.c
402+--- linux-4.14.40.orig/kernel/ptrace.c
403++++ linux-4.14.40/kernel/ptrace.c
404404 @@ -1123,6 +1123,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
405405 {
406406 struct task_struct *child;
@@ -425,8 +425,8 @@
425425
426426 if (request == PTRACE_TRACEME) {
427427 ret = ptrace_traceme();
428---- linux-4.14.39.orig/kernel/reboot.c
429-+++ linux-4.14.39/kernel/reboot.c
428+--- linux-4.14.40.orig/kernel/reboot.c
429++++ linux-4.14.40/kernel/reboot.c
430430 @@ -16,6 +16,7 @@
431431 #include <linux/syscalls.h>
432432 #include <linux/syscore_ops.h>
@@ -444,8 +444,8 @@
444444
445445 /*
446446 * If pid namespaces are enabled and the current task is in a child
447---- linux-4.14.39.orig/kernel/sched/core.c
448-+++ linux-4.14.39/kernel/sched/core.c
447+--- linux-4.14.40.orig/kernel/sched/core.c
448++++ linux-4.14.40/kernel/sched/core.c
449449 @@ -3852,6 +3852,8 @@ int can_nice(const struct task_struct *p
450450 SYSCALL_DEFINE1(nice, int, increment)
451451 {
@@ -455,8 +455,8 @@
455455
456456 /*
457457 * Setpriority might change our priority at the same moment.
458---- linux-4.14.39.orig/kernel/signal.c
459-+++ linux-4.14.39/kernel/signal.c
458+--- linux-4.14.40.orig/kernel/signal.c
459++++ linux-4.14.40/kernel/signal.c
460460 @@ -2954,6 +2954,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait,
461461 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
462462 {
@@ -502,8 +502,8 @@
502502
503503 return do_send_specific(tgid, pid, sig, info);
504504 }
505---- linux-4.14.39.orig/kernel/sys.c
506-+++ linux-4.14.39/kernel/sys.c
505+--- linux-4.14.40.orig/kernel/sys.c
506++++ linux-4.14.40/kernel/sys.c
507507 @@ -191,6 +191,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
508508
509509 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -533,8 +533,8 @@
533533
534534 down_write(&uts_sem);
535535 errno = -EFAULT;
536---- linux-4.14.39.orig/kernel/time/ntp.c
537-+++ linux-4.14.39/kernel/time/ntp.c
536+--- linux-4.14.40.orig/kernel/time/ntp.c
537++++ linux-4.14.40/kernel/time/ntp.c
538538 @@ -18,6 +18,7 @@
539539 #include <linux/module.h>
540540 #include <linux/rtc.h>
@@ -568,8 +568,8 @@
568568
569569 if (txc->modes & ADJ_NANO) {
570570 struct timespec ts;
571---- linux-4.14.39.orig/net/ipv4/raw.c
572-+++ linux-4.14.39/net/ipv4/raw.c
571+--- linux-4.14.40.orig/net/ipv4/raw.c
572++++ linux-4.14.40/net/ipv4/raw.c
573573 @@ -766,6 +766,10 @@ static int raw_recvmsg(struct sock *sk,
574574 skb = skb_recv_datagram(sk, flags, noblock, &err);
575575 if (!skb)
@@ -581,8 +581,8 @@
581581
582582 copied = skb->len;
583583 if (len < copied) {
584---- linux-4.14.39.orig/net/ipv4/udp.c
585-+++ linux-4.14.39/net/ipv4/udp.c
584+--- linux-4.14.40.orig/net/ipv4/udp.c
585++++ linux-4.14.40/net/ipv4/udp.c
586586 @@ -1590,6 +1590,8 @@ try_again:
587587 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
588588 if (!skb)
@@ -592,8 +592,8 @@
592592
593593 ulen = udp_skb_len(skb);
594594 copied = len;
595---- linux-4.14.39.orig/net/ipv6/raw.c
596-+++ linux-4.14.39/net/ipv6/raw.c
595+--- linux-4.14.40.orig/net/ipv6/raw.c
596++++ linux-4.14.40/net/ipv6/raw.c
597597 @@ -483,6 +483,10 @@ static int rawv6_recvmsg(struct sock *sk
598598 skb = skb_recv_datagram(sk, flags, noblock, &err);
599599 if (!skb)
@@ -605,8 +605,8 @@
605605
606606 copied = skb->len;
607607 if (copied > len) {
608---- linux-4.14.39.orig/net/ipv6/udp.c
609-+++ linux-4.14.39/net/ipv6/udp.c
608+--- linux-4.14.40.orig/net/ipv6/udp.c
609++++ linux-4.14.40/net/ipv6/udp.c
610610 @@ -371,6 +371,8 @@ try_again:
611611 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
612612 if (!skb)
@@ -616,8 +616,8 @@
616616
617617 ulen = udp6_skb_len(skb);
618618 copied = len;
619---- linux-4.14.39.orig/net/socket.c
620-+++ linux-4.14.39/net/socket.c
619+--- linux-4.14.40.orig/net/socket.c
620++++ linux-4.14.40/net/socket.c
621621 @@ -1574,6 +1574,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
622622 if (err < 0)
623623 goto out_fd;
@@ -629,8 +629,8 @@
629629 if (upeer_sockaddr) {
630630 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
631631 &len, 2) < 0) {
632---- linux-4.14.39.orig/net/unix/af_unix.c
633-+++ linux-4.14.39/net/unix/af_unix.c
632+--- linux-4.14.40.orig/net/unix/af_unix.c
633++++ linux-4.14.40/net/unix/af_unix.c
634634 @@ -2131,6 +2131,10 @@ static int unix_dgram_recvmsg(struct soc
635635 POLLOUT | POLLWRNORM |
636636 POLLWRBAND);
@@ -650,8 +650,8 @@
650650 mutex_unlock(&u->iolock);
651651 out:
652652 return err;
653---- linux-4.14.39.orig/security/Kconfig
654-+++ linux-4.14.39/security/Kconfig
653+--- linux-4.14.40.orig/security/Kconfig
654++++ linux-4.14.40/security/Kconfig
655655 @@ -263,5 +263,7 @@ config DEFAULT_SECURITY
656656 default "apparmor" if DEFAULT_SECURITY_APPARMOR
657657 default "" if DEFAULT_SECURITY_DAC
@@ -660,8 +660,8 @@
660660 +
661661 endmenu
662662
663---- linux-4.14.39.orig/security/Makefile
664-+++ linux-4.14.39/security/Makefile
663+--- linux-4.14.40.orig/security/Makefile
664++++ linux-4.14.40/security/Makefile
665665 @@ -30,3 +30,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
666666 # Object integrity file lists
667667 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -669,8 +669,8 @@
669669 +
670670 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
671671 +obj-$(CONFIG_CCSECURITY) += ccsecurity/
672---- linux-4.14.39.orig/security/security.c
673-+++ linux-4.14.39/security/security.c
672+--- linux-4.14.40.orig/security/security.c
673++++ linux-4.14.40/security/security.c
674674 @@ -976,12 +976,19 @@ int security_file_open(struct file *file
675675
676676 int security_task_alloc(struct task_struct *task, unsigned long clone_flags)
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-2.6.32-centos-6.diff (revision 6645)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-2.6.32-centos-6.diff (revision 6646)
@@ -1,6 +1,6 @@
11 This is TOMOYO Linux patch for CentOS 6.
22
3-Source code for this patch is http://vault.centos.org/6.9/updates/Source/SPackages/kernel-2.6.32-696.23.1.el6.src.rpm
3+Source code for this patch is http://vault.centos.org/6.9/updates/Source/SPackages/kernel-2.6.32-696.28.1.el6.src.rpm
44 ---
55 fs/compat.c | 2 +-
66 fs/compat_ioctl.c | 3 +++
@@ -37,8 +37,8 @@
3737 security/Makefile | 3 +++
3838 33 files changed, 201 insertions(+), 2 deletions(-)
3939
40---- linux-2.6.32-696.23.1.el6.orig/fs/compat.c
41-+++ linux-2.6.32-696.23.1.el6/fs/compat.c
40+--- linux-2.6.32-696.28.1.el6.orig/fs/compat.c
41++++ linux-2.6.32-696.28.1.el6/fs/compat.c
4242 @@ -1524,7 +1524,7 @@ int compat_do_execve(const char * filena
4343 if (retval < 0)
4444 goto out;
@@ -48,8 +48,8 @@
4848 if (retval < 0)
4949 goto out;
5050
51---- linux-2.6.32-696.23.1.el6.orig/fs/compat_ioctl.c
52-+++ linux-2.6.32-696.23.1.el6/fs/compat_ioctl.c
51+--- linux-2.6.32-696.28.1.el6.orig/fs/compat_ioctl.c
52++++ linux-2.6.32-696.28.1.el6/fs/compat_ioctl.c
5353 @@ -114,6 +114,7 @@
5454 #ifdef CONFIG_SPARC
5555 #include <asm/fbio.h>
@@ -67,8 +67,8 @@
6767 if (error)
6868 goto out_fput;
6969
70---- linux-2.6.32-696.23.1.el6.orig/fs/exec.c
71-+++ linux-2.6.32-696.23.1.el6/fs/exec.c
70+--- linux-2.6.32-696.28.1.el6.orig/fs/exec.c
71++++ linux-2.6.32-696.28.1.el6/fs/exec.c
7272 @@ -1489,7 +1489,7 @@ int do_execve(const char * filename,
7373 goto out;
7474
@@ -78,8 +78,8 @@
7878 if (retval < 0)
7979 goto out;
8080
81---- linux-2.6.32-696.23.1.el6.orig/fs/fcntl.c
82-+++ linux-2.6.32-696.23.1.el6/fs/fcntl.c
81+--- linux-2.6.32-696.28.1.el6.orig/fs/fcntl.c
82++++ linux-2.6.32-696.28.1.el6/fs/fcntl.c
8383 @@ -428,6 +428,8 @@ SYSCALL_DEFINE3(fcntl, unsigned int, fd,
8484 goto out;
8585
@@ -98,8 +98,8 @@
9898 if (err) {
9999 fput(filp);
100100 return err;
101---- linux-2.6.32-696.23.1.el6.orig/fs/ioctl.c
102-+++ linux-2.6.32-696.23.1.el6/fs/ioctl.c
101+--- linux-2.6.32-696.28.1.el6.orig/fs/ioctl.c
102++++ linux-2.6.32-696.28.1.el6/fs/ioctl.c
103103 @@ -639,6 +639,8 @@ SYSCALL_DEFINE3(ioctl, unsigned int, fd,
104104 goto out;
105105
@@ -109,8 +109,8 @@
109109 if (error)
110110 goto out_fput;
111111
112---- linux-2.6.32-696.23.1.el6.orig/fs/namei.c
113-+++ linux-2.6.32-696.23.1.el6/fs/namei.c
112+--- linux-2.6.32-696.28.1.el6.orig/fs/namei.c
113++++ linux-2.6.32-696.28.1.el6/fs/namei.c
114114 @@ -2067,6 +2067,11 @@ int may_open(struct path *path, int acc_
115115 if (flag & O_NOATIME && !is_owner_or_cap(inode))
116116 return -EPERM;
@@ -198,8 +198,8 @@
198198 if (error)
199199 goto exit5;
200200 error = vfs_rename(old_dir->d_inode, old_dentry,
201---- linux-2.6.32-696.23.1.el6.orig/fs/namespace.c
202-+++ linux-2.6.32-696.23.1.el6/fs/namespace.c
201+--- linux-2.6.32-696.28.1.el6.orig/fs/namespace.c
202++++ linux-2.6.32-696.28.1.el6/fs/namespace.c
203203 @@ -1097,6 +1097,8 @@ static int do_umount(struct vfsmount *mn
204204 LIST_HEAD(umount_list);
205205
@@ -236,8 +236,8 @@
236236 if (error) {
237237 path_put(&old);
238238 goto out1;
239---- linux-2.6.32-696.23.1.el6.orig/fs/open.c
240-+++ linux-2.6.32-696.23.1.el6/fs/open.c
239+--- linux-2.6.32-696.28.1.el6.orig/fs/open.c
240++++ linux-2.6.32-696.28.1.el6/fs/open.c
241241 @@ -102,6 +102,8 @@ long vfs_truncate(struct path *path, lof
242242 error = locks_verify_truncate(inode, NULL, length);
243243 if (!error)
@@ -328,8 +328,8 @@
328328 if (capable(CAP_SYS_TTY_CONFIG)) {
329329 tty_vhangup_self();
330330 return 0;
331---- linux-2.6.32-696.23.1.el6.orig/fs/proc/version.c
332-+++ linux-2.6.32-696.23.1.el6/fs/proc/version.c
331+--- linux-2.6.32-696.28.1.el6.orig/fs/proc/version.c
332++++ linux-2.6.32-696.28.1.el6/fs/proc/version.c
333333 @@ -32,3 +32,10 @@ static int __init proc_version_init(void
334334 return 0;
335335 }
@@ -337,12 +337,12 @@
337337 +
338338 +static int __init ccs_show_version(void)
339339 +{
340-+ printk(KERN_INFO "Hook version: 2.6.32-696.23.1.el6 2018/03/19\n");
340++ printk(KERN_INFO "Hook version: 2.6.32-696.28.1.el6 2018/05/13\n");
341341 + return 0;
342342 +}
343343 +module_init(ccs_show_version);
344---- linux-2.6.32-696.23.1.el6.orig/fs/stat.c
345-+++ linux-2.6.32-696.23.1.el6/fs/stat.c
344+--- linux-2.6.32-696.28.1.el6.orig/fs/stat.c
345++++ linux-2.6.32-696.28.1.el6/fs/stat.c
346346 @@ -43,6 +43,8 @@ int vfs_getattr(struct vfsmount *mnt, st
347347 int retval;
348348
@@ -352,8 +352,8 @@
352352 if (retval)
353353 return retval;
354354
355---- linux-2.6.32-696.23.1.el6.orig/include/linux/init_task.h
356-+++ linux-2.6.32-696.23.1.el6/include/linux/init_task.h
355+--- linux-2.6.32-696.28.1.el6.orig/include/linux/init_task.h
356++++ linux-2.6.32-696.28.1.el6/include/linux/init_task.h
357357 @@ -123,6 +123,14 @@ extern struct cred init_cred;
358358 # define INIT_PERF_EVENTS(tsk)
359359 #endif
@@ -377,8 +377,8 @@
377377 }
378378
379379
380---- linux-2.6.32-696.23.1.el6.orig/include/linux/sched.h
381-+++ linux-2.6.32-696.23.1.el6/include/linux/sched.h
380+--- linux-2.6.32-696.28.1.el6.orig/include/linux/sched.h
381++++ linux-2.6.32-696.28.1.el6/include/linux/sched.h
382382 @@ -43,6 +43,8 @@
383383
384384 #ifdef __KERNEL__
@@ -399,8 +399,8 @@
399399 };
400400
401401 /* Future-safe accessor for struct task_struct's cpus_allowed. */
402---- linux-2.6.32-696.23.1.el6.orig/include/linux/security.h
403-+++ linux-2.6.32-696.23.1.el6/include/linux/security.h
402+--- linux-2.6.32-696.28.1.el6.orig/include/linux/security.h
403++++ linux-2.6.32-696.28.1.el6/include/linux/security.h
404404 @@ -35,6 +35,7 @@
405405 #include <linux/xfrm.h>
406406 #include <linux/gfp.h>
@@ -409,8 +409,8 @@
409409
410410 /* Maximum number of letters for an LSM name string */
411411 #define SECURITY_NAME_MAX 10
412---- linux-2.6.32-696.23.1.el6.orig/include/net/ip.h
413-+++ linux-2.6.32-696.23.1.el6/include/net/ip.h
412+--- linux-2.6.32-696.28.1.el6.orig/include/net/ip.h
413++++ linux-2.6.32-696.28.1.el6/include/net/ip.h
414414 @@ -33,6 +33,7 @@
415415 #endif
416416 #include <net/snmp.h>
@@ -428,8 +428,8 @@
428428 return test_bit(port, sysctl_local_reserved_ports);
429429 }
430430
431---- linux-2.6.32-696.23.1.el6.orig/kernel/compat.c
432-+++ linux-2.6.32-696.23.1.el6/kernel/compat.c
431+--- linux-2.6.32-696.28.1.el6.orig/kernel/compat.c
432++++ linux-2.6.32-696.28.1.el6/kernel/compat.c
433433 @@ -1005,6 +1005,8 @@ asmlinkage long compat_sys_stime(compat_
434434 err = security_settime(&tv, NULL);
435435 if (err)
@@ -439,8 +439,8 @@
439439
440440 do_settimeofday(&tv);
441441 return 0;
442---- linux-2.6.32-696.23.1.el6.orig/kernel/fork.c
443-+++ linux-2.6.32-696.23.1.el6/kernel/fork.c
442+--- linux-2.6.32-696.28.1.el6.orig/kernel/fork.c
443++++ linux-2.6.32-696.28.1.el6/kernel/fork.c
444444 @@ -206,6 +206,7 @@ void __put_task_struct(struct task_struc
445445 exit_creds(tsk);
446446 delayacct_tsk_free(tsk);
@@ -467,8 +467,8 @@
467467 bad_fork_cleanup_perf:
468468 perf_event_free_task(p);
469469 bad_fork_cleanup_policy:
470---- linux-2.6.32-696.23.1.el6.orig/kernel/kexec.c
471-+++ linux-2.6.32-696.23.1.el6/kernel/kexec.c
470+--- linux-2.6.32-696.28.1.el6.orig/kernel/kexec.c
471++++ linux-2.6.32-696.28.1.el6/kernel/kexec.c
472472 @@ -41,6 +41,7 @@
473473 #include <asm/system.h>
474474 #include <asm/sections.h>
@@ -486,8 +486,8 @@
486486
487487 if (kexec_load_disabled)
488488 return -EPERM;
489---- linux-2.6.32-696.23.1.el6.orig/kernel/module.c
490-+++ linux-2.6.32-696.23.1.el6/kernel/module.c
489+--- linux-2.6.32-696.28.1.el6.orig/kernel/module.c
490++++ linux-2.6.32-696.28.1.el6/kernel/module.c
491491 @@ -56,6 +56,7 @@
492492 #include <linux/percpu.h>
493493 #include <linux/kmemleak.h>
@@ -514,8 +514,8 @@
514514
515515 /* Only one module load at a time, please */
516516 if (mutex_lock_interruptible(&module_mutex) != 0)
517---- linux-2.6.32-696.23.1.el6.orig/kernel/ptrace.c
518-+++ linux-2.6.32-696.23.1.el6/kernel/ptrace.c
517+--- linux-2.6.32-696.28.1.el6.orig/kernel/ptrace.c
518++++ linux-2.6.32-696.28.1.el6/kernel/ptrace.c
519519 @@ -199,6 +199,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
520520 {
521521 struct task_struct *child;
@@ -540,9 +540,9 @@
540540
541541 if (request == PTRACE_TRACEME) {
542542 ret = ptrace_traceme();
543---- linux-2.6.32-696.23.1.el6.orig/kernel/sched.c
544-+++ linux-2.6.32-696.23.1.el6/kernel/sched.c
545-@@ -6852,6 +6852,8 @@ int can_nice(const struct task_struct *p
543+--- linux-2.6.32-696.28.1.el6.orig/kernel/sched.c
544++++ linux-2.6.32-696.28.1.el6/kernel/sched.c
545+@@ -6868,6 +6868,8 @@ int can_nice(const struct task_struct *p
546546 SYSCALL_DEFINE1(nice, int, increment)
547547 {
548548 long nice, retval;
@@ -551,8 +551,8 @@
551551
552552 /*
553553 * Setpriority might change our priority at the same moment.
554---- linux-2.6.32-696.23.1.el6.orig/kernel/signal.c
555-+++ linux-2.6.32-696.23.1.el6/kernel/signal.c
554+--- linux-2.6.32-696.28.1.el6.orig/kernel/signal.c
555++++ linux-2.6.32-696.28.1.el6/kernel/signal.c
556556 @@ -2312,6 +2312,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
557557 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
558558 {
@@ -598,8 +598,8 @@
598598
599599 return do_send_specific(tgid, pid, sig, info);
600600 }
601---- linux-2.6.32-696.23.1.el6.orig/kernel/sys.c
602-+++ linux-2.6.32-696.23.1.el6/kernel/sys.c
601+--- linux-2.6.32-696.28.1.el6.orig/kernel/sys.c
602++++ linux-2.6.32-696.28.1.el6/kernel/sys.c
603603 @@ -157,6 +157,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
604604
605605 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -638,8 +638,8 @@
638638
639639 down_write(&uts_sem);
640640 errno = -EFAULT;
641---- linux-2.6.32-696.23.1.el6.orig/kernel/sysctl.c
642-+++ linux-2.6.32-696.23.1.el6/kernel/sysctl.c
641+--- linux-2.6.32-696.28.1.el6.orig/kernel/sysctl.c
642++++ linux-2.6.32-696.28.1.el6/kernel/sysctl.c
643643 @@ -2130,6 +2130,9 @@ int do_sysctl(int __user *name, int nlen
644644
645645 for (head = sysctl_head_next(NULL); head;
@@ -650,8 +650,8 @@
650650 error = parse_table(name, nlen, oldval, oldlenp,
651651 newval, newlen,
652652 head->root, head->ctl_table);
653---- linux-2.6.32-696.23.1.el6.orig/kernel/time.c
654-+++ linux-2.6.32-696.23.1.el6/kernel/time.c
653+--- linux-2.6.32-696.28.1.el6.orig/kernel/time.c
654++++ linux-2.6.32-696.28.1.el6/kernel/time.c
655655 @@ -92,6 +92,8 @@ SYSCALL_DEFINE1(stime, time_t __user *,
656656 err = security_settime(&tv, NULL);
657657 if (err)
@@ -670,8 +670,8 @@
670670
671671 if (tz) {
672672 /* SMP safe, global irq locking makes it work. */
673---- linux-2.6.32-696.23.1.el6.orig/kernel/time/ntp.c
674-+++ linux-2.6.32-696.23.1.el6/kernel/time/ntp.c
673+--- linux-2.6.32-696.28.1.el6.orig/kernel/time/ntp.c
674++++ linux-2.6.32-696.28.1.el6/kernel/time/ntp.c
675675 @@ -14,6 +14,7 @@
676676 #include <linux/timex.h>
677677 #include <linux/time.h>
@@ -696,8 +696,8 @@
696696
697697 /*
698698 * if the quartz is off by more than 10% then
699---- linux-2.6.32-696.23.1.el6.orig/net/ipv4/raw.c
700-+++ linux-2.6.32-696.23.1.el6/net/ipv4/raw.c
699+--- linux-2.6.32-696.28.1.el6.orig/net/ipv4/raw.c
700++++ linux-2.6.32-696.28.1.el6/net/ipv4/raw.c
701701 @@ -77,6 +77,7 @@
702702 #include <linux/seq_file.h>
703703 #include <linux/netfilter.h>
@@ -717,8 +717,8 @@
717717
718718 copied = skb->len;
719719 if (len < copied) {
720---- linux-2.6.32-696.23.1.el6.orig/net/ipv4/udp.c
721-+++ linux-2.6.32-696.23.1.el6/net/ipv4/udp.c
720+--- linux-2.6.32-696.28.1.el6.orig/net/ipv4/udp.c
721++++ linux-2.6.32-696.28.1.el6/net/ipv4/udp.c
722722 @@ -108,6 +108,7 @@
723723 #include <trace/events/udp.h>
724724 #include <net/busy_poll.h>
@@ -738,8 +738,8 @@
738738
739739 ulen = skb->len - sizeof(struct udphdr);
740740 copied = len;
741---- linux-2.6.32-696.23.1.el6.orig/net/ipv6/raw.c
742-+++ linux-2.6.32-696.23.1.el6/net/ipv6/raw.c
741+--- linux-2.6.32-696.28.1.el6.orig/net/ipv6/raw.c
742++++ linux-2.6.32-696.28.1.el6/net/ipv6/raw.c
743743 @@ -59,6 +59,7 @@
744744
745745 #include <linux/proc_fs.h>
@@ -759,8 +759,8 @@
759759
760760 copied = skb->len;
761761 if (copied > len) {
762---- linux-2.6.32-696.23.1.el6.orig/net/ipv6/udp.c
763-+++ linux-2.6.32-696.23.1.el6/net/ipv6/udp.c
762+--- linux-2.6.32-696.28.1.el6.orig/net/ipv6/udp.c
763++++ linux-2.6.32-696.28.1.el6/net/ipv6/udp.c
764764 @@ -50,6 +50,7 @@
765765 #include <linux/proc_fs.h>
766766 #include <linux/seq_file.h>
@@ -780,8 +780,8 @@
780780
781781 ulen = skb->len - sizeof(struct udphdr);
782782 copied = len;
783---- linux-2.6.32-696.23.1.el6.orig/net/socket.c
784-+++ linux-2.6.32-696.23.1.el6/net/socket.c
783+--- linux-2.6.32-696.28.1.el6.orig/net/socket.c
784++++ linux-2.6.32-696.28.1.el6/net/socket.c
785785 @@ -578,6 +578,8 @@ static inline int __sock_sendmsg(struct
786786 struct msghdr *msg, size_t size)
787787 {
@@ -842,8 +842,8 @@
842842 if (err)
843843 goto out_put;
844844
845---- linux-2.6.32-696.23.1.el6.orig/net/unix/af_unix.c
846-+++ linux-2.6.32-696.23.1.el6/net/unix/af_unix.c
845+--- linux-2.6.32-696.28.1.el6.orig/net/unix/af_unix.c
846++++ linux-2.6.32-696.28.1.el6/net/unix/af_unix.c
847847 @@ -981,6 +981,9 @@ static int unix_bind(struct socket *sock
848848 mode = S_IFSOCK |
849849 (SOCK_INODE(sock)->i_mode & ~current_umask());
@@ -865,8 +865,8 @@
865865 if (msg->msg_name)
866866 unix_copy_addr(msg, skb->sk);
867867
868---- linux-2.6.32-696.23.1.el6.orig/security/Kconfig
869-+++ linux-2.6.32-696.23.1.el6/security/Kconfig
868+--- linux-2.6.32-696.28.1.el6.orig/security/Kconfig
869++++ linux-2.6.32-696.28.1.el6/security/Kconfig
870870 @@ -188,5 +188,7 @@ source security/tomoyo/Kconfig
871871
872872 source security/integrity/ima/Kconfig
@@ -875,8 +875,8 @@
875875 +
876876 endmenu
877877
878---- linux-2.6.32-696.23.1.el6.orig/security/Makefile
879-+++ linux-2.6.32-696.23.1.el6/security/Makefile
878+--- linux-2.6.32-696.28.1.el6.orig/security/Makefile
879++++ linux-2.6.32-696.28.1.el6/security/Makefile
880880 @@ -25,3 +25,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
881881 # Object integrity file lists
882882 subdir-$(CONFIG_IMA) += integrity/ima
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-3.10-centos-7.diff (revision 6645)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-3.10-centos-7.diff (revision 6646)
@@ -1,6 +1,6 @@
11 This is TOMOYO Linux patch for CentOS 7.
22
3-Source code for this patch is http://vault.centos.org/centos/7/os/Source/SPackages/kernel-3.10.0-862.el7.src.rpm
3+Source code for this patch is http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-862.2.3.el7.src.rpm
44 ---
55 fs/exec.c | 2
66 fs/open.c | 2
@@ -28,8 +28,8 @@
2828 security/security.c | 111 +++++++++++++++++++++++++++++++++++++++++-----
2929 24 files changed, 248 insertions(+), 37 deletions(-)
3030
31---- linux-3.10.0-862.el7.orig/fs/exec.c
32-+++ linux-3.10.0-862.el7/fs/exec.c
31+--- linux-3.10.0-862.2.3.el7.orig/fs/exec.c
32++++ linux-3.10.0-862.2.3.el7/fs/exec.c
3333 @@ -1592,7 +1592,7 @@ static int do_execve_common(struct filen
3434 if (retval < 0)
3535 goto out;
@@ -39,8 +39,8 @@
3939 if (retval < 0)
4040 goto out;
4141
42---- linux-3.10.0-862.el7.orig/fs/open.c
43-+++ linux-3.10.0-862.el7/fs/open.c
42+--- linux-3.10.0-862.2.3.el7.orig/fs/open.c
43++++ linux-3.10.0-862.2.3.el7/fs/open.c
4444 @@ -1142,6 +1142,8 @@ EXPORT_SYMBOL(sys_close);
4545 */
4646 SYSCALL_DEFINE0(vhangup)
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-3.10.0-862.el7.orig/fs/proc/version.c
54-+++ linux-3.10.0-862.el7/fs/proc/version.c
53+--- linux-3.10.0-862.2.3.el7.orig/fs/proc/version.c
54++++ linux-3.10.0-862.2.3.el7/fs/proc/version.c
5555 @@ -32,3 +32,10 @@ static int __init proc_version_init(void
5656 return 0;
5757 }
@@ -59,12 +59,12 @@
5959 +
6060 +static int __init ccs_show_version(void)
6161 +{
62-+ printk(KERN_INFO "Hook version: 3.10.0-862.el7 2018/04/30\n");
62++ printk(KERN_INFO "Hook version: 3.10.0-862.2.3.el7 2018/05/13\n");
6363 + return 0;
6464 +}
6565 +module_init(ccs_show_version);
66---- linux-3.10.0-862.el7.orig/include/linux/init_task.h
67-+++ linux-3.10.0-862.el7/include/linux/init_task.h
66+--- linux-3.10.0-862.2.3.el7.orig/include/linux/init_task.h
67++++ linux-3.10.0-862.2.3.el7/include/linux/init_task.h
6868 @@ -173,6 +173,14 @@ extern struct task_group root_task_group
6969 # define INIT_RT_MUTEXES(tsk)
7070 #endif
@@ -88,8 +88,8 @@
8888 }
8989
9090
91---- linux-3.10.0-862.el7.orig/include/linux/sched.h
92-+++ linux-3.10.0-862.el7/include/linux/sched.h
91+--- linux-3.10.0-862.2.3.el7.orig/include/linux/sched.h
92++++ linux-3.10.0-862.2.3.el7/include/linux/sched.h
9393 @@ -4,6 +4,8 @@
9494 #include <uapi/linux/sched.h>
9595 #include <linux/rh_kabi.h>
@@ -110,8 +110,8 @@
110110 };
111111
112112 /* Future-safe accessor for struct task_struct's cpus_allowed. */
113---- linux-3.10.0-862.el7.orig/include/linux/security.h
114-+++ linux-3.10.0-862.el7/include/linux/security.h
113+--- linux-3.10.0-862.2.3.el7.orig/include/linux/security.h
114++++ linux-3.10.0-862.2.3.el7/include/linux/security.h
115115 @@ -55,6 +55,7 @@ struct msg_queue;
116116 struct xattr;
117117 struct xfrm_sec_ctx;
@@ -323,8 +323,8 @@
323323 }
324324 #endif /* CONFIG_SECURITY_PATH */
325325
326---- linux-3.10.0-862.el7.orig/include/net/ip.h
327-+++ linux-3.10.0-862.el7/include/net/ip.h
326+--- linux-3.10.0-862.2.3.el7.orig/include/net/ip.h
327++++ linux-3.10.0-862.2.3.el7/include/net/ip.h
328328 @@ -230,6 +230,8 @@ void inet_get_local_port_range(struct ne
329329 extern unsigned long *sysctl_local_reserved_ports;
330330 static inline int inet_is_reserved_local_port(int port)
@@ -334,8 +334,8 @@
334334 return test_bit(port, sysctl_local_reserved_ports);
335335 }
336336
337---- linux-3.10.0-862.el7.orig/kernel/fork.c
338-+++ linux-3.10.0-862.el7/kernel/fork.c
337+--- linux-3.10.0-862.2.3.el7.orig/kernel/fork.c
338++++ linux-3.10.0-862.2.3.el7/kernel/fork.c
339339 @@ -278,6 +278,7 @@ void __put_task_struct(struct task_struc
340340 delayacct_tsk_free(tsk);
341341 put_signal_struct(tsk->signal);
@@ -362,8 +362,8 @@
362362 bad_fork_cleanup_perf:
363363 perf_event_free_task(p);
364364 bad_fork_cleanup_policy:
365---- linux-3.10.0-862.el7.orig/kernel/kexec.c
366-+++ linux-3.10.0-862.el7/kernel/kexec.c
365+--- linux-3.10.0-862.2.3.el7.orig/kernel/kexec.c
366++++ linux-3.10.0-862.2.3.el7/kernel/kexec.c
367367 @@ -190,6 +190,8 @@ SYSCALL_DEFINE4(kexec_load, unsigned lon
368368 /* We only trust the superuser with rebooting the system. */
369369 if (!capable(CAP_SYS_BOOT) || kexec_load_disabled)
@@ -373,8 +373,8 @@
373373
374374 if (get_securelevel() > 0)
375375 return -EPERM;
376---- linux-3.10.0-862.el7.orig/kernel/module.c
377-+++ linux-3.10.0-862.el7/kernel/module.c
376+--- linux-3.10.0-862.2.3.el7.orig/kernel/module.c
377++++ linux-3.10.0-862.2.3.el7/kernel/module.c
378378 @@ -66,6 +66,7 @@
379379 #endif /* __GENKSYMS__ */
380380 #include <uapi/linux/module.h>
@@ -401,8 +401,8 @@
401401
402402 return 0;
403403 }
404---- linux-3.10.0-862.el7.orig/kernel/ptrace.c
405-+++ linux-3.10.0-862.el7/kernel/ptrace.c
404+--- linux-3.10.0-862.2.3.el7.orig/kernel/ptrace.c
405++++ linux-3.10.0-862.2.3.el7/kernel/ptrace.c
406406 @@ -1082,6 +1082,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
407407 {
408408 struct task_struct *child;
@@ -427,8 +427,8 @@
427427
428428 if (request == PTRACE_TRACEME) {
429429 ret = ptrace_traceme();
430---- linux-3.10.0-862.el7.orig/kernel/sched/core.c
431-+++ linux-3.10.0-862.el7/kernel/sched/core.c
430+--- linux-3.10.0-862.2.3.el7.orig/kernel/sched/core.c
431++++ linux-3.10.0-862.2.3.el7/kernel/sched/core.c
432432 @@ -4279,6 +4279,8 @@ int can_nice(const struct task_struct *p
433433 SYSCALL_DEFINE1(nice, int, increment)
434434 {
@@ -438,8 +438,8 @@
438438
439439 /*
440440 * Setpriority might change our priority at the same moment.
441---- linux-3.10.0-862.el7.orig/kernel/signal.c
442-+++ linux-3.10.0-862.el7/kernel/signal.c
441+--- linux-3.10.0-862.2.3.el7.orig/kernel/signal.c
442++++ linux-3.10.0-862.2.3.el7/kernel/signal.c
443443 @@ -2946,6 +2946,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
444444 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
445445 {
@@ -485,8 +485,8 @@
485485
486486 return do_send_specific(tgid, pid, sig, info);
487487 }
488---- linux-3.10.0-862.el7.orig/kernel/sys.c
489-+++ linux-3.10.0-862.el7/kernel/sys.c
488+--- linux-3.10.0-862.2.3.el7.orig/kernel/sys.c
489++++ linux-3.10.0-862.2.3.el7/kernel/sys.c
490490 @@ -192,6 +192,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
491491
492492 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -525,8 +525,8 @@
525525
526526 down_write(&uts_sem);
527527 errno = -EFAULT;
528---- linux-3.10.0-862.el7.orig/kernel/time/ntp.c
529-+++ linux-3.10.0-862.el7/kernel/time/ntp.c
528+--- linux-3.10.0-862.2.3.el7.orig/kernel/time/ntp.c
529++++ linux-3.10.0-862.2.3.el7/kernel/time/ntp.c
530530 @@ -16,6 +16,7 @@
531531 #include <linux/mm.h>
532532 #include <linux/module.h>
@@ -560,8 +560,8 @@
560560
561561 return 0;
562562 }
563---- linux-3.10.0-862.el7.orig/net/ipv4/raw.c
564-+++ linux-3.10.0-862.el7/net/ipv4/raw.c
563+--- linux-3.10.0-862.2.3.el7.orig/net/ipv4/raw.c
564++++ linux-3.10.0-862.2.3.el7/net/ipv4/raw.c
565565 @@ -706,6 +706,10 @@ static int raw_recvmsg(struct kiocb *ioc
566566 skb = skb_recv_datagram(sk, flags, noblock, &err);
567567 if (!skb)
@@ -573,8 +573,8 @@
573573
574574 copied = skb->len;
575575 if (len < copied) {
576---- linux-3.10.0-862.el7.orig/net/ipv4/udp.c
577-+++ linux-3.10.0-862.el7/net/ipv4/udp.c
576+--- linux-3.10.0-862.2.3.el7.orig/net/ipv4/udp.c
577++++ linux-3.10.0-862.2.3.el7/net/ipv4/udp.c
578578 @@ -1392,6 +1392,10 @@ try_again:
579579 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
580580 if (!skb)
@@ -586,8 +586,8 @@
586586
587587 ulen = skb->len - sizeof(struct udphdr);
588588 copied = len;
589---- linux-3.10.0-862.el7.orig/net/ipv6/raw.c
590-+++ linux-3.10.0-862.el7/net/ipv6/raw.c
589+--- linux-3.10.0-862.2.3.el7.orig/net/ipv6/raw.c
590++++ linux-3.10.0-862.2.3.el7/net/ipv6/raw.c
591591 @@ -468,6 +468,10 @@ static int rawv6_recvmsg(struct kiocb *i
592592 skb = skb_recv_datagram(sk, flags, noblock, &err);
593593 if (!skb)
@@ -599,8 +599,8 @@
599599
600600 copied = skb->len;
601601 if (copied > len) {
602---- linux-3.10.0-862.el7.orig/net/ipv6/udp.c
603-+++ linux-3.10.0-862.el7/net/ipv6/udp.c
602+--- linux-3.10.0-862.2.3.el7.orig/net/ipv6/udp.c
603++++ linux-3.10.0-862.2.3.el7/net/ipv6/udp.c
604604 @@ -384,6 +384,10 @@ try_again:
605605 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
606606 if (!skb)
@@ -612,8 +612,8 @@
612612
613613 ulen = skb->len - sizeof(struct udphdr);
614614 copied = len;
615---- linux-3.10.0-862.el7.orig/net/socket.c
616-+++ linux-3.10.0-862.el7/net/socket.c
615+--- linux-3.10.0-862.2.3.el7.orig/net/socket.c
616++++ linux-3.10.0-862.2.3.el7/net/socket.c
617617 @@ -1660,6 +1660,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
618618 if (err < 0)
619619 goto out_fd;
@@ -625,8 +625,8 @@
625625 if (upeer_sockaddr) {
626626 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
627627 &len, 2) < 0) {
628---- linux-3.10.0-862.el7.orig/net/unix/af_unix.c
629-+++ linux-3.10.0-862.el7/net/unix/af_unix.c
628+--- linux-3.10.0-862.2.3.el7.orig/net/unix/af_unix.c
629++++ linux-3.10.0-862.2.3.el7/net/unix/af_unix.c
630630 @@ -2137,6 +2137,10 @@ static int unix_dgram_recvmsg(struct kio
631631 wake_up_interruptible_sync_poll(&u->peer_wait,
632632 POLLOUT | POLLWRNORM | POLLWRBAND);
@@ -638,8 +638,8 @@
638638 if (msg->msg_name)
639639 unix_copy_addr(msg, skb->sk);
640640
641---- linux-3.10.0-862.el7.orig/security/Kconfig
642-+++ linux-3.10.0-862.el7/security/Kconfig
641+--- linux-3.10.0-862.2.3.el7.orig/security/Kconfig
642++++ linux-3.10.0-862.2.3.el7/security/Kconfig
643643 @@ -194,5 +194,7 @@ config DEFAULT_SECURITY
644644 default "yama" if DEFAULT_SECURITY_YAMA
645645 default "" if DEFAULT_SECURITY_DAC
@@ -648,8 +648,8 @@
648648 +
649649 endmenu
650650
651---- linux-3.10.0-862.el7.orig/security/Makefile
652-+++ linux-3.10.0-862.el7/security/Makefile
651+--- linux-3.10.0-862.2.3.el7.orig/security/Makefile
652++++ linux-3.10.0-862.2.3.el7/security/Makefile
653653 @@ -29,3 +29,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
654654 # Object integrity file lists
655655 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -657,8 +657,8 @@
657657 +
658658 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
659659 +obj-$(CONFIG_CCSECURITY) += ccsecurity/built-in.o
660---- linux-3.10.0-862.el7.orig/security/security.c
661-+++ linux-3.10.0-862.el7/security/security.c
660+--- linux-3.10.0-862.2.3.el7.orig/security/security.c
661++++ linux-3.10.0-862.2.3.el7/security/security.c
662662 @@ -224,7 +224,10 @@ int security_syslog(int type)
663663
664664 int security_settime(const struct timespec *ts, const struct timezone *tz)
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.16.diff (revision 6645)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.16.diff (revision 6646)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.16.7.
1+This is TOMOYO Linux patch for kernel 4.16.8.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.7.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.8.tar.xz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,8 +28,8 @@
2828 security/security.c | 9 +++++-
2929 24 files changed, 148 insertions(+), 29 deletions(-)
3030
31---- linux-4.16.7.orig/fs/exec.c
32-+++ linux-4.16.7/fs/exec.c
31+--- linux-4.16.8.orig/fs/exec.c
32++++ linux-4.16.8/fs/exec.c
3333 @@ -1677,7 +1677,7 @@ static int exec_binprm(struct linux_binp
3434 old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
3535 rcu_read_unlock();
@@ -39,8 +39,8 @@
3939 if (ret >= 0) {
4040 audit_bprm(bprm);
4141 trace_sched_process_exec(current, old_pid, bprm);
42---- linux-4.16.7.orig/fs/open.c
43-+++ linux-4.16.7/fs/open.c
42+--- linux-4.16.8.orig/fs/open.c
43++++ linux-4.16.8/fs/open.c
4444 @@ -1171,6 +1171,8 @@ EXPORT_SYMBOL(sys_close);
4545 */
4646 SYSCALL_DEFINE0(vhangup)
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-4.16.7.orig/fs/proc/version.c
54-+++ linux-4.16.7/fs/proc/version.c
53+--- linux-4.16.8.orig/fs/proc/version.c
54++++ linux-4.16.8/fs/proc/version.c
5555 @@ -33,3 +33,10 @@ static int __init proc_version_init(void
5656 return 0;
5757 }
@@ -59,12 +59,12 @@
5959 +
6060 +static int __init ccs_show_version(void)
6161 +{
62-+ printk(KERN_INFO "Hook version: 4.16.7 2018/05/07\n");
62++ printk(KERN_INFO "Hook version: 4.16.8 2018/05/13\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.16.7.orig/include/linux/sched.h
67-+++ linux-4.16.7/include/linux/sched.h
66+--- linux-4.16.8.orig/include/linux/sched.h
67++++ linux-4.16.8/include/linux/sched.h
6868 @@ -33,6 +33,7 @@ struct audit_context;
6969 struct backing_dev_info;
7070 struct bio_list;
@@ -84,8 +84,8 @@
8484
8585 /*
8686 * New fields for task_struct should be added above here, so that
87---- linux-4.16.7.orig/include/linux/security.h
88-+++ linux-4.16.7/include/linux/security.h
87+--- linux-4.16.8.orig/include/linux/security.h
88++++ linux-4.16.8/include/linux/security.h
8989 @@ -56,6 +56,7 @@ struct msg_queue;
9090 struct xattr;
9191 struct xfrm_sec_ctx;
@@ -306,8 +306,8 @@
306306 }
307307 #endif /* CONFIG_SECURITY_PATH */
308308
309---- linux-4.16.7.orig/include/net/ip.h
310-+++ linux-4.16.7/include/net/ip.h
309+--- linux-4.16.8.orig/include/net/ip.h
310++++ linux-4.16.8/include/net/ip.h
311311 @@ -268,6 +268,8 @@ void inet_get_local_port_range(struct ne
312312 #ifdef CONFIG_SYSCTL
313313 static inline int inet_is_local_reserved_port(struct net *net, int port)
@@ -326,8 +326,8 @@
326326 return 0;
327327 }
328328
329---- linux-4.16.7.orig/init/init_task.c
330-+++ linux-4.16.7/init/init_task.c
329+--- linux-4.16.8.orig/init/init_task.c
330++++ linux-4.16.8/init/init_task.c
331331 @@ -175,6 +175,10 @@ struct task_struct init_task
332332 #ifdef CONFIG_SECURITY
333333 .security = NULL,
@@ -339,8 +339,8 @@
339339 };
340340 EXPORT_SYMBOL(init_task);
341341
342---- linux-4.16.7.orig/kernel/kexec.c
343-+++ linux-4.16.7/kernel/kexec.c
342+--- linux-4.16.8.orig/kernel/kexec.c
343++++ linux-4.16.8/kernel/kexec.c
344344 @@ -17,7 +17,7 @@
345345 #include <linux/syscalls.h>
346346 #include <linux/vmalloc.h>
@@ -359,8 +359,8 @@
359359
360360 /*
361361 * Verify we have a legal set of flags
362---- linux-4.16.7.orig/kernel/module.c
363-+++ linux-4.16.7/kernel/module.c
362+--- linux-4.16.8.orig/kernel/module.c
363++++ linux-4.16.8/kernel/module.c
364364 @@ -66,6 +66,7 @@
365365 #include <linux/audit.h>
366366 #include <uapi/linux/module.h>
@@ -387,8 +387,8 @@
387387
388388 return 0;
389389 }
390---- linux-4.16.7.orig/kernel/ptrace.c
391-+++ linux-4.16.7/kernel/ptrace.c
390+--- linux-4.16.8.orig/kernel/ptrace.c
391++++ linux-4.16.8/kernel/ptrace.c
392392 @@ -1112,6 +1112,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
393393 {
394394 struct task_struct *child;
@@ -413,8 +413,8 @@
413413
414414 if (request == PTRACE_TRACEME) {
415415 ret = ptrace_traceme();
416---- linux-4.16.7.orig/kernel/reboot.c
417-+++ linux-4.16.7/kernel/reboot.c
416+--- linux-4.16.8.orig/kernel/reboot.c
417++++ linux-4.16.8/kernel/reboot.c
418418 @@ -16,6 +16,7 @@
419419 #include <linux/syscalls.h>
420420 #include <linux/syscore_ops.h>
@@ -432,8 +432,8 @@
432432
433433 /*
434434 * If pid namespaces are enabled and the current task is in a child
435---- linux-4.16.7.orig/kernel/sched/core.c
436-+++ linux-4.16.7/kernel/sched/core.c
435+--- linux-4.16.8.orig/kernel/sched/core.c
436++++ linux-4.16.8/kernel/sched/core.c
437437 @@ -3926,6 +3926,8 @@ int can_nice(const struct task_struct *p
438438 SYSCALL_DEFINE1(nice, int, increment)
439439 {
@@ -443,8 +443,8 @@
443443
444444 /*
445445 * Setpriority might change our priority at the same moment.
446---- linux-4.16.7.orig/kernel/signal.c
447-+++ linux-4.16.7/kernel/signal.c
446+--- linux-4.16.8.orig/kernel/signal.c
447++++ linux-4.16.8/kernel/signal.c
448448 @@ -3245,6 +3245,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait,
449449 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
450450 {
@@ -490,8 +490,8 @@
490490
491491 return do_send_specific(tgid, pid, sig, info);
492492 }
493---- linux-4.16.7.orig/kernel/sys.c
494-+++ linux-4.16.7/kernel/sys.c
493+--- linux-4.16.8.orig/kernel/sys.c
494++++ linux-4.16.8/kernel/sys.c
495495 @@ -197,6 +197,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
496496
497497 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -521,8 +521,8 @@
521521
522522 down_write(&uts_sem);
523523 errno = -EFAULT;
524---- linux-4.16.7.orig/kernel/time/timekeeping.c
525-+++ linux-4.16.7/kernel/time/timekeeping.c
524+--- linux-4.16.8.orig/kernel/time/timekeeping.c
525++++ linux-4.16.8/kernel/time/timekeeping.c
526526 @@ -25,6 +25,7 @@
527527 #include <linux/stop_machine.h>
528528 #include <linux/pvclock_gtod.h>
@@ -556,8 +556,8 @@
556556
557557 /*
558558 * Validate if a timespec/timeval used to inject a time
559---- linux-4.16.7.orig/net/ipv4/raw.c
560-+++ linux-4.16.7/net/ipv4/raw.c
559+--- linux-4.16.8.orig/net/ipv4/raw.c
560++++ linux-4.16.8/net/ipv4/raw.c
561561 @@ -781,6 +781,10 @@ static int raw_recvmsg(struct sock *sk,
562562 skb = skb_recv_datagram(sk, flags, noblock, &err);
563563 if (!skb)
@@ -569,8 +569,8 @@
569569
570570 copied = skb->len;
571571 if (len < copied) {
572---- linux-4.16.7.orig/net/ipv4/udp.c
573-+++ linux-4.16.7/net/ipv4/udp.c
572+--- linux-4.16.8.orig/net/ipv4/udp.c
573++++ linux-4.16.8/net/ipv4/udp.c
574574 @@ -1582,6 +1582,8 @@ try_again:
575575 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
576576 if (!skb)
@@ -580,8 +580,8 @@
580580
581581 ulen = udp_skb_len(skb);
582582 copied = len;
583---- linux-4.16.7.orig/net/ipv6/raw.c
584-+++ linux-4.16.7/net/ipv6/raw.c
583+--- linux-4.16.8.orig/net/ipv6/raw.c
584++++ linux-4.16.8/net/ipv6/raw.c
585585 @@ -483,6 +483,10 @@ static int rawv6_recvmsg(struct sock *sk
586586 skb = skb_recv_datagram(sk, flags, noblock, &err);
587587 if (!skb)
@@ -593,8 +593,8 @@
593593
594594 copied = skb->len;
595595 if (copied > len) {
596---- linux-4.16.7.orig/net/ipv6/udp.c
597-+++ linux-4.16.7/net/ipv6/udp.c
596+--- linux-4.16.8.orig/net/ipv6/udp.c
597++++ linux-4.16.8/net/ipv6/udp.c
598598 @@ -341,6 +341,8 @@ try_again:
599599 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
600600 if (!skb)
@@ -604,8 +604,8 @@
604604
605605 ulen = udp6_skb_len(skb);
606606 copied = len;
607---- linux-4.16.7.orig/net/socket.c
608-+++ linux-4.16.7/net/socket.c
607+--- linux-4.16.8.orig/net/socket.c
608++++ linux-4.16.8/net/socket.c
609609 @@ -1572,6 +1572,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
610610 if (err < 0)
611611 goto out_fd;
@@ -617,8 +617,8 @@
617617 if (upeer_sockaddr) {
618618 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
619619 &len, 2) < 0) {
620---- linux-4.16.7.orig/net/unix/af_unix.c
621-+++ linux-4.16.7/net/unix/af_unix.c
620+--- linux-4.16.8.orig/net/unix/af_unix.c
621++++ linux-4.16.8/net/unix/af_unix.c
622622 @@ -2132,6 +2132,10 @@ static int unix_dgram_recvmsg(struct soc
623623 EPOLLOUT | EPOLLWRNORM |
624624 EPOLLWRBAND);
@@ -638,8 +638,8 @@
638638 mutex_unlock(&u->iolock);
639639 out:
640640 return err;
641---- linux-4.16.7.orig/security/Kconfig
642-+++ linux-4.16.7/security/Kconfig
641+--- linux-4.16.8.orig/security/Kconfig
642++++ linux-4.16.8/security/Kconfig
643643 @@ -277,5 +277,7 @@ config DEFAULT_SECURITY
644644 default "apparmor" if DEFAULT_SECURITY_APPARMOR
645645 default "" if DEFAULT_SECURITY_DAC
@@ -648,8 +648,8 @@
648648 +
649649 endmenu
650650
651---- linux-4.16.7.orig/security/Makefile
652-+++ linux-4.16.7/security/Makefile
651+--- linux-4.16.8.orig/security/Makefile
652++++ linux-4.16.8/security/Makefile
653653 @@ -30,3 +30,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
654654 # Object integrity file lists
655655 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -657,8 +657,8 @@
657657 +
658658 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
659659 +obj-$(CONFIG_CCSECURITY) += ccsecurity/
660---- linux-4.16.7.orig/security/security.c
661-+++ linux-4.16.7/security/security.c
660+--- linux-4.16.8.orig/security/security.c
661++++ linux-4.16.8/security/security.c
662662 @@ -977,12 +977,19 @@ int security_file_open(struct file *file
663663
664664 int security_task_alloc(struct task_struct *task, unsigned long clone_flags)
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.9.diff (revision 6645)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.9.diff (revision 6646)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.9.98.
1+This is TOMOYO Linux patch for kernel 4.9.99.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.98.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.99.tar.xz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,8 +28,8 @@
2828 security/Makefile | 3 ++
2929 24 files changed, 147 insertions(+), 26 deletions(-)
3030
31---- linux-4.9.98.orig/fs/exec.c
32-+++ linux-4.9.98/fs/exec.c
31+--- linux-4.9.99.orig/fs/exec.c
32++++ linux-4.9.99/fs/exec.c
3333 @@ -1661,7 +1661,7 @@ static int exec_binprm(struct linux_binp
3434 old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
3535 rcu_read_unlock();
@@ -39,8 +39,8 @@
3939 if (ret >= 0) {
4040 audit_bprm(bprm);
4141 trace_sched_process_exec(current, old_pid, bprm);
42---- linux-4.9.98.orig/fs/open.c
43-+++ linux-4.9.98/fs/open.c
42+--- linux-4.9.99.orig/fs/open.c
43++++ linux-4.9.99/fs/open.c
4444 @@ -1151,6 +1151,8 @@ EXPORT_SYMBOL(sys_close);
4545 */
4646 SYSCALL_DEFINE0(vhangup)
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-4.9.98.orig/fs/proc/version.c
54-+++ linux-4.9.98/fs/proc/version.c
53+--- linux-4.9.99.orig/fs/proc/version.c
54++++ linux-4.9.99/fs/proc/version.c
5555 @@ -32,3 +32,10 @@ static int __init proc_version_init(void
5656 return 0;
5757 }
@@ -59,12 +59,12 @@
5959 +
6060 +static int __init ccs_show_version(void)
6161 +{
62-+ printk(KERN_INFO "Hook version: 4.9.98 2018/05/07\n");
62++ printk(KERN_INFO "Hook version: 4.9.99 2018/05/13\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.9.98.orig/include/linux/init_task.h
67-+++ linux-4.9.98/include/linux/init_task.h
66+--- linux-4.9.99.orig/include/linux/init_task.h
67++++ linux-4.9.99/include/linux/init_task.h
6868 @@ -193,6 +193,14 @@ extern struct task_group root_task_group
6969 # define INIT_TASK_TI(tsk)
7070 #endif
@@ -88,8 +88,8 @@
8888 }
8989
9090
91---- linux-4.9.98.orig/include/linux/sched.h
92-+++ linux-4.9.98/include/linux/sched.h
91+--- linux-4.9.99.orig/include/linux/sched.h
92++++ linux-4.9.99/include/linux/sched.h
9393 @@ -6,6 +6,8 @@
9494 #include <linux/sched/prio.h>
9595
@@ -110,8 +110,8 @@
110110 /* CPU-specific state of this task */
111111 struct thread_struct thread;
112112 /*
113---- linux-4.9.98.orig/include/linux/security.h
114-+++ linux-4.9.98/include/linux/security.h
113+--- linux-4.9.99.orig/include/linux/security.h
114++++ linux-4.9.99/include/linux/security.h
115115 @@ -55,6 +55,7 @@ struct msg_queue;
116116 struct xattr;
117117 struct xfrm_sec_ctx;
@@ -318,8 +318,8 @@
318318 }
319319 #endif /* CONFIG_SECURITY_PATH */
320320
321---- linux-4.9.98.orig/include/net/ip.h
322-+++ linux-4.9.98/include/net/ip.h
321+--- linux-4.9.99.orig/include/net/ip.h
322++++ linux-4.9.99/include/net/ip.h
323323 @@ -254,6 +254,8 @@ void inet_get_local_port_range(struct ne
324324 #ifdef CONFIG_SYSCTL
325325 static inline int inet_is_local_reserved_port(struct net *net, int port)
@@ -338,8 +338,8 @@
338338 return 0;
339339 }
340340 #endif
341---- linux-4.9.98.orig/kernel/fork.c
342-+++ linux-4.9.98/kernel/fork.c
341+--- linux-4.9.99.orig/kernel/fork.c
342++++ linux-4.9.99/kernel/fork.c
343343 @@ -392,6 +392,7 @@ void __put_task_struct(struct task_struc
344344 delayacct_tsk_free(tsk);
345345 put_signal_struct(tsk->signal);
@@ -366,8 +366,8 @@
366366 bad_fork_cleanup_perf:
367367 perf_event_free_task(p);
368368 bad_fork_cleanup_policy:
369---- linux-4.9.98.orig/kernel/kexec.c
370-+++ linux-4.9.98/kernel/kexec.c
369+--- linux-4.9.99.orig/kernel/kexec.c
370++++ linux-4.9.99/kernel/kexec.c
371371 @@ -17,7 +17,7 @@
372372 #include <linux/syscalls.h>
373373 #include <linux/vmalloc.h>
@@ -386,8 +386,8 @@
386386
387387 /*
388388 * Verify we have a legal set of flags
389---- linux-4.9.98.orig/kernel/module.c
390-+++ linux-4.9.98/kernel/module.c
389+--- linux-4.9.99.orig/kernel/module.c
390++++ linux-4.9.99/kernel/module.c
391391 @@ -63,6 +63,7 @@
392392 #include <linux/dynamic_debug.h>
393393 #include <uapi/linux/module.h>
@@ -414,8 +414,8 @@
414414
415415 return 0;
416416 }
417---- linux-4.9.98.orig/kernel/ptrace.c
418-+++ linux-4.9.98/kernel/ptrace.c
417+--- linux-4.9.99.orig/kernel/ptrace.c
418++++ linux-4.9.99/kernel/ptrace.c
419419 @@ -1122,6 +1122,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
420420 {
421421 struct task_struct *child;
@@ -440,8 +440,8 @@
440440
441441 if (request == PTRACE_TRACEME) {
442442 ret = ptrace_traceme();
443---- linux-4.9.98.orig/kernel/reboot.c
444-+++ linux-4.9.98/kernel/reboot.c
443+--- linux-4.9.99.orig/kernel/reboot.c
444++++ linux-4.9.99/kernel/reboot.c
445445 @@ -16,6 +16,7 @@
446446 #include <linux/syscalls.h>
447447 #include <linux/syscore_ops.h>
@@ -459,8 +459,8 @@
459459
460460 /*
461461 * If pid namespaces are enabled and the current task is in a child
462---- linux-4.9.98.orig/kernel/sched/core.c
463-+++ linux-4.9.98/kernel/sched/core.c
462+--- linux-4.9.99.orig/kernel/sched/core.c
463++++ linux-4.9.99/kernel/sched/core.c
464464 @@ -3813,6 +3813,8 @@ int can_nice(const struct task_struct *p
465465 SYSCALL_DEFINE1(nice, int, increment)
466466 {
@@ -470,8 +470,8 @@
470470
471471 /*
472472 * Setpriority might change our priority at the same moment.
473---- linux-4.9.98.orig/kernel/signal.c
474-+++ linux-4.9.98/kernel/signal.c
473+--- linux-4.9.99.orig/kernel/signal.c
474++++ linux-4.9.99/kernel/signal.c
475475 @@ -2857,6 +2857,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
476476 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
477477 {
@@ -517,8 +517,8 @@
517517
518518 return do_send_specific(tgid, pid, sig, info);
519519 }
520---- linux-4.9.98.orig/kernel/sys.c
521-+++ linux-4.9.98/kernel/sys.c
520+--- linux-4.9.99.orig/kernel/sys.c
521++++ linux-4.9.99/kernel/sys.c
522522 @@ -183,6 +183,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
523523
524524 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -548,8 +548,8 @@
548548
549549 down_write(&uts_sem);
550550 errno = -EFAULT;
551---- linux-4.9.98.orig/kernel/time/ntp.c
552-+++ linux-4.9.98/kernel/time/ntp.c
551+--- linux-4.9.99.orig/kernel/time/ntp.c
552++++ linux-4.9.99/kernel/time/ntp.c
553553 @@ -17,6 +17,7 @@
554554 #include <linux/module.h>
555555 #include <linux/rtc.h>
@@ -583,8 +583,8 @@
583583
584584 if (txc->modes & ADJ_NANO) {
585585 struct timespec ts;
586---- linux-4.9.98.orig/net/ipv4/raw.c
587-+++ linux-4.9.98/net/ipv4/raw.c
586+--- linux-4.9.99.orig/net/ipv4/raw.c
587++++ linux-4.9.99/net/ipv4/raw.c
588588 @@ -744,6 +744,10 @@ static int raw_recvmsg(struct sock *sk,
589589 skb = skb_recv_datagram(sk, flags, noblock, &err);
590590 if (!skb)
@@ -596,8 +596,8 @@
596596
597597 copied = skb->len;
598598 if (len < copied) {
599---- linux-4.9.98.orig/net/ipv4/udp.c
600-+++ linux-4.9.98/net/ipv4/udp.c
599+--- linux-4.9.99.orig/net/ipv4/udp.c
600++++ linux-4.9.99/net/ipv4/udp.c
601601 @@ -1264,6 +1264,8 @@ try_again:
602602 &peeked, &off, &err);
603603 if (!skb)
@@ -607,8 +607,8 @@
607607
608608 ulen = skb->len;
609609 copied = len;
610---- linux-4.9.98.orig/net/ipv6/raw.c
611-+++ linux-4.9.98/net/ipv6/raw.c
610+--- linux-4.9.99.orig/net/ipv6/raw.c
611++++ linux-4.9.99/net/ipv6/raw.c
612612 @@ -478,6 +478,10 @@ static int rawv6_recvmsg(struct sock *sk
613613 skb = skb_recv_datagram(sk, flags, noblock, &err);
614614 if (!skb)
@@ -620,8 +620,8 @@
620620
621621 copied = skb->len;
622622 if (copied > len) {
623---- linux-4.9.98.orig/net/ipv6/udp.c
624-+++ linux-4.9.98/net/ipv6/udp.c
623+--- linux-4.9.99.orig/net/ipv6/udp.c
624++++ linux-4.9.99/net/ipv6/udp.c
625625 @@ -348,6 +348,8 @@ try_again:
626626 &peeked, &off, &err);
627627 if (!skb)
@@ -631,8 +631,8 @@
631631
632632 ulen = skb->len;
633633 copied = len;
634---- linux-4.9.98.orig/net/socket.c
635-+++ linux-4.9.98/net/socket.c
634+--- linux-4.9.99.orig/net/socket.c
635++++ linux-4.9.99/net/socket.c
636636 @@ -1481,6 +1481,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
637637 if (err < 0)
638638 goto out_fd;
@@ -644,8 +644,8 @@
644644 if (upeer_sockaddr) {
645645 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
646646 &len, 2) < 0) {
647---- linux-4.9.98.orig/net/unix/af_unix.c
648-+++ linux-4.9.98/net/unix/af_unix.c
647+--- linux-4.9.99.orig/net/unix/af_unix.c
648++++ linux-4.9.99/net/unix/af_unix.c
649649 @@ -2150,6 +2150,10 @@ static int unix_dgram_recvmsg(struct soc
650650 POLLOUT | POLLWRNORM |
651651 POLLWRBAND);
@@ -665,8 +665,8 @@
665665 mutex_unlock(&u->iolock);
666666 out:
667667 return err;
668---- linux-4.9.98.orig/security/Kconfig
669-+++ linux-4.9.98/security/Kconfig
668+--- linux-4.9.99.orig/security/Kconfig
669++++ linux-4.9.99/security/Kconfig
670670 @@ -214,5 +214,7 @@ config DEFAULT_SECURITY
671671 default "apparmor" if DEFAULT_SECURITY_APPARMOR
672672 default "" if DEFAULT_SECURITY_DAC
@@ -675,8 +675,8 @@
675675 +
676676 endmenu
677677
678---- linux-4.9.98.orig/security/Makefile
679-+++ linux-4.9.98/security/Makefile
678+--- linux-4.9.99.orig/security/Makefile
679++++ linux-4.9.99/security/Makefile
680680 @@ -29,3 +29,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
681681 # Object integrity file lists
682682 subdir-$(CONFIG_INTEGRITY) += integrity
--- trunk/1.8.x/ccs-patch/specs/build-c7-3.10.sh (revision 6645)
+++ trunk/1.8.x/ccs-patch/specs/build-c7-3.10.sh (revision 6646)
@@ -10,12 +10,12 @@
1010
1111 cd /tmp/ || die "Can't chdir to /tmp/ ."
1212
13-if [ ! -r kernel-3.10.0-862.el7.src.rpm ]
13+if [ ! -r kernel-3.10.0-862.2.3.el7.src.rpm ]
1414 then
15- wget http://vault.centos.org/centos/7/os/Source/SPackages/kernel-3.10.0-862.el7.src.rpm || die "Can't download source package."
15+ wget http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-862.2.3.el7.src.rpm || die "Can't download source package."
1616 fi
17-LANG=C rpm --checksig kernel-3.10.0-862.el7.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature."
18-rpm -ivh kernel-3.10.0-862.el7.src.rpm || die "Can't install source package."
17+LANG=C rpm --checksig kernel-3.10.0-862.2.3.el7.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature."
18+rpm -ivh kernel-3.10.0-862.2.3.el7.src.rpm || die "Can't install source package."
1919
2020 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
2121 if [ ! -r ccs-patch-1.8.5-20180401.tar.gz ]
@@ -28,9 +28,9 @@
2828 patch << "EOF" || die "Can't patch spec file."
2929 --- ccs-kernel.spec
3030 +++ ccs-kernel.spec
31-@@ -3,7 +3,7 @@
31+@@ -5,7 +5,7 @@
3232
33- Summary: The Linux kernel
33+ %define dist .el7
3434
3535 -# % define buildid .local
3636 +%define buildid _tomoyo_1.8.5p2
@@ -37,7 +37,7 @@
3737
3838 # For a kernel released for public testing, released_kernel should be 1.
3939 # For internal testing builds during development, it should be 0.
40-@@ -312,7 +312,7 @@
40+@@ -314,7 +314,7 @@
4141 AutoProv: yes\
4242 %{nil}
4343
@@ -46,7 +46,7 @@
4646 Group: System Environment/Kernel
4747 License: GPLv2
4848 URL: http://www.kernel.org/
49-@@ -636,13 +636,13 @@
49+@@ -638,13 +638,13 @@
5050 %package %{?1:%{1}-}devel\
5151 Summary: Development package for building kernel modules to match the %{?2:%{2} }kernel\
5252 Group: System Environment/Kernel\
@@ -64,7 +64,7 @@
6464 This package provides kernel headers and makefiles sufficient to build modules\
6565 against the %{?2:%{2} }kernel package.\
6666 %{nil}
67-@@ -754,6 +754,10 @@
67+@@ -756,6 +756,10 @@
6868 ApplyOptionalPatch debrand-rh_taint.patch
6969 ApplyOptionalPatch debrand-rh-i686-cpu.patch
7070
@@ -75,7 +75,7 @@
7575 # Any further pre-build tree manipulations happen here.
7676
7777 chmod +x scripts/checkpatch.pl
78-@@ -792,6 +796,17 @@
78+@@ -794,6 +798,17 @@
7979 for i in *.config
8080 do
8181 mv $i .config
--- trunk/1.8.x/ccs-patch/specs/build-c6-2.6.32.sh (revision 6645)
+++ trunk/1.8.x/ccs-patch/specs/build-c6-2.6.32.sh (revision 6646)
@@ -10,12 +10,12 @@
1010
1111 cd /tmp/ || die "Can't chdir to /tmp/ ."
1212
13-if [ ! -r kernel-2.6.32-696.23.1.el6.src.rpm ]
13+if [ ! -r kernel-2.6.32-696.28.1.el6.src.rpm ]
1414 then
15- wget http://vault.centos.org/6.9/updates/Source/SPackages/kernel-2.6.32-696.23.1.el6.src.rpm || die "Can't download source package."
15+ wget http://vault.centos.org/6.9/updates/Source/SPackages/kernel-2.6.32-696.28.1.el6.src.rpm || die "Can't download source package."
1616 fi
17-LANG=C rpm --checksig kernel-2.6.32-696.23.1.el6.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature."
18-rpm -ivh kernel-2.6.32-696.23.1.el6.src.rpm || die "Can't install source package."
17+LANG=C rpm --checksig kernel-2.6.32-696.28.1.el6.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature."
18+rpm -ivh kernel-2.6.32-696.28.1.el6.src.rpm || die "Can't install source package."
1919
2020 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
2121 if [ ! -r ccs-patch-1.8.5-20180401.tar.gz ]
@@ -35,7 +35,7 @@
3535 -# % define buildid .local
3636 +%define buildid _tomoyo_1.8.5p2
3737
38- %define distro_build 696.23.1
38+ %define distro_build 696.28.1
3939 %define signmodules 1
4040 @@ -437,7 +437,7 @@
4141 # Packages that need to be installed before the kernel is, because the %post
Show on old repository browser