• R/O
  • SSH
  • HTTPS

caitsith: コミット


コミットメタ情報

リビジョン270 (tree)
日時2018-12-25 19:46:56
作者kumaneko

ログメッセージ

(メッセージはありません)

変更サマリ

差分

--- tags/htdocs/index.html (revision 269)
+++ tags/htdocs/index.html (revision 270)
@@ -304,12 +304,12 @@
304304 <p>Run the following commands in order to extract source code of CaitSith:</p>
305305
306306 <pre class="command">
307-# wget -O caitsith-patch-0.2-20180827.tar.gz 'http://osdn.jp/frs/redir.php?m=jaist&amp;f=/caitsith/66537/caitsith-patch-0.2-20180827.tar.gz'
308-# wget -O caitsith-patch-0.2-20180827.tar.gz.asc 'http://osdn.jp/frs/redir.php?m=jaist&amp;f=/caitsith/66537/caitsith-patch-0.2-20180827.tar.gz.asc'
307+# wget -O caitsith-patch-0.2-20181225.tar.gz 'http://osdn.jp/frs/redir.php?m=jaist&amp;f=/caitsith/66537/caitsith-patch-0.2-20181225.tar.gz'
308+# wget -O caitsith-patch-0.2-20181225.tar.gz.asc 'http://osdn.jp/frs/redir.php?m=jaist&amp;f=/caitsith/66537/caitsith-patch-0.2-20181225.tar.gz.asc'
309309 # wget https://tomoyo.osdn.jp/kumaneko-key
310310 # gpg --import kumaneko-key
311-# gpg caitsith-patch-0.2-20180827.tar.gz.asc
312-# tar -zxf caitsith-patch-0.2-20180827.tar.gz
311+# gpg caitsith-patch-0.2-20181225.tar.gz.asc
312+# tar -zxf caitsith-patch-0.2-20181225.tar.gz
313313 </pre>
314314
315315 <hr>
@@ -644,12 +644,12 @@
644644 Also, there are several patches which can be applied to distributor's latest kernels. For example "3.10-centos-7" if using CentOS 7's latest kernel:</p>
645645
646646 <pre class="command">
647-$ wget -O caitsith-patch-0.2-20180827.tar.gz 'http://osdn.jp/frs/redir.php?m=jaist&amp;f=/caitsith/66537/caitsith-patch-0.2-20180827.tar.gz'
648-$ wget -O caitsith-patch-0.2-20180827.tar.gz.asc 'http://osdn.jp/frs/redir.php?m=jaist&amp;f=/caitsith/66537/caitsith-patch-0.2-20180827.tar.gz.asc'
647+$ wget -O caitsith-patch-0.2-20181225.tar.gz 'http://osdn.jp/frs/redir.php?m=jaist&amp;f=/caitsith/66537/caitsith-patch-0.2-20181225.tar.gz'
648+$ wget -O caitsith-patch-0.2-20181225.tar.gz.asc 'http://osdn.jp/frs/redir.php?m=jaist&amp;f=/caitsith/66537/caitsith-patch-0.2-20181225.tar.gz.asc'
649649 $ wget https://tomoyo.osdn.jp/kumaneko-key
650650 $ gpg --import kumaneko-key
651-$ gpg caitsith-patch-0.2-20180827.tar.gz.asc
652-$ tar -zxf caitsith-patch-0.2-20180827.tar.gz
651+$ gpg caitsith-patch-0.2-20181225.tar.gz.asc
652+$ tar -zxf caitsith-patch-0.2-20181225.tar.gz
653653 $ sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' -- patches/ccs-patch-*.diff
654654 $ patch -sp1 &lt; patches/ccs-patch-$VERSION.diff
655655 </pre>
--- trunk/caitsith-patch/patches/ccs-patch-2.6.32-centos-6.diff (revision 269)
+++ trunk/caitsith-patch/patches/ccs-patch-2.6.32-centos-6.diff (revision 270)
@@ -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.10/updates/Source/SPackages/kernel-2.6.32-754.6.3.el6.src.rpm
3+Source code for this patch is http://vault.centos.org/6.10/updates/Source/SPackages/kernel-2.6.32-754.9.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-754.6.3.el6.orig/fs/compat.c
41-+++ linux-2.6.32-754.6.3.el6/fs/compat.c
40+--- linux-2.6.32-754.9.1.el6.orig/fs/compat.c
41++++ linux-2.6.32-754.9.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-754.6.3.el6.orig/fs/compat_ioctl.c
52-+++ linux-2.6.32-754.6.3.el6/fs/compat_ioctl.c
51+--- linux-2.6.32-754.9.1.el6.orig/fs/compat_ioctl.c
52++++ linux-2.6.32-754.9.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-754.6.3.el6.orig/fs/exec.c
71-+++ linux-2.6.32-754.6.3.el6/fs/exec.c
70+--- linux-2.6.32-754.9.1.el6.orig/fs/exec.c
71++++ linux-2.6.32-754.9.1.el6/fs/exec.c
7272 @@ -1511,7 +1511,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-754.6.3.el6.orig/fs/fcntl.c
82-+++ linux-2.6.32-754.6.3.el6/fs/fcntl.c
81+--- linux-2.6.32-754.9.1.el6.orig/fs/fcntl.c
82++++ linux-2.6.32-754.9.1.el6/fs/fcntl.c
8383 @@ -431,6 +431,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-754.6.3.el6.orig/fs/ioctl.c
102-+++ linux-2.6.32-754.6.3.el6/fs/ioctl.c
101+--- linux-2.6.32-754.9.1.el6.orig/fs/ioctl.c
102++++ linux-2.6.32-754.9.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-754.6.3.el6.orig/fs/namei.c
113-+++ linux-2.6.32-754.6.3.el6/fs/namei.c
112+--- linux-2.6.32-754.9.1.el6.orig/fs/namei.c
113++++ linux-2.6.32-754.9.1.el6/fs/namei.c
114114 @@ -2070,6 +2070,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-754.6.3.el6.orig/fs/namespace.c
202-+++ linux-2.6.32-754.6.3.el6/fs/namespace.c
201+--- linux-2.6.32-754.9.1.el6.orig/fs/namespace.c
202++++ linux-2.6.32-754.9.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-754.6.3.el6.orig/fs/open.c
240-+++ linux-2.6.32-754.6.3.el6/fs/open.c
239+--- linux-2.6.32-754.9.1.el6.orig/fs/open.c
240++++ linux-2.6.32-754.9.1.el6/fs/open.c
241241 @@ -103,6 +103,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-754.6.3.el6.orig/fs/proc/version.c
332-+++ linux-2.6.32-754.6.3.el6/fs/proc/version.c
331+--- linux-2.6.32-754.9.1.el6.orig/fs/proc/version.c
332++++ linux-2.6.32-754.9.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-754.6.3.el6 2018/10/22\n");
340++ printk(KERN_INFO "Hook version: 2.6.32-754.9.1.el6 2018/12/17\n");
341341 + return 0;
342342 +}
343343 +module_init(ccs_show_version);
344---- linux-2.6.32-754.6.3.el6.orig/fs/stat.c
345-+++ linux-2.6.32-754.6.3.el6/fs/stat.c
344+--- linux-2.6.32-754.9.1.el6.orig/fs/stat.c
345++++ linux-2.6.32-754.9.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-754.6.3.el6.orig/include/linux/init_task.h
356-+++ linux-2.6.32-754.6.3.el6/include/linux/init_task.h
355+--- linux-2.6.32-754.9.1.el6.orig/include/linux/init_task.h
356++++ linux-2.6.32-754.9.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-754.6.3.el6.orig/include/linux/sched.h
381-+++ linux-2.6.32-754.6.3.el6/include/linux/sched.h
380+--- linux-2.6.32-754.9.1.el6.orig/include/linux/sched.h
381++++ linux-2.6.32-754.9.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-754.6.3.el6.orig/include/linux/security.h
403-+++ linux-2.6.32-754.6.3.el6/include/linux/security.h
402+--- linux-2.6.32-754.9.1.el6.orig/include/linux/security.h
403++++ linux-2.6.32-754.9.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-754.6.3.el6.orig/include/net/ip.h
413-+++ linux-2.6.32-754.6.3.el6/include/net/ip.h
412+--- linux-2.6.32-754.9.1.el6.orig/include/net/ip.h
413++++ linux-2.6.32-754.9.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-754.6.3.el6.orig/kernel/compat.c
432-+++ linux-2.6.32-754.6.3.el6/kernel/compat.c
431+--- linux-2.6.32-754.9.1.el6.orig/kernel/compat.c
432++++ linux-2.6.32-754.9.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-754.6.3.el6.orig/kernel/fork.c
443-+++ linux-2.6.32-754.6.3.el6/kernel/fork.c
442+--- linux-2.6.32-754.9.1.el6.orig/kernel/fork.c
443++++ linux-2.6.32-754.9.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-754.6.3.el6.orig/kernel/kexec.c
471-+++ linux-2.6.32-754.6.3.el6/kernel/kexec.c
470+--- linux-2.6.32-754.9.1.el6.orig/kernel/kexec.c
471++++ linux-2.6.32-754.9.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-754.6.3.el6.orig/kernel/module.c
490-+++ linux-2.6.32-754.6.3.el6/kernel/module.c
489+--- linux-2.6.32-754.9.1.el6.orig/kernel/module.c
490++++ linux-2.6.32-754.9.1.el6/kernel/module.c
491491 @@ -57,6 +57,7 @@
492492 #include <linux/percpu.h>
493493 #include <linux/kmemleak.h>
@@ -514,8 +514,8 @@
514514
515515 /*
516516 * Make sure we don't speculate past the CAP_SYS_MODULE check. The
517---- linux-2.6.32-754.6.3.el6.orig/kernel/ptrace.c
518-+++ linux-2.6.32-754.6.3.el6/kernel/ptrace.c
517+--- linux-2.6.32-754.9.1.el6.orig/kernel/ptrace.c
518++++ linux-2.6.32-754.9.1.el6/kernel/ptrace.c
519519 @@ -199,6 +199,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
520520 {
521521 struct task_struct *child;
@@ -540,8 +540,8 @@
540540
541541 if (request == PTRACE_TRACEME) {
542542 ret = ptrace_traceme();
543---- linux-2.6.32-754.6.3.el6.orig/kernel/sched.c
544-+++ linux-2.6.32-754.6.3.el6/kernel/sched.c
543+--- linux-2.6.32-754.9.1.el6.orig/kernel/sched.c
544++++ linux-2.6.32-754.9.1.el6/kernel/sched.c
545545 @@ -6868,6 +6868,8 @@ int can_nice(const struct task_struct *p
546546 SYSCALL_DEFINE1(nice, int, increment)
547547 {
@@ -551,8 +551,8 @@
551551
552552 /*
553553 * Setpriority might change our priority at the same moment.
554---- linux-2.6.32-754.6.3.el6.orig/kernel/signal.c
555-+++ linux-2.6.32-754.6.3.el6/kernel/signal.c
554+--- linux-2.6.32-754.9.1.el6.orig/kernel/signal.c
555++++ linux-2.6.32-754.9.1.el6/kernel/signal.c
556556 @@ -2316,6 +2316,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-754.6.3.el6.orig/kernel/sys.c
602-+++ linux-2.6.32-754.6.3.el6/kernel/sys.c
601+--- linux-2.6.32-754.9.1.el6.orig/kernel/sys.c
602++++ linux-2.6.32-754.9.1.el6/kernel/sys.c
603603 @@ -163,6 +163,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-754.6.3.el6.orig/kernel/sysctl.c
642-+++ linux-2.6.32-754.6.3.el6/kernel/sysctl.c
641+--- linux-2.6.32-754.9.1.el6.orig/kernel/sysctl.c
642++++ linux-2.6.32-754.9.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-754.6.3.el6.orig/kernel/time.c
654-+++ linux-2.6.32-754.6.3.el6/kernel/time.c
653+--- linux-2.6.32-754.9.1.el6.orig/kernel/time.c
654++++ linux-2.6.32-754.9.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-754.6.3.el6.orig/kernel/time/ntp.c
674-+++ linux-2.6.32-754.6.3.el6/kernel/time/ntp.c
673+--- linux-2.6.32-754.9.1.el6.orig/kernel/time/ntp.c
674++++ linux-2.6.32-754.9.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-754.6.3.el6.orig/net/ipv4/raw.c
700-+++ linux-2.6.32-754.6.3.el6/net/ipv4/raw.c
699+--- linux-2.6.32-754.9.1.el6.orig/net/ipv4/raw.c
700++++ linux-2.6.32-754.9.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-754.6.3.el6.orig/net/ipv4/udp.c
721-+++ linux-2.6.32-754.6.3.el6/net/ipv4/udp.c
720+--- linux-2.6.32-754.9.1.el6.orig/net/ipv4/udp.c
721++++ linux-2.6.32-754.9.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-754.6.3.el6.orig/net/ipv6/raw.c
742-+++ linux-2.6.32-754.6.3.el6/net/ipv6/raw.c
741+--- linux-2.6.32-754.9.1.el6.orig/net/ipv6/raw.c
742++++ linux-2.6.32-754.9.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-754.6.3.el6.orig/net/ipv6/udp.c
763-+++ linux-2.6.32-754.6.3.el6/net/ipv6/udp.c
762+--- linux-2.6.32-754.9.1.el6.orig/net/ipv6/udp.c
763++++ linux-2.6.32-754.9.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-754.6.3.el6.orig/net/socket.c
784-+++ linux-2.6.32-754.6.3.el6/net/socket.c
783+--- linux-2.6.32-754.9.1.el6.orig/net/socket.c
784++++ linux-2.6.32-754.9.1.el6/net/socket.c
785785 @@ -579,6 +579,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-754.6.3.el6.orig/net/unix/af_unix.c
846-+++ linux-2.6.32-754.6.3.el6/net/unix/af_unix.c
845+--- linux-2.6.32-754.9.1.el6.orig/net/unix/af_unix.c
846++++ linux-2.6.32-754.9.1.el6/net/unix/af_unix.c
847847 @@ -984,6 +984,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-754.6.3.el6.orig/security/Kconfig
869-+++ linux-2.6.32-754.6.3.el6/security/Kconfig
868+--- linux-2.6.32-754.9.1.el6.orig/security/Kconfig
869++++ linux-2.6.32-754.9.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-754.6.3.el6.orig/security/Makefile
879-+++ linux-2.6.32-754.6.3.el6/security/Makefile
878+--- linux-2.6.32-754.9.1.el6.orig/security/Makefile
879++++ linux-2.6.32-754.9.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/caitsith-patch/patches/ccs-patch-3.10-centos-7.diff (revision 269)
+++ trunk/caitsith-patch/patches/ccs-patch-3.10-centos-7.diff (revision 270)
@@ -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/updates/Source/SPackages/kernel-3.10.0-862.14.4.el7.src.rpm
3+Source code for this patch is http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-957.1.3.el7.src.rpm
44 ---
55 fs/exec.c | 2
66 fs/open.c | 2
@@ -28,19 +28,19 @@
2828 security/security.c | 111 +++++++++++++++++++++++++++++++++++++++++-----
2929 24 files changed, 248 insertions(+), 37 deletions(-)
3030
31---- linux-3.10.0-862.14.4.el7.orig/fs/exec.c
32-+++ linux-3.10.0-862.14.4.el7/fs/exec.c
33-@@ -1613,7 +1613,7 @@ static int do_execve_common(struct filen
34- if (retval < 0)
35- goto out;
31+--- linux-3.10.0-957.1.3.el7.orig/fs/exec.c
32++++ linux-3.10.0-957.1.3.el7/fs/exec.c
33+@@ -1507,7 +1507,7 @@ static int exec_binprm(struct linux_binp
34+ old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
35+ rcu_read_unlock();
3636
37-- retval = search_binary_handler(bprm);
38-+ retval = ccs_search_binary_handler(bprm);
39- if (retval < 0)
40- goto out;
41-
42---- linux-3.10.0-862.14.4.el7.orig/fs/open.c
43-+++ linux-3.10.0-862.14.4.el7/fs/open.c
37+- ret = search_binary_handler(bprm);
38++ ret = ccs_search_binary_handler(bprm);
39+ if (ret >= 0) {
40+ audit_bprm(bprm);
41+ trace_sched_process_exec(current, old_pid, bprm);
42+--- linux-3.10.0-957.1.3.el7.orig/fs/open.c
43++++ linux-3.10.0-957.1.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.14.4.el7.orig/fs/proc/version.c
54-+++ linux-3.10.0-862.14.4.el7/fs/proc/version.c
53+--- linux-3.10.0-957.1.3.el7.orig/fs/proc/version.c
54++++ linux-3.10.0-957.1.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.14.4.el7 2018/10/08\n");
62++ printk(KERN_INFO "Hook version: 3.10.0-957.1.3.el7 2018/12/17\n");
6363 + return 0;
6464 +}
6565 +module_init(ccs_show_version);
66---- linux-3.10.0-862.14.4.el7.orig/include/linux/init_task.h
67-+++ linux-3.10.0-862.14.4.el7/include/linux/init_task.h
66+--- linux-3.10.0-957.1.3.el7.orig/include/linux/init_task.h
67++++ linux-3.10.0-957.1.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.14.4.el7.orig/include/linux/sched.h
92-+++ linux-3.10.0-862.14.4.el7/include/linux/sched.h
91+--- linux-3.10.0-957.1.3.el7.orig/include/linux/sched.h
92++++ linux-3.10.0-957.1.3.el7/include/linux/sched.h
9393 @@ -4,6 +4,8 @@
9494 #include <uapi/linux/sched.h>
9595 #include <linux/rh_kabi.h>
@@ -99,7 +99,7 @@
9999 struct sched_param {
100100 int sched_priority;
101101 };
102-@@ -1818,6 +1820,10 @@ struct task_struct {
102+@@ -1836,6 +1838,10 @@ struct task_struct {
103103 struct wake_q_node wake_q;
104104 struct prev_cputime prev_cputime;
105105 #endif /* __GENKSYMS__ */
@@ -110,9 +110,9 @@
110110 };
111111
112112 /* Future-safe accessor for struct task_struct's cpus_allowed. */
113---- linux-3.10.0-862.14.4.el7.orig/include/linux/security.h
114-+++ linux-3.10.0-862.14.4.el7/include/linux/security.h
115-@@ -55,6 +55,7 @@ struct msg_queue;
113+--- linux-3.10.0-957.1.3.el7.orig/include/linux/security.h
114++++ linux-3.10.0-957.1.3.el7/include/linux/security.h
115+@@ -56,6 +56,7 @@ struct msg_queue;
116116 struct xattr;
117117 struct xfrm_sec_ctx;
118118 struct mm_struct;
@@ -120,7 +120,7 @@
120120
121121 /* Maximum number of letters for an LSM name string */
122122 #define SECURITY_NAME_MAX 10
123-@@ -2060,7 +2061,10 @@ static inline int security_syslog(int ty
123+@@ -2105,7 +2106,10 @@ static inline int security_syslog(int ty
124124 static inline int security_settime(const struct timespec *ts,
125125 const struct timezone *tz)
126126 {
@@ -132,7 +132,7 @@
132132 }
133133
134134 static inline int security_vm_enough_memory_mm(struct mm_struct *mm, long pages)
135-@@ -2129,18 +2133,18 @@ static inline int security_sb_mount(cons
135+@@ -2174,18 +2178,18 @@ static inline int security_sb_mount(cons
136136 const char *type, unsigned long flags,
137137 void *data)
138138 {
@@ -154,7 +154,7 @@
154154 }
155155
156156 static inline int security_sb_set_mnt_opts(struct super_block *sb,
157-@@ -2289,7 +2293,7 @@ static inline int security_inode_setattr
157+@@ -2334,7 +2338,7 @@ static inline int security_inode_setattr
158158 static inline int security_inode_getattr(struct vfsmount *mnt,
159159 struct dentry *dentry)
160160 {
@@ -163,7 +163,7 @@
163163 }
164164
165165 static inline int security_inode_setxattr(struct dentry *dentry,
166-@@ -2375,7 +2379,7 @@ static inline void security_file_free(st
166+@@ -2420,7 +2424,7 @@ static inline void security_file_free(st
167167 static inline int security_file_ioctl(struct file *file, unsigned int cmd,
168168 unsigned long arg)
169169 {
@@ -172,7 +172,7 @@
172172 }
173173
174174 static inline int security_mmap_file(struct file *file, unsigned long prot,
175-@@ -2404,7 +2408,7 @@ static inline int security_file_lock(str
175+@@ -2449,7 +2453,7 @@ static inline int security_file_lock(str
176176 static inline int security_file_fcntl(struct file *file, unsigned int cmd,
177177 unsigned long arg)
178178 {
@@ -181,7 +181,7 @@
181181 }
182182
183183 static inline int security_file_set_fowner(struct file *file)
184-@@ -2427,7 +2431,7 @@ static inline int security_file_receive(
184+@@ -2472,7 +2476,7 @@ static inline int security_file_receive(
185185 static inline int security_file_open(struct file *file,
186186 const struct cred *cred)
187187 {
@@ -190,7 +190,7 @@
190190 }
191191
192192 static inline int security_task_create(unsigned long clone_flags)
193-@@ -2789,7 +2793,7 @@ static inline int security_unix_may_send
193+@@ -2834,7 +2838,7 @@ static inline int security_unix_may_send
194194 static inline int security_socket_create(int family, int type,
195195 int protocol, int kern)
196196 {
@@ -199,7 +199,7 @@
199199 }
200200
201201 static inline int security_socket_post_create(struct socket *sock,
202-@@ -2804,19 +2808,19 @@ static inline int security_socket_bind(s
202+@@ -2849,19 +2853,19 @@ static inline int security_socket_bind(s
203203 struct sockaddr *address,
204204 int addrlen)
205205 {
@@ -222,7 +222,7 @@
222222 }
223223
224224 static inline int security_socket_accept(struct socket *sock,
225-@@ -2828,7 +2832,7 @@ static inline int security_socket_accept
225+@@ -2873,7 +2877,7 @@ static inline int security_socket_accept
226226 static inline int security_socket_sendmsg(struct socket *sock,
227227 struct msghdr *msg, int size)
228228 {
@@ -231,7 +231,7 @@
231231 }
232232
233233 static inline int security_socket_recvmsg(struct socket *sock,
234-@@ -3096,44 +3100,47 @@ int security_path_chmod(struct path *pat
234+@@ -3141,44 +3145,47 @@ int security_path_chmod(struct path *pat
235235 int security_path_chown(struct path *path, kuid_t uid, kgid_t gid);
236236 int security_path_chroot(struct path *path);
237237 #else /* CONFIG_SECURITY_PATH */
@@ -286,7 +286,7 @@
286286 }
287287
288288 static inline int security_path_rename(struct path *old_dir,
289-@@ -3142,22 +3149,32 @@ static inline int security_path_rename(s
289+@@ -3187,22 +3194,32 @@ static inline int security_path_rename(s
290290 struct dentry *new_dentry,
291291 unsigned int flags)
292292 {
@@ -323,9 +323,9 @@
323323 }
324324 #endif /* CONFIG_SECURITY_PATH */
325325
326---- linux-3.10.0-862.14.4.el7.orig/include/net/ip.h
327-+++ linux-3.10.0-862.14.4.el7/include/net/ip.h
328-@@ -230,6 +230,8 @@ void inet_get_local_port_range(struct ne
326+--- linux-3.10.0-957.1.3.el7.orig/include/net/ip.h
327++++ linux-3.10.0-957.1.3.el7/include/net/ip.h
328+@@ -232,6 +232,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)
331331 {
@@ -334,8 +334,8 @@
334334 return test_bit(port, sysctl_local_reserved_ports);
335335 }
336336
337---- linux-3.10.0-862.14.4.el7.orig/kernel/fork.c
338-+++ linux-3.10.0-862.14.4.el7/kernel/fork.c
337+--- linux-3.10.0-957.1.3.el7.orig/kernel/fork.c
338++++ linux-3.10.0-957.1.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);
@@ -344,7 +344,7 @@
344344 if (!profile_handoff_task(tsk))
345345 free_task(tsk);
346346 }
347-@@ -1483,6 +1484,9 @@ static struct task_struct *copy_process(
347+@@ -1489,6 +1490,9 @@ static struct task_struct *copy_process(
348348 retval = audit_alloc(p);
349349 if (retval)
350350 goto bad_fork_cleanup_perf;
@@ -354,7 +354,7 @@
354354 /* copy all the process information */
355355 retval = copy_semundo(clone_flags, p);
356356 if (retval)
357-@@ -1701,6 +1705,7 @@ bad_fork_cleanup_semundo:
357+@@ -1707,6 +1711,7 @@ bad_fork_cleanup_semundo:
358358 exit_sem(p);
359359 bad_fork_cleanup_audit:
360360 audit_free(p);
@@ -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.14.4.el7.orig/kernel/kexec.c
366-+++ linux-3.10.0-862.14.4.el7/kernel/kexec.c
365+--- linux-3.10.0-957.1.3.el7.orig/kernel/kexec.c
366++++ linux-3.10.0-957.1.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.14.4.el7.orig/kernel/module.c
377-+++ linux-3.10.0-862.14.4.el7/kernel/module.c
376+--- linux-3.10.0-957.1.3.el7.orig/kernel/module.c
377++++ linux-3.10.0-957.1.3.el7/kernel/module.c
378378 @@ -66,6 +66,7 @@
379379 #endif /* __GENKSYMS__ */
380380 #include <uapi/linux/module.h>
@@ -399,10 +399,10 @@
399399 + if (!ccs_capable(CCS_USE_KERNEL_MODULE))
400400 + return -EPERM;
401401
402- /*
403- * Make sure we don't speculate past the CAP_SYS_MODULE check. The
404---- linux-3.10.0-862.14.4.el7.orig/kernel/ptrace.c
405-+++ linux-3.10.0-862.14.4.el7/kernel/ptrace.c
402+ return 0;
403+ }
404+--- linux-3.10.0-957.1.3.el7.orig/kernel/ptrace.c
405++++ linux-3.10.0-957.1.3.el7/kernel/ptrace.c
406406 @@ -1082,6 +1082,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
407407 {
408408 struct task_struct *child;
@@ -427,9 +427,9 @@
427427
428428 if (request == PTRACE_TRACEME) {
429429 ret = ptrace_traceme();
430---- linux-3.10.0-862.14.4.el7.orig/kernel/sched/core.c
431-+++ linux-3.10.0-862.14.4.el7/kernel/sched/core.c
432-@@ -4279,6 +4279,8 @@ int can_nice(const struct task_struct *p
430+--- linux-3.10.0-957.1.3.el7.orig/kernel/sched/core.c
431++++ linux-3.10.0-957.1.3.el7/kernel/sched/core.c
432+@@ -4342,6 +4342,8 @@ int can_nice(const struct task_struct *p
433433 SYSCALL_DEFINE1(nice, int, increment)
434434 {
435435 long nice, retval;
@@ -438,9 +438,9 @@
438438
439439 /*
440440 * Setpriority might change our priority at the same moment.
441---- linux-3.10.0-862.14.4.el7.orig/kernel/signal.c
442-+++ linux-3.10.0-862.14.4.el7/kernel/signal.c
443-@@ -2950,6 +2950,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
441+--- linux-3.10.0-957.1.3.el7.orig/kernel/signal.c
442++++ linux-3.10.0-957.1.3.el7/kernel/signal.c
443+@@ -2942,6 +2942,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
444444 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
445445 {
446446 struct siginfo info;
@@ -449,7 +449,7 @@
449449
450450 info.si_signo = sig;
451451 info.si_errno = 0;
452-@@ -3018,6 +3020,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
452+@@ -3010,6 +3012,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
453453 /* This is only valid for single tasks */
454454 if (pid <= 0 || tgid <= 0)
455455 return -EINVAL;
@@ -458,7 +458,7 @@
458458
459459 return do_tkill(tgid, pid, sig);
460460 }
461-@@ -3034,6 +3038,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
461+@@ -3026,6 +3030,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
462462 /* This is only valid for single tasks */
463463 if (pid <= 0)
464464 return -EINVAL;
@@ -467,7 +467,7 @@
467467
468468 return do_tkill(0, pid, sig);
469469 }
470-@@ -3048,6 +3054,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
470+@@ -3040,6 +3046,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
471471 return -EPERM;
472472
473473 info->si_signo = sig;
@@ -476,7 +476,7 @@
476476
477477 /* POSIX.1b doesn't mention process groups. */
478478 return kill_proc_info(sig, info, pid);
479-@@ -3096,6 +3104,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
479+@@ -3088,6 +3096,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
480480 return -EPERM;
481481
482482 info->si_signo = sig;
@@ -485,8 +485,8 @@
485485
486486 return do_send_specific(tgid, pid, sig, info);
487487 }
488---- linux-3.10.0-862.14.4.el7.orig/kernel/sys.c
489-+++ linux-3.10.0-862.14.4.el7/kernel/sys.c
488+--- linux-3.10.0-957.1.3.el7.orig/kernel/sys.c
489++++ linux-3.10.0-957.1.3.el7/kernel/sys.c
490490 @@ -197,6 +197,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.14.4.el7.orig/kernel/time/ntp.c
529-+++ linux-3.10.0-862.14.4.el7/kernel/time/ntp.c
528+--- linux-3.10.0-957.1.3.el7.orig/kernel/time/ntp.c
529++++ linux-3.10.0-957.1.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.14.4.el7.orig/net/ipv4/raw.c
564-+++ linux-3.10.0-862.14.4.el7/net/ipv4/raw.c
563+--- linux-3.10.0-957.1.3.el7.orig/net/ipv4/raw.c
564++++ linux-3.10.0-957.1.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,9 +573,9 @@
573573
574574 copied = skb->len;
575575 if (len < copied) {
576---- linux-3.10.0-862.14.4.el7.orig/net/ipv4/udp.c
577-+++ linux-3.10.0-862.14.4.el7/net/ipv4/udp.c
578-@@ -1392,6 +1392,10 @@ try_again:
576+--- linux-3.10.0-957.1.3.el7.orig/net/ipv4/udp.c
577++++ linux-3.10.0-957.1.3.el7/net/ipv4/udp.c
578+@@ -1393,6 +1393,10 @@ try_again:
579579 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
580580 if (!skb)
581581 goto out;
@@ -586,8 +586,8 @@
586586
587587 ulen = skb->len - sizeof(struct udphdr);
588588 copied = len;
589---- linux-3.10.0-862.14.4.el7.orig/net/ipv6/raw.c
590-+++ linux-3.10.0-862.14.4.el7/net/ipv6/raw.c
589+--- linux-3.10.0-957.1.3.el7.orig/net/ipv6/raw.c
590++++ linux-3.10.0-957.1.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.14.4.el7.orig/net/ipv6/udp.c
603-+++ linux-3.10.0-862.14.4.el7/net/ipv6/udp.c
602+--- linux-3.10.0-957.1.3.el7.orig/net/ipv6/udp.c
603++++ linux-3.10.0-957.1.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,9 +612,9 @@
612612
613613 ulen = skb->len - sizeof(struct udphdr);
614614 copied = len;
615---- linux-3.10.0-862.14.4.el7.orig/net/socket.c
616-+++ linux-3.10.0-862.14.4.el7/net/socket.c
617-@@ -1661,6 +1661,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
615+--- linux-3.10.0-957.1.3.el7.orig/net/socket.c
616++++ linux-3.10.0-957.1.3.el7/net/socket.c
617+@@ -1660,6 +1660,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
618618 if (err < 0)
619619 goto out_fd;
620620
@@ -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.14.4.el7.orig/net/unix/af_unix.c
629-+++ linux-3.10.0-862.14.4.el7/net/unix/af_unix.c
628+--- linux-3.10.0-957.1.3.el7.orig/net/unix/af_unix.c
629++++ linux-3.10.0-957.1.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,9 +638,9 @@
638638 if (msg->msg_name)
639639 unix_copy_addr(msg, skb->sk);
640640
641---- linux-3.10.0-862.14.4.el7.orig/security/Kconfig
642-+++ linux-3.10.0-862.14.4.el7/security/Kconfig
643-@@ -194,5 +194,7 @@ config DEFAULT_SECURITY
641+--- linux-3.10.0-957.1.3.el7.orig/security/Kconfig
642++++ linux-3.10.0-957.1.3.el7/security/Kconfig
643+@@ -226,5 +226,7 @@ config DEFAULT_SECURITY
644644 default "yama" if DEFAULT_SECURITY_YAMA
645645 default "" if DEFAULT_SECURITY_DAC
646646
@@ -648,8 +648,8 @@
648648 +
649649 endmenu
650650
651---- linux-3.10.0-862.14.4.el7.orig/security/Makefile
652-+++ linux-3.10.0-862.14.4.el7/security/Makefile
651+--- linux-3.10.0-957.1.3.el7.orig/security/Makefile
652++++ linux-3.10.0-957.1.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,9 +657,9 @@
657657 +
658658 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
659659 +obj-$(CONFIG_CCSECURITY) += ccsecurity/built-in.o
660---- linux-3.10.0-862.14.4.el7.orig/security/security.c
661-+++ linux-3.10.0-862.14.4.el7/security/security.c
662-@@ -224,7 +224,10 @@ int security_syslog(int type)
660+--- linux-3.10.0-957.1.3.el7.orig/security/security.c
661++++ linux-3.10.0-957.1.3.el7/security/security.c
662+@@ -225,7 +225,10 @@ int security_syslog(int type)
663663
664664 int security_settime(const struct timespec *ts, const struct timezone *tz)
665665 {
@@ -671,7 +671,7 @@
671671 }
672672
673673 int security_vm_enough_memory_mm(struct mm_struct *mm, long pages)
674-@@ -301,17 +304,27 @@ int security_sb_statfs(struct dentry *de
674+@@ -302,17 +305,27 @@ int security_sb_statfs(struct dentry *de
675675 int security_sb_mount(const char *dev_name, struct path *path,
676676 const char *type, unsigned long flags, void *data)
677677 {
@@ -702,7 +702,7 @@
702702 }
703703
704704 int security_sb_set_mnt_opts(struct super_block *sb,
705-@@ -422,31 +435,47 @@ EXPORT_SYMBOL(security_old_inode_init_se
705+@@ -423,31 +436,47 @@ EXPORT_SYMBOL(security_old_inode_init_se
706706 int security_path_mknod(struct path *dir, struct dentry *dentry, umode_t mode,
707707 unsigned int dev)
708708 {
@@ -750,7 +750,7 @@
750750 return security_ops->path_unlink(dir, dentry);
751751 }
752752 EXPORT_SYMBOL(security_path_unlink);
753-@@ -454,16 +483,24 @@ EXPORT_SYMBOL(security_path_unlink);
753+@@ -455,16 +484,24 @@ EXPORT_SYMBOL(security_path_unlink);
754754 int security_path_symlink(struct path *dir, struct dentry *dentry,
755755 const char *old_name)
756756 {
@@ -775,7 +775,7 @@
775775 return security_ops->path_link(old_dentry, new_dir, new_dentry);
776776 }
777777
778-@@ -471,6 +508,7 @@ int security_path_rename(struct path *ol
778+@@ -472,6 +509,7 @@ int security_path_rename(struct path *ol
779779 struct path *new_dir, struct dentry *new_dentry,
780780 unsigned int flags)
781781 {
@@ -783,7 +783,7 @@
783783 if (unlikely(IS_PRIVATE(old_dentry->d_inode) ||
784784 (new_dentry->d_inode && IS_PRIVATE(new_dentry->d_inode))))
785785 return 0;
786-@@ -480,8 +518,15 @@ int security_path_rename(struct path *ol
786+@@ -481,8 +519,15 @@ int security_path_rename(struct path *ol
787787 old_dir, old_dentry);
788788 if (err)
789789 return err;
@@ -799,7 +799,7 @@
799799 return security_ops->path_rename(old_dir, old_dentry, new_dir,
800800 new_dentry);
801801 }
802-@@ -489,27 +534,42 @@ EXPORT_SYMBOL(security_path_rename);
802+@@ -490,27 +535,42 @@ EXPORT_SYMBOL(security_path_rename);
803803
804804 int security_path_truncate(struct path *path)
805805 {
@@ -842,7 +842,7 @@
842842 return security_ops->path_chroot(path);
843843 }
844844 #endif
845-@@ -622,9 +682,13 @@ EXPORT_SYMBOL_GPL(security_inode_setattr
845+@@ -623,9 +683,13 @@ EXPORT_SYMBOL_GPL(security_inode_setattr
846846
847847 int security_inode_getattr(struct vfsmount *mnt, struct dentry *dentry)
848848 {
@@ -857,7 +857,7 @@
857857 }
858858
859859 int security_inode_setxattr(struct dentry *dentry, const char *name,
860-@@ -753,7 +817,10 @@ void security_file_free(struct file *fil
860+@@ -754,7 +818,10 @@ void security_file_free(struct file *fil
861861
862862 int security_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
863863 {
@@ -869,7 +869,7 @@
869869 }
870870
871871 static inline unsigned long mmap_prot(struct file *file, unsigned long prot)
872-@@ -819,7 +886,10 @@ int security_file_lock(struct file *file
872+@@ -820,7 +887,10 @@ int security_file_lock(struct file *file
873873
874874 int security_file_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
875875 {
@@ -881,7 +881,7 @@
881881 }
882882
883883 int security_file_set_fowner(struct file *file)
884-@@ -843,6 +913,8 @@ int security_file_open(struct file *file
884+@@ -844,6 +914,8 @@ int security_file_open(struct file *file
885885 int ret;
886886
887887 ret = security_ops->file_open(file, cred);
@@ -890,7 +890,7 @@
890890 if (ret)
891891 return ret;
892892
893-@@ -1188,7 +1260,10 @@ EXPORT_SYMBOL(security_unix_may_send);
893+@@ -1189,7 +1261,10 @@ EXPORT_SYMBOL(security_unix_may_send);
894894
895895 int security_socket_create(int family, int type, int protocol, int kern)
896896 {
@@ -902,7 +902,7 @@
902902 }
903903
904904 int security_socket_post_create(struct socket *sock, int family,
905-@@ -1200,17 +1275,26 @@ int security_socket_post_create(struct s
905+@@ -1201,17 +1276,26 @@ int security_socket_post_create(struct s
906906
907907 int security_socket_bind(struct socket *sock, struct sockaddr *address, int addrlen)
908908 {
@@ -932,7 +932,7 @@
932932 }
933933
934934 int security_socket_accept(struct socket *sock, struct socket *newsock)
935-@@ -1220,7 +1304,10 @@ int security_socket_accept(struct socket
935+@@ -1221,7 +1305,10 @@ int security_socket_accept(struct socket
936936
937937 int security_socket_sendmsg(struct socket *sock, struct msghdr *msg, int size)
938938 {
--- trunk/caitsith-patch/patches/ccs-patch-3.13-ubuntu-14.04.diff (revision 269)
+++ trunk/caitsith-patch/patches/ccs-patch-3.13-ubuntu-14.04.diff (revision 270)
@@ -29,8 +29,8 @@
2929 security/security.c | 107 ++++++++++++++++++++++++++++++++++++++++------
3030 25 files changed, 236 insertions(+), 37 deletions(-)
3131
32---- linux-3.13.0-161.211.orig/fs/exec.c
33-+++ linux-3.13.0-161.211/fs/exec.c
32+--- linux-3.13.0-164.214.orig/fs/exec.c
33++++ linux-3.13.0-164.214/fs/exec.c
3434 @@ -1483,7 +1483,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-161.211.orig/fs/open.c
44-+++ linux-3.13.0-161.211/fs/open.c
43+--- linux-3.13.0-164.214.orig/fs/open.c
44++++ linux-3.13.0-164.214/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-161.211.orig/fs/proc/version.c
55-+++ linux-3.13.0-161.211/fs/proc/version.c
54+--- linux-3.13.0-164.214.orig/fs/proc/version.c
55++++ linux-3.13.0-164.214/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-161.211 2018/11/05\n");
63++ printk(KERN_INFO "Hook version: 3.13.0-164.214 2018/12/24\n");
6464 + return 0;
6565 +}
6666 +module_init(ccs_show_version);
67---- linux-3.13.0-161.211.orig/include/linux/init_task.h
68-+++ linux-3.13.0-161.211/include/linux/init_task.h
67+--- linux-3.13.0-164.214.orig/include/linux/init_task.h
68++++ linux-3.13.0-164.214/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-161.211.orig/include/linux/sched.h
93-+++ linux-3.13.0-161.211/include/linux/sched.h
92+--- linux-3.13.0-164.214.orig/include/linux/sched.h
93++++ linux-3.13.0-164.214/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-161.211.orig/include/linux/security.h
115-+++ linux-3.13.0-161.211/include/linux/security.h
114+--- linux-3.13.0-164.214.orig/include/linux/security.h
115++++ linux-3.13.0-164.214/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-161.211.orig/include/net/ip.h
318-+++ linux-3.13.0-161.211/include/net/ip.h
317+--- linux-3.13.0-164.214.orig/include/net/ip.h
318++++ linux-3.13.0-164.214/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-161.211.orig/kernel/fork.c
329-+++ linux-3.13.0-161.211/kernel/fork.c
328+--- linux-3.13.0-164.214.orig/kernel/fork.c
329++++ linux-3.13.0-164.214/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-161.211.orig/kernel/kexec.c
357-+++ linux-3.13.0-161.211/kernel/kexec.c
356+--- linux-3.13.0-164.214.orig/kernel/kexec.c
357++++ linux-3.13.0-164.214/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-161.211.orig/kernel/module.c
376-+++ linux-3.13.0-161.211/kernel/module.c
375+--- linux-3.13.0-164.214.orig/kernel/module.c
376++++ linux-3.13.0-164.214/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-161.211.orig/kernel/ptrace.c
404-+++ linux-3.13.0-161.211/kernel/ptrace.c
403+--- linux-3.13.0-164.214.orig/kernel/ptrace.c
404++++ linux-3.13.0-164.214/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-161.211.orig/kernel/reboot.c
430-+++ linux-3.13.0-161.211/kernel/reboot.c
429+--- linux-3.13.0-164.214.orig/kernel/reboot.c
430++++ linux-3.13.0-164.214/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-161.211.orig/kernel/sched/core.c
449-+++ linux-3.13.0-161.211/kernel/sched/core.c
448+--- linux-3.13.0-164.214.orig/kernel/sched/core.c
449++++ linux-3.13.0-164.214/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-161.211.orig/kernel/signal.c
460-+++ linux-3.13.0-161.211/kernel/signal.c
459+--- linux-3.13.0-164.214.orig/kernel/signal.c
460++++ linux-3.13.0-164.214/kernel/signal.c
461461 @@ -2913,6 +2913,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
462462 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
463463 {
@@ -503,9 +503,9 @@
503503
504504 return do_send_specific(tgid, pid, sig, info);
505505 }
506---- linux-3.13.0-161.211.orig/kernel/sys.c
507-+++ linux-3.13.0-161.211/kernel/sys.c
508-@@ -173,6 +173,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
506+--- linux-3.13.0-164.214.orig/kernel/sys.c
507++++ linux-3.13.0-164.214/kernel/sys.c
508+@@ -176,6 +176,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
509509
510510 if (which > PRIO_USER || which < PRIO_PROCESS)
511511 goto out;
@@ -516,7 +516,7 @@
516516
517517 /* normalize: avoid signed division (rounding problems) */
518518 error = -ESRCH;
519-@@ -1205,6 +1209,8 @@ SYSCALL_DEFINE2(sethostname, char __user
519+@@ -1208,6 +1212,8 @@ SYSCALL_DEFINE2(sethostname, char __user
520520
521521 if (len < 0 || len > __NEW_UTS_LEN)
522522 return -EINVAL;
@@ -525,7 +525,7 @@
525525 down_write(&uts_sem);
526526 errno = -EFAULT;
527527 if (!copy_from_user(tmp, name, len)) {
528-@@ -1255,6 +1261,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
528+@@ -1258,6 +1264,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
529529 return -EPERM;
530530 if (len < 0 || len > __NEW_UTS_LEN)
531531 return -EINVAL;
@@ -534,8 +534,8 @@
534534
535535 down_write(&uts_sem);
536536 errno = -EFAULT;
537---- linux-3.13.0-161.211.orig/kernel/time/ntp.c
538-+++ linux-3.13.0-161.211/kernel/time/ntp.c
537+--- linux-3.13.0-164.214.orig/kernel/time/ntp.c
538++++ linux-3.13.0-164.214/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-161.211.orig/net/ipv4/raw.c
573-+++ linux-3.13.0-161.211/net/ipv4/raw.c
572+--- linux-3.13.0-164.214.orig/net/ipv4/raw.c
573++++ linux-3.13.0-164.214/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-161.211.orig/net/ipv4/udp.c
586-+++ linux-3.13.0-161.211/net/ipv4/udp.c
585+--- linux-3.13.0-164.214.orig/net/ipv4/udp.c
586++++ linux-3.13.0-164.214/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-161.211.orig/net/ipv6/raw.c
599-+++ linux-3.13.0-161.211/net/ipv6/raw.c
598+--- linux-3.13.0-164.214.orig/net/ipv6/raw.c
599++++ linux-3.13.0-164.214/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-161.211.orig/net/ipv6/udp.c
612-+++ linux-3.13.0-161.211/net/ipv6/udp.c
611+--- linux-3.13.0-164.214.orig/net/ipv6/udp.c
612++++ linux-3.13.0-164.214/net/ipv6/udp.c
613613 @@ -404,6 +404,10 @@ try_again:
614614 &peeked, &off, &err);
615615 if (!skb)
@@ -621,9 +621,9 @@
621621
622622 ulen = skb->len - sizeof(struct udphdr);
623623 copied = len;
624---- linux-3.13.0-161.211.orig/net/socket.c
625-+++ linux-3.13.0-161.211/net/socket.c
626-@@ -1616,6 +1616,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
624+--- linux-3.13.0-164.214.orig/net/socket.c
625++++ linux-3.13.0-164.214/net/socket.c
626+@@ -1617,6 +1617,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
627627 if (err < 0)
628628 goto out_fd;
629629
@@ -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-161.211.orig/net/unix/af_unix.c
638-+++ linux-3.13.0-161.211/net/unix/af_unix.c
637+--- linux-3.13.0-164.214.orig/net/unix/af_unix.c
638++++ linux-3.13.0-164.214/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-161.211.orig/security/Kconfig
651-+++ linux-3.13.0-161.211/security/Kconfig
650+--- linux-3.13.0-164.214.orig/security/Kconfig
651++++ linux-3.13.0-164.214/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-161.211.orig/security/Makefile
661-+++ linux-3.13.0-161.211/security/Makefile
660+--- linux-3.13.0-164.214.orig/security/Makefile
661++++ linux-3.13.0-164.214/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-161.211.orig/security/security.c
670-+++ linux-3.13.0-161.211/security/security.c
669+--- linux-3.13.0-164.214.orig/security/security.c
670++++ linux-3.13.0-164.214/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/caitsith-patch/patches/ccs-patch-3.16.diff (revision 269)
+++ trunk/caitsith-patch/patches/ccs-patch-3.16.diff (revision 270)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 3.16.60.
1+This is TOMOYO Linux patch for kernel 3.16.62.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.16.60.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.16.62.tar.xz
44 ---
55 fs/exec.c | 2
66 fs/open.c | 2
@@ -29,8 +29,8 @@
2929 security/security.c | 111 +++++++++++++++++++++++++++++++++++++++++-----
3030 25 files changed, 252 insertions(+), 37 deletions(-)
3131
32---- linux-3.16.60.orig/fs/exec.c
33-+++ linux-3.16.60/fs/exec.c
32+--- linux-3.16.62.orig/fs/exec.c
33++++ linux-3.16.62/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.16.60.orig/fs/open.c
44-+++ linux-3.16.60/fs/open.c
43+--- linux-3.16.62.orig/fs/open.c
44++++ linux-3.16.62/fs/open.c
4545 @@ -1069,6 +1069,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.16.60.orig/fs/proc/version.c
55-+++ linux-3.16.60/fs/proc/version.c
54+--- linux-3.16.62.orig/fs/proc/version.c
55++++ linux-3.16.62/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.16.60 2018/10/22\n");
63++ printk(KERN_INFO "Hook version: 3.16.62 2018/12/17\n");
6464 + return 0;
6565 +}
6666 +fs_initcall(ccs_show_version);
67---- linux-3.16.60.orig/include/linux/init_task.h
68-+++ linux-3.16.60/include/linux/init_task.h
67+--- linux-3.16.62.orig/include/linux/init_task.h
68++++ linux-3.16.62/include/linux/init_task.h
6969 @@ -164,6 +164,14 @@ extern struct task_group root_task_group
7070 # define INIT_RT_MUTEXES(tsk)
7171 #endif
@@ -89,8 +89,8 @@
8989 }
9090
9191
92---- linux-3.16.60.orig/include/linux/sched.h
93-+++ linux-3.16.60/include/linux/sched.h
92+--- linux-3.16.62.orig/include/linux/sched.h
93++++ linux-3.16.62/include/linux/sched.h
9494 @@ -6,6 +6,8 @@
9595 #include <linux/sched/prio.h>
9696
@@ -111,8 +111,8 @@
111111 };
112112
113113 /* Future-safe accessor for struct task_struct's cpus_allowed. */
114---- linux-3.16.60.orig/include/linux/security.h
115-+++ linux-3.16.60/include/linux/security.h
114+--- linux-3.16.62.orig/include/linux/security.h
115++++ linux-3.16.62/include/linux/security.h
116116 @@ -53,6 +53,7 @@ struct msg_queue;
117117 struct xattr;
118118 struct xfrm_sec_ctx;
@@ -324,8 +324,8 @@
324324 }
325325 #endif /* CONFIG_SECURITY_PATH */
326326
327---- linux-3.16.60.orig/include/net/ip.h
328-+++ linux-3.16.60/include/net/ip.h
327+--- linux-3.16.62.orig/include/net/ip.h
328++++ linux-3.16.62/include/net/ip.h
329329 @@ -213,6 +213,8 @@ void inet_get_local_port_range(struct ne
330330 #ifdef CONFIG_SYSCTL
331331 static inline int inet_is_local_reserved_port(struct net *net, int port)
@@ -344,8 +344,8 @@
344344 return 0;
345345 }
346346 #endif
347---- linux-3.16.60.orig/kernel/fork.c
348-+++ linux-3.16.60/kernel/fork.c
347+--- linux-3.16.62.orig/kernel/fork.c
348++++ linux-3.16.62/kernel/fork.c
349349 @@ -248,6 +248,7 @@ void __put_task_struct(struct task_struc
350350 delayacct_tsk_free(tsk);
351351 put_signal_struct(tsk->signal);
@@ -372,8 +372,8 @@
372372 bad_fork_cleanup_perf:
373373 perf_event_free_task(p);
374374 bad_fork_cleanup_policy:
375---- linux-3.16.60.orig/kernel/kexec.c
376-+++ linux-3.16.60/kernel/kexec.c
375+--- linux-3.16.62.orig/kernel/kexec.c
376++++ linux-3.16.62/kernel/kexec.c
377377 @@ -39,6 +39,7 @@
378378 #include <asm/uaccess.h>
379379 #include <asm/io.h>
@@ -391,8 +391,8 @@
391391
392392 /*
393393 * Verify we have a legal set of flags
394---- linux-3.16.60.orig/kernel/module.c
395-+++ linux-3.16.60/kernel/module.c
394+--- linux-3.16.62.orig/kernel/module.c
395++++ linux-3.16.62/kernel/module.c
396396 @@ -63,6 +63,7 @@
397397 #include <linux/fips.h>
398398 #include <uapi/linux/module.h>
@@ -419,8 +419,8 @@
419419
420420 return 0;
421421 }
422---- linux-3.16.60.orig/kernel/ptrace.c
423-+++ linux-3.16.60/kernel/ptrace.c
422+--- linux-3.16.62.orig/kernel/ptrace.c
423++++ linux-3.16.62/kernel/ptrace.c
424424 @@ -1120,6 +1120,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
425425 {
426426 struct task_struct *child;
@@ -445,8 +445,8 @@
445445
446446 if (request == PTRACE_TRACEME) {
447447 ret = ptrace_traceme();
448---- linux-3.16.60.orig/kernel/reboot.c
449-+++ linux-3.16.60/kernel/reboot.c
448+--- linux-3.16.62.orig/kernel/reboot.c
449++++ linux-3.16.62/kernel/reboot.c
450450 @@ -16,6 +16,7 @@
451451 #include <linux/syscalls.h>
452452 #include <linux/syscore_ops.h>
@@ -464,8 +464,8 @@
464464
465465 /*
466466 * If pid namespaces are enabled and the current task is in a child
467---- linux-3.16.60.orig/kernel/sched/core.c
468-+++ linux-3.16.60/kernel/sched/core.c
467+--- linux-3.16.62.orig/kernel/sched/core.c
468++++ linux-3.16.62/kernel/sched/core.c
469469 @@ -3152,6 +3152,8 @@ int can_nice(const struct task_struct *p
470470 SYSCALL_DEFINE1(nice, int, increment)
471471 {
@@ -475,8 +475,8 @@
475475
476476 /*
477477 * Setpriority might change our priority at the same moment.
478---- linux-3.16.60.orig/kernel/signal.c
479-+++ linux-3.16.60/kernel/signal.c
478+--- linux-3.16.62.orig/kernel/signal.c
479++++ linux-3.16.62/kernel/signal.c
480480 @@ -2895,6 +2895,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
481481 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
482482 {
@@ -522,8 +522,8 @@
522522
523523 return do_send_specific(tgid, pid, sig, info);
524524 }
525---- linux-3.16.60.orig/kernel/sys.c
526-+++ linux-3.16.60/kernel/sys.c
525+--- linux-3.16.62.orig/kernel/sys.c
526++++ linux-3.16.62/kernel/sys.c
527527 @@ -176,6 +176,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
528528
529529 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -553,8 +553,8 @@
553553
554554 down_write(&uts_sem);
555555 errno = -EFAULT;
556---- linux-3.16.60.orig/kernel/time/ntp.c
557-+++ linux-3.16.60/kernel/time/ntp.c
556+--- linux-3.16.62.orig/kernel/time/ntp.c
557++++ linux-3.16.62/kernel/time/ntp.c
558558 @@ -16,6 +16,7 @@
559559 #include <linux/mm.h>
560560 #include <linux/module.h>
@@ -588,8 +588,8 @@
588588
589589 /*
590590 * Check for potential multiplication overflows that can
591---- linux-3.16.60.orig/net/ipv4/raw.c
592-+++ linux-3.16.60/net/ipv4/raw.c
591+--- linux-3.16.62.orig/net/ipv4/raw.c
592++++ linux-3.16.62/net/ipv4/raw.c
593593 @@ -731,6 +731,10 @@ static int raw_recvmsg(struct kiocb *ioc
594594 skb = skb_recv_datagram(sk, flags, noblock, &err);
595595 if (!skb)
@@ -601,8 +601,8 @@
601601
602602 copied = skb->len;
603603 if (len < copied) {
604---- linux-3.16.60.orig/net/ipv4/udp.c
605-+++ linux-3.16.60/net/ipv4/udp.c
604+--- linux-3.16.62.orig/net/ipv4/udp.c
605++++ linux-3.16.62/net/ipv4/udp.c
606606 @@ -1288,6 +1288,10 @@ try_again:
607607 &peeked, &off, &err);
608608 if (!skb)
@@ -614,8 +614,8 @@
614614
615615 ulen = skb->len - sizeof(struct udphdr);
616616 copied = len;
617---- linux-3.16.60.orig/net/ipv6/raw.c
618-+++ linux-3.16.60/net/ipv6/raw.c
617+--- linux-3.16.62.orig/net/ipv6/raw.c
618++++ linux-3.16.62/net/ipv6/raw.c
619619 @@ -478,6 +478,10 @@ static int rawv6_recvmsg(struct kiocb *i
620620 skb = skb_recv_datagram(sk, flags, noblock, &err);
621621 if (!skb)
@@ -627,8 +627,8 @@
627627
628628 copied = skb->len;
629629 if (copied > len) {
630---- linux-3.16.60.orig/net/ipv6/udp.c
631-+++ linux-3.16.60/net/ipv6/udp.c
630+--- linux-3.16.62.orig/net/ipv6/udp.c
631++++ linux-3.16.62/net/ipv6/udp.c
632632 @@ -404,6 +404,10 @@ try_again:
633633 &peeked, &off, &err);
634634 if (!skb)
@@ -640,9 +640,9 @@
640640
641641 ulen = skb->len - sizeof(struct udphdr);
642642 copied = len;
643---- linux-3.16.60.orig/net/socket.c
644-+++ linux-3.16.60/net/socket.c
645-@@ -1631,6 +1631,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
643+--- linux-3.16.62.orig/net/socket.c
644++++ linux-3.16.62/net/socket.c
645+@@ -1632,6 +1632,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
646646 if (err < 0)
647647 goto out_fd;
648648
@@ -653,8 +653,8 @@
653653 if (upeer_sockaddr) {
654654 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
655655 &len, 2) < 0) {
656---- linux-3.16.60.orig/net/unix/af_unix.c
657-+++ linux-3.16.60/net/unix/af_unix.c
656+--- linux-3.16.62.orig/net/unix/af_unix.c
657++++ linux-3.16.62/net/unix/af_unix.c
658658 @@ -1981,6 +1981,10 @@ static int unix_dgram_recvmsg(struct kio
659659 wake_up_interruptible_sync_poll(&u->peer_wait,
660660 POLLOUT | POLLWRNORM | POLLWRBAND);
@@ -666,8 +666,8 @@
666666 if (msg->msg_name)
667667 unix_copy_addr(msg, skb->sk);
668668
669---- linux-3.16.60.orig/security/Kconfig
670-+++ linux-3.16.60/security/Kconfig
669+--- linux-3.16.62.orig/security/Kconfig
670++++ linux-3.16.62/security/Kconfig
671671 @@ -177,5 +177,7 @@ config DEFAULT_SECURITY
672672 default "yama" if DEFAULT_SECURITY_YAMA
673673 default "" if DEFAULT_SECURITY_DAC
@@ -676,8 +676,8 @@
676676 +
677677 endmenu
678678
679---- linux-3.16.60.orig/security/Makefile
680-+++ linux-3.16.60/security/Makefile
679+--- linux-3.16.62.orig/security/Makefile
680++++ linux-3.16.62/security/Makefile
681681 @@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
682682 # Object integrity file lists
683683 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -685,8 +685,8 @@
685685 +
686686 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
687687 +obj-$(CONFIG_CCSECURITY) += ccsecurity/
688---- linux-3.16.60.orig/security/security.c
689-+++ linux-3.16.60/security/security.c
688+--- linux-3.16.62.orig/security/security.c
689++++ linux-3.16.62/security/security.c
690690 @@ -203,7 +203,10 @@ int security_syslog(int type)
691691
692692 int security_settime(const struct timespec *ts, const struct timezone *tz)
--- trunk/caitsith-patch/patches/ccs-patch-3.18.diff (revision 269)
+++ trunk/caitsith-patch/patches/ccs-patch-3.18.diff (revision 270)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 3.18.125.
1+This is TOMOYO Linux patch for kernel 3.18.131.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.125.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.131.tar.xz
44 ---
55 fs/exec.c | 2
66 fs/open.c | 2
@@ -29,9 +29,9 @@
2929 security/security.c | 111 +++++++++++++++++++++++++++++++++++++++++-----
3030 25 files changed, 252 insertions(+), 37 deletions(-)
3131
32---- linux-3.18.125.orig/fs/exec.c
33-+++ linux-3.18.125/fs/exec.c
34-@@ -1463,7 +1463,7 @@ static int exec_binprm(struct linux_binp
32+--- linux-3.18.131.orig/fs/exec.c
33++++ linux-3.18.131/fs/exec.c
34+@@ -1462,7 +1462,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();
3737
@@ -40,8 +40,8 @@
4040 if (ret >= 0) {
4141 audit_bprm(bprm);
4242 trace_sched_process_exec(current, old_pid, bprm);
43---- linux-3.18.125.orig/fs/open.c
44-+++ linux-3.18.125/fs/open.c
43+--- linux-3.18.131.orig/fs/open.c
44++++ linux-3.18.131/fs/open.c
4545 @@ -1091,6 +1091,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.18.125.orig/fs/proc/version.c
55-+++ linux-3.18.125/fs/proc/version.c
54+--- linux-3.18.131.orig/fs/proc/version.c
55++++ linux-3.18.131/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.18.125 2018/11/11\n");
63++ printk(KERN_INFO "Hook version: 3.18.131 2018/12/24\n");
6464 + return 0;
6565 +}
6666 +fs_initcall(ccs_show_version);
67---- linux-3.18.125.orig/include/linux/init_task.h
68-+++ linux-3.18.125/include/linux/init_task.h
67+--- linux-3.18.131.orig/include/linux/init_task.h
68++++ linux-3.18.131/include/linux/init_task.h
6969 @@ -166,6 +166,14 @@ extern struct task_group root_task_group
7070 # define INIT_RT_MUTEXES(tsk)
7171 #endif
@@ -89,8 +89,8 @@
8989 }
9090
9191
92---- linux-3.18.125.orig/include/linux/sched.h
93-+++ linux-3.18.125/include/linux/sched.h
92+--- linux-3.18.131.orig/include/linux/sched.h
93++++ linux-3.18.131/include/linux/sched.h
9494 @@ -6,6 +6,8 @@
9595 #include <linux/sched/prio.h>
9696
@@ -111,8 +111,8 @@
111111 };
112112
113113 /* Future-safe accessor for struct task_struct's cpus_allowed. */
114---- linux-3.18.125.orig/include/linux/security.h
115-+++ linux-3.18.125/include/linux/security.h
114+--- linux-3.18.131.orig/include/linux/security.h
115++++ linux-3.18.131/include/linux/security.h
116116 @@ -53,6 +53,7 @@ struct msg_queue;
117117 struct xattr;
118118 struct xfrm_sec_ctx;
@@ -324,8 +324,8 @@
324324 }
325325 #endif /* CONFIG_SECURITY_PATH */
326326
327---- linux-3.18.125.orig/include/net/ip.h
328-+++ linux-3.18.125/include/net/ip.h
327+--- linux-3.18.131.orig/include/net/ip.h
328++++ linux-3.18.131/include/net/ip.h
329329 @@ -218,6 +218,8 @@ void inet_get_local_port_range(struct ne
330330 #ifdef CONFIG_SYSCTL
331331 static inline int inet_is_local_reserved_port(struct net *net, int port)
@@ -344,8 +344,8 @@
344344 return 0;
345345 }
346346 #endif
347---- linux-3.18.125.orig/kernel/fork.c
348-+++ linux-3.18.125/kernel/fork.c
347+--- linux-3.18.131.orig/kernel/fork.c
348++++ linux-3.18.131/kernel/fork.c
349349 @@ -246,6 +246,7 @@ void __put_task_struct(struct task_struc
350350 delayacct_tsk_free(tsk);
351351 put_signal_struct(tsk->signal);
@@ -372,8 +372,8 @@
372372 bad_fork_cleanup_perf:
373373 perf_event_free_task(p);
374374 bad_fork_cleanup_policy:
375---- linux-3.18.125.orig/kernel/kexec.c
376-+++ linux-3.18.125/kernel/kexec.c
375+--- linux-3.18.131.orig/kernel/kexec.c
376++++ linux-3.18.131/kernel/kexec.c
377377 @@ -41,6 +41,7 @@
378378 #include <asm/uaccess.h>
379379 #include <asm/io.h>
@@ -391,8 +391,8 @@
391391
392392 /*
393393 * Verify we have a legal set of flags
394---- linux-3.18.125.orig/kernel/module.c
395-+++ linux-3.18.125/kernel/module.c
394+--- linux-3.18.131.orig/kernel/module.c
395++++ linux-3.18.131/kernel/module.c
396396 @@ -62,6 +62,7 @@
397397 #include <linux/bsearch.h>
398398 #include <uapi/linux/module.h>
@@ -419,8 +419,8 @@
419419
420420 return 0;
421421 }
422---- linux-3.18.125.orig/kernel/ptrace.c
423-+++ linux-3.18.125/kernel/ptrace.c
422+--- linux-3.18.131.orig/kernel/ptrace.c
423++++ linux-3.18.131/kernel/ptrace.c
424424 @@ -1081,6 +1081,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
425425 {
426426 struct task_struct *child;
@@ -445,8 +445,8 @@
445445
446446 if (request == PTRACE_TRACEME) {
447447 ret = ptrace_traceme();
448---- linux-3.18.125.orig/kernel/reboot.c
449-+++ linux-3.18.125/kernel/reboot.c
448+--- linux-3.18.131.orig/kernel/reboot.c
449++++ linux-3.18.131/kernel/reboot.c
450450 @@ -16,6 +16,7 @@
451451 #include <linux/syscalls.h>
452452 #include <linux/syscore_ops.h>
@@ -464,8 +464,8 @@
464464
465465 /*
466466 * If pid namespaces are enabled and the current task is in a child
467---- linux-3.18.125.orig/kernel/sched/core.c
468-+++ linux-3.18.125/kernel/sched/core.c
467+--- linux-3.18.131.orig/kernel/sched/core.c
468++++ linux-3.18.131/kernel/sched/core.c
469469 @@ -3218,6 +3218,8 @@ int can_nice(const struct task_struct *p
470470 SYSCALL_DEFINE1(nice, int, increment)
471471 {
@@ -475,8 +475,8 @@
475475
476476 /*
477477 * Setpriority might change our priority at the same moment.
478---- linux-3.18.125.orig/kernel/signal.c
479-+++ linux-3.18.125/kernel/signal.c
478+--- linux-3.18.131.orig/kernel/signal.c
479++++ linux-3.18.131/kernel/signal.c
480480 @@ -2901,6 +2901,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
481481 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
482482 {
@@ -522,8 +522,8 @@
522522
523523 return do_send_specific(tgid, pid, sig, info);
524524 }
525---- linux-3.18.125.orig/kernel/sys.c
526-+++ linux-3.18.125/kernel/sys.c
525+--- linux-3.18.131.orig/kernel/sys.c
526++++ linux-3.18.131/kernel/sys.c
527527 @@ -171,6 +171,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
528528
529529 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -553,8 +553,8 @@
553553
554554 errno = -EFAULT;
555555 if (!copy_from_user(tmp, name, len)) {
556---- linux-3.18.125.orig/kernel/time/ntp.c
557-+++ linux-3.18.125/kernel/time/ntp.c
556+--- linux-3.18.131.orig/kernel/time/ntp.c
557++++ linux-3.18.131/kernel/time/ntp.c
558558 @@ -16,6 +16,7 @@
559559 #include <linux/mm.h>
560560 #include <linux/module.h>
@@ -588,8 +588,8 @@
588588
589589 /*
590590 * Check for potential multiplication overflows that can
591---- linux-3.18.125.orig/net/ipv4/raw.c
592-+++ linux-3.18.125/net/ipv4/raw.c
591+--- linux-3.18.131.orig/net/ipv4/raw.c
592++++ linux-3.18.131/net/ipv4/raw.c
593593 @@ -719,6 +719,10 @@ static int raw_recvmsg(struct kiocb *ioc
594594 skb = skb_recv_datagram(sk, flags, noblock, &err);
595595 if (!skb)
@@ -601,8 +601,8 @@
601601
602602 copied = skb->len;
603603 if (len < copied) {
604---- linux-3.18.125.orig/net/ipv4/udp.c
605-+++ linux-3.18.125/net/ipv4/udp.c
604+--- linux-3.18.131.orig/net/ipv4/udp.c
605++++ linux-3.18.131/net/ipv4/udp.c
606606 @@ -1266,6 +1266,10 @@ try_again:
607607 &peeked, &off, &err);
608608 if (!skb)
@@ -614,8 +614,8 @@
614614
615615 ulen = skb->len - sizeof(struct udphdr);
616616 copied = len;
617---- linux-3.18.125.orig/net/ipv6/raw.c
618-+++ linux-3.18.125/net/ipv6/raw.c
617+--- linux-3.18.131.orig/net/ipv6/raw.c
618++++ linux-3.18.131/net/ipv6/raw.c
619619 @@ -478,6 +478,10 @@ static int rawv6_recvmsg(struct kiocb *i
620620 skb = skb_recv_datagram(sk, flags, noblock, &err);
621621 if (!skb)
@@ -627,8 +627,8 @@
627627
628628 copied = skb->len;
629629 if (copied > len) {
630---- linux-3.18.125.orig/net/ipv6/udp.c
631-+++ linux-3.18.125/net/ipv6/udp.c
630+--- linux-3.18.131.orig/net/ipv6/udp.c
631++++ linux-3.18.131/net/ipv6/udp.c
632632 @@ -403,6 +403,10 @@ try_again:
633633 &peeked, &off, &err);
634634 if (!skb)
@@ -640,8 +640,8 @@
640640
641641 ulen = skb->len - sizeof(struct udphdr);
642642 copied = len;
643---- linux-3.18.125.orig/net/socket.c
644-+++ linux-3.18.125/net/socket.c
643+--- linux-3.18.131.orig/net/socket.c
644++++ linux-3.18.131/net/socket.c
645645 @@ -1637,6 +1637,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
646646 if (err < 0)
647647 goto out_fd;
@@ -653,9 +653,9 @@
653653 if (upeer_sockaddr) {
654654 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
655655 &len, 2) < 0) {
656---- linux-3.18.125.orig/net/unix/af_unix.c
657-+++ linux-3.18.125/net/unix/af_unix.c
658-@@ -1981,6 +1981,10 @@ static int unix_dgram_recvmsg(struct kio
656+--- linux-3.18.131.orig/net/unix/af_unix.c
657++++ linux-3.18.131/net/unix/af_unix.c
658+@@ -1986,6 +1986,10 @@ static int unix_dgram_recvmsg(struct kio
659659 wake_up_interruptible_sync_poll(&u->peer_wait,
660660 POLLOUT | POLLWRNORM | POLLWRBAND);
661661
@@ -666,8 +666,8 @@
666666 if (msg->msg_name)
667667 unix_copy_addr(msg, skb->sk);
668668
669---- linux-3.18.125.orig/security/Kconfig
670-+++ linux-3.18.125/security/Kconfig
669+--- linux-3.18.131.orig/security/Kconfig
670++++ linux-3.18.131/security/Kconfig
671671 @@ -167,5 +167,7 @@ config DEFAULT_SECURITY
672672 default "yama" if DEFAULT_SECURITY_YAMA
673673 default "" if DEFAULT_SECURITY_DAC
@@ -676,8 +676,8 @@
676676 +
677677 endmenu
678678
679---- linux-3.18.125.orig/security/Makefile
680-+++ linux-3.18.125/security/Makefile
679+--- linux-3.18.131.orig/security/Makefile
680++++ linux-3.18.131/security/Makefile
681681 @@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
682682 # Object integrity file lists
683683 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -685,8 +685,8 @@
685685 +
686686 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
687687 +obj-$(CONFIG_CCSECURITY) += ccsecurity/
688---- linux-3.18.125.orig/security/security.c
689-+++ linux-3.18.125/security/security.c
688+--- linux-3.18.131.orig/security/security.c
689++++ linux-3.18.131/security/security.c
690690 @@ -203,7 +203,10 @@ int security_syslog(int type)
691691
692692 int security_settime(const struct timespec *ts, const struct timezone *tz)
--- trunk/caitsith-patch/patches/ccs-patch-4.14.diff (revision 269)
+++ trunk/caitsith-patch/patches/ccs-patch-4.14.diff (revision 270)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.14.80.
1+This is TOMOYO Linux patch for kernel 4.14.90.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.80.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.90.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.80.orig/fs/exec.c
32-+++ linux-4.14.80/fs/exec.c
31+--- linux-4.14.90.orig/fs/exec.c
32++++ linux-4.14.90/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.80.orig/fs/open.c
43-+++ linux-4.14.80/fs/open.c
42+--- linux-4.14.90.orig/fs/open.c
43++++ linux-4.14.90/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.80.orig/fs/proc/version.c
54-+++ linux-4.14.80/fs/proc/version.c
53+--- linux-4.14.90.orig/fs/proc/version.c
54++++ linux-4.14.90/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.80 2018/11/11\n");
62++ printk(KERN_INFO "Hook version: 4.14.90 2018/12/24\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.14.80.orig/include/linux/init_task.h
67-+++ linux-4.14.80/include/linux/init_task.h
66+--- linux-4.14.90.orig/include/linux/init_task.h
67++++ linux-4.14.90/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.80.orig/include/linux/sched.h
92-+++ linux-4.14.80/include/linux/sched.h
91+--- linux-4.14.90.orig/include/linux/sched.h
92++++ linux-4.14.90/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.80.orig/include/linux/security.h
113-+++ linux-4.14.80/include/linux/security.h
112+--- linux-4.14.90.orig/include/linux/security.h
113++++ linux-4.14.90/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.80.orig/include/net/ip.h
335-+++ linux-4.14.80/include/net/ip.h
334+--- linux-4.14.90.orig/include/net/ip.h
335++++ linux-4.14.90/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.80.orig/kernel/kexec.c
355-+++ linux-4.14.80/kernel/kexec.c
354+--- linux-4.14.90.orig/kernel/kexec.c
355++++ linux-4.14.90/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.80.orig/kernel/module.c
375-+++ linux-4.14.80/kernel/module.c
374+--- linux-4.14.90.orig/kernel/module.c
375++++ linux-4.14.90/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.80.orig/kernel/ptrace.c
403-+++ linux-4.14.80/kernel/ptrace.c
402+--- linux-4.14.90.orig/kernel/ptrace.c
403++++ linux-4.14.90/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.80.orig/kernel/reboot.c
429-+++ linux-4.14.80/kernel/reboot.c
428+--- linux-4.14.90.orig/kernel/reboot.c
429++++ linux-4.14.90/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.80.orig/kernel/sched/core.c
448-+++ linux-4.14.80/kernel/sched/core.c
447+--- linux-4.14.90.orig/kernel/sched/core.c
448++++ linux-4.14.90/kernel/sched/core.c
449449 @@ -3854,6 +3854,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.80.orig/kernel/signal.c
459-+++ linux-4.14.80/kernel/signal.c
458+--- linux-4.14.90.orig/kernel/signal.c
459++++ linux-4.14.90/kernel/signal.c
460460 @@ -2967,6 +2967,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.80.orig/kernel/sys.c
506-+++ linux-4.14.80/kernel/sys.c
505+--- linux-4.14.90.orig/kernel/sys.c
506++++ linux-4.14.90/kernel/sys.c
507507 @@ -193,6 +193,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
508508
509509 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -533,8 +533,8 @@
533533
534534 errno = -EFAULT;
535535 if (!copy_from_user(tmp, name, len)) {
536---- linux-4.14.80.orig/kernel/time/ntp.c
537-+++ linux-4.14.80/kernel/time/ntp.c
536+--- linux-4.14.90.orig/kernel/time/ntp.c
537++++ linux-4.14.90/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.80.orig/net/ipv4/raw.c
572-+++ linux-4.14.80/net/ipv4/raw.c
571+--- linux-4.14.90.orig/net/ipv4/raw.c
572++++ linux-4.14.90/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.80.orig/net/ipv4/udp.c
585-+++ linux-4.14.80/net/ipv4/udp.c
584+--- linux-4.14.90.orig/net/ipv4/udp.c
585++++ linux-4.14.90/net/ipv4/udp.c
586586 @@ -1593,6 +1593,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.80.orig/net/ipv6/raw.c
596-+++ linux-4.14.80/net/ipv6/raw.c
595+--- linux-4.14.90.orig/net/ipv6/raw.c
596++++ linux-4.14.90/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.80.orig/net/ipv6/udp.c
609-+++ linux-4.14.80/net/ipv6/udp.c
608+--- linux-4.14.90.orig/net/ipv6/udp.c
609++++ linux-4.14.90/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.80.orig/net/socket.c
620-+++ linux-4.14.80/net/socket.c
619+--- linux-4.14.90.orig/net/socket.c
620++++ linux-4.14.90/net/socket.c
621621 @@ -1587,6 +1587,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.80.orig/net/unix/af_unix.c
633-+++ linux-4.14.80/net/unix/af_unix.c
632+--- linux-4.14.90.orig/net/unix/af_unix.c
633++++ linux-4.14.90/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.80.orig/security/Kconfig
654-+++ linux-4.14.80/security/Kconfig
653+--- linux-4.14.90.orig/security/Kconfig
654++++ linux-4.14.90/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.80.orig/security/Makefile
664-+++ linux-4.14.80/security/Makefile
663+--- linux-4.14.90.orig/security/Makefile
664++++ linux-4.14.90/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.80.orig/security/security.c
673-+++ linux-4.14.80/security/security.c
672+--- linux-4.14.90.orig/security/security.c
673++++ linux-4.14.90/security/security.c
674674 @@ -978,12 +978,19 @@ int security_file_open(struct file *file
675675
676676 int security_task_alloc(struct task_struct *task, unsigned long clone_flags)
--- trunk/caitsith-patch/patches/ccs-patch-4.18.diff (revision 269)
+++ trunk/caitsith-patch/patches/ccs-patch-4.18.diff (revision 270)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.18.18.
1+This is TOMOYO Linux patch for kernel 4.18.20.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.18.18.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.18.20.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.18.18.orig/fs/exec.c
32-+++ linux-4.18.18/fs/exec.c
31+--- linux-4.18.20.orig/fs/exec.c
32++++ linux-4.18.20/fs/exec.c
3333 @@ -1691,7 +1691,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.18.18.orig/fs/open.c
43-+++ linux-4.18.18/fs/open.c
42+--- linux-4.18.20.orig/fs/open.c
43++++ linux-4.18.20/fs/open.c
4444 @@ -1212,6 +1212,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd)
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.18.18.orig/fs/proc/version.c
54-+++ linux-4.18.18/fs/proc/version.c
53+--- linux-4.18.20.orig/fs/proc/version.c
54++++ linux-4.18.20/fs/proc/version.c
5555 @@ -21,3 +21,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.18.18 2018/11/11\n");
62++ printk(KERN_INFO "Hook version: 4.18.20 2018/11/26\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.18.18.orig/include/linux/sched.h
67-+++ linux-4.18.18/include/linux/sched.h
66+--- linux-4.18.20.orig/include/linux/sched.h
67++++ linux-4.18.20/include/linux/sched.h
6868 @@ -34,6 +34,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.18.18.orig/include/linux/security.h
88-+++ linux-4.18.18/include/linux/security.h
87+--- linux-4.18.20.orig/include/linux/security.h
88++++ linux-4.18.20/include/linux/security.h
8989 @@ -53,6 +53,7 @@ struct msg_msg;
9090 struct xattr;
9191 struct xfrm_sec_ctx;
@@ -306,8 +306,8 @@
306306 }
307307 #endif /* CONFIG_SECURITY_PATH */
308308
309---- linux-4.18.18.orig/include/net/ip.h
310-+++ linux-4.18.18/include/net/ip.h
309+--- linux-4.18.20.orig/include/net/ip.h
310++++ linux-4.18.20/include/net/ip.h
311311 @@ -278,6 +278,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.18.18.orig/init/init_task.c
330-+++ linux-4.18.18/init/init_task.c
329+--- linux-4.18.20.orig/init/init_task.c
330++++ linux-4.18.20/init/init_task.c
331331 @@ -176,6 +176,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.18.18.orig/kernel/kexec.c
343-+++ linux-4.18.18/kernel/kexec.c
342+--- linux-4.18.20.orig/kernel/kexec.c
343++++ linux-4.18.20/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.18.18.orig/kernel/module.c
363-+++ linux-4.18.18/kernel/module.c
362+--- linux-4.18.20.orig/kernel/module.c
363++++ linux-4.18.20/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.18.18.orig/kernel/ptrace.c
391-+++ linux-4.18.18/kernel/ptrace.c
390+--- linux-4.18.20.orig/kernel/ptrace.c
391++++ linux-4.18.20/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.18.18.orig/kernel/reboot.c
417-+++ linux-4.18.18/kernel/reboot.c
416+--- linux-4.18.20.orig/kernel/reboot.c
417++++ linux-4.18.20/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.18.18.orig/kernel/sched/core.c
436-+++ linux-4.18.18/kernel/sched/core.c
435+--- linux-4.18.20.orig/kernel/sched/core.c
436++++ linux-4.18.20/kernel/sched/core.c
437437 @@ -3972,6 +3972,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.18.18.orig/kernel/signal.c
447-+++ linux-4.18.18/kernel/signal.c
446+--- linux-4.18.20.orig/kernel/signal.c
447++++ linux-4.18.20/kernel/signal.c
448448 @@ -3167,6 +3167,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.18.18.orig/kernel/sys.c
494-+++ linux-4.18.18/kernel/sys.c
493+--- linux-4.18.20.orig/kernel/sys.c
494++++ linux-4.18.20/kernel/sys.c
495495 @@ -204,6 +204,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
496496
497497 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -521,8 +521,8 @@
521521
522522 errno = -EFAULT;
523523 if (!copy_from_user(tmp, name, len)) {
524---- linux-4.18.18.orig/kernel/time/timekeeping.c
525-+++ linux-4.18.18/kernel/time/timekeeping.c
524+--- linux-4.18.20.orig/kernel/time/timekeeping.c
525++++ linux-4.18.20/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.18.18.orig/net/ipv4/raw.c
560-+++ linux-4.18.18/net/ipv4/raw.c
559+--- linux-4.18.20.orig/net/ipv4/raw.c
560++++ linux-4.18.20/net/ipv4/raw.c
561561 @@ -779,6 +779,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.18.18.orig/net/ipv4/udp.c
573-+++ linux-4.18.18/net/ipv4/udp.c
572+--- linux-4.18.20.orig/net/ipv4/udp.c
573++++ linux-4.18.20/net/ipv4/udp.c
574574 @@ -1659,6 +1659,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.18.18.orig/net/ipv6/raw.c
584-+++ linux-4.18.18/net/ipv6/raw.c
583+--- linux-4.18.20.orig/net/ipv6/raw.c
584++++ linux-4.18.20/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.18.18.orig/net/ipv6/udp.c
597-+++ linux-4.18.18/net/ipv6/udp.c
596+--- linux-4.18.20.orig/net/ipv6/udp.c
597++++ linux-4.18.20/net/ipv6/udp.c
598598 @@ -339,6 +339,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.18.18.orig/net/socket.c
608-+++ linux-4.18.18/net/socket.c
607+--- linux-4.18.20.orig/net/socket.c
608++++ linux-4.18.20/net/socket.c
609609 @@ -1603,6 +1603,10 @@ int __sys_accept4(int fd, struct sockadd
610610 if (err < 0)
611611 goto out_fd;
@@ -617,8 +617,8 @@
617617 if (upeer_sockaddr) {
618618 len = newsock->ops->getname(newsock,
619619 (struct sockaddr *)&address, 2);
620---- linux-4.18.18.orig/net/unix/af_unix.c
621-+++ linux-4.18.18/net/unix/af_unix.c
620+--- linux-4.18.20.orig/net/unix/af_unix.c
621++++ linux-4.18.20/net/unix/af_unix.c
622622 @@ -2122,6 +2122,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.18.18.orig/security/Kconfig
642-+++ linux-4.18.18/security/Kconfig
641+--- linux-4.18.20.orig/security/Kconfig
642++++ linux-4.18.20/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.18.18.orig/security/Makefile
652-+++ linux-4.18.18/security/Makefile
651+--- linux-4.18.20.orig/security/Makefile
652++++ linux-4.18.20/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.18.18.orig/security/security.c
661-+++ linux-4.18.18/security/security.c
660+--- linux-4.18.20.orig/security/security.c
661++++ linux-4.18.20/security/security.c
662662 @@ -985,12 +985,19 @@ int security_file_open(struct file *file
663663
664664 int security_task_alloc(struct task_struct *task, unsigned long clone_flags)
--- trunk/caitsith-patch/patches/ccs-patch-4.19.diff (revision 269)
+++ trunk/caitsith-patch/patches/ccs-patch-4.19.diff (revision 270)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.19.1.
1+This is TOMOYO Linux patch for kernel 4.19.12.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.1.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.12.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.19.1.orig/fs/exec.c
32-+++ linux-4.19.1/fs/exec.c
31+--- linux-4.19.12.orig/fs/exec.c
32++++ linux-4.19.12/fs/exec.c
3333 @@ -1692,7 +1692,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.19.1.orig/fs/open.c
43-+++ linux-4.19.1/fs/open.c
42+--- linux-4.19.12.orig/fs/open.c
43++++ linux-4.19.12/fs/open.c
4444 @@ -1174,6 +1174,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd)
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.19.1.orig/fs/proc/version.c
54-+++ linux-4.19.1/fs/proc/version.c
53+--- linux-4.19.12.orig/fs/proc/version.c
54++++ linux-4.19.12/fs/proc/version.c
5555 @@ -21,3 +21,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.19.1 2018/11/05\n");
62++ printk(KERN_INFO "Hook version: 4.19.12 2018/12/24\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.19.1.orig/include/linux/sched.h
67-+++ linux-4.19.1/include/linux/sched.h
66+--- linux-4.19.12.orig/include/linux/sched.h
67++++ linux-4.19.12/include/linux/sched.h
6868 @@ -34,6 +34,7 @@ struct audit_context;
6969 struct backing_dev_info;
7070 struct bio_list;
@@ -73,7 +73,7 @@
7373 struct cfs_rq;
7474 struct fs_struct;
7575 struct futex_pi_state;
76-@@ -1191,6 +1192,10 @@ struct task_struct {
76+@@ -1192,6 +1193,10 @@ struct task_struct {
7777 /* Used by LSM modules for access restriction: */
7878 void *security;
7979 #endif
@@ -84,8 +84,8 @@
8484
8585 /*
8686 * New fields for task_struct should be added above here, so that
87---- linux-4.19.1.orig/include/linux/security.h
88-+++ linux-4.19.1/include/linux/security.h
87+--- linux-4.19.12.orig/include/linux/security.h
88++++ linux-4.19.12/include/linux/security.h
8989 @@ -53,6 +53,7 @@ struct msg_msg;
9090 struct xattr;
9191 struct xfrm_sec_ctx;
@@ -306,8 +306,8 @@
306306 }
307307 #endif /* CONFIG_SECURITY_PATH */
308308
309---- linux-4.19.1.orig/include/net/ip.h
310-+++ linux-4.19.1/include/net/ip.h
309+--- linux-4.19.12.orig/include/net/ip.h
310++++ linux-4.19.12/include/net/ip.h
311311 @@ -301,6 +301,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.19.1.orig/init/init_task.c
330-+++ linux-4.19.1/init/init_task.c
329+--- linux-4.19.12.orig/init/init_task.c
330++++ linux-4.19.12/init/init_task.c
331331 @@ -179,6 +179,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.19.1.orig/kernel/kexec.c
343-+++ linux-4.19.1/kernel/kexec.c
342+--- linux-4.19.12.orig/kernel/kexec.c
343++++ linux-4.19.12/kernel/kexec.c
344344 @@ -18,7 +18,7 @@
345345 #include <linux/syscalls.h>
346346 #include <linux/vmalloc.h>
@@ -359,8 +359,8 @@
359359
360360 /* Permit LSMs and IMA to fail the kexec */
361361 result = security_kernel_load_data(LOADING_KEXEC_IMAGE);
362---- linux-4.19.1.orig/kernel/module.c
363-+++ linux-4.19.1/kernel/module.c
362+--- linux-4.19.12.orig/kernel/module.c
363++++ linux-4.19.12/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.19.1.orig/kernel/ptrace.c
391-+++ linux-4.19.1/kernel/ptrace.c
390+--- linux-4.19.12.orig/kernel/ptrace.c
391++++ linux-4.19.12/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.19.1.orig/kernel/reboot.c
417-+++ linux-4.19.1/kernel/reboot.c
416+--- linux-4.19.12.orig/kernel/reboot.c
417++++ linux-4.19.12/kernel/reboot.c
418418 @@ -16,6 +16,7 @@
419419 #include <linux/syscalls.h>
420420 #include <linux/syscore_ops.h>
@@ -432,9 +432,9 @@
432432
433433 /*
434434 * If pid namespaces are enabled and the current task is in a child
435---- linux-4.19.1.orig/kernel/sched/core.c
436-+++ linux-4.19.1/kernel/sched/core.c
437-@@ -3944,6 +3944,8 @@ int can_nice(const struct task_struct *p
435+--- linux-4.19.12.orig/kernel/sched/core.c
436++++ linux-4.19.12/kernel/sched/core.c
437+@@ -3943,6 +3943,8 @@ int can_nice(const struct task_struct *p
438438 SYSCALL_DEFINE1(nice, int, increment)
439439 {
440440 long nice, retval;
@@ -443,8 +443,8 @@
443443
444444 /*
445445 * Setpriority might change our priority at the same moment.
446---- linux-4.19.1.orig/kernel/signal.c
447-+++ linux-4.19.1/kernel/signal.c
446+--- linux-4.19.12.orig/kernel/signal.c
447++++ linux-4.19.12/kernel/signal.c
448448 @@ -3210,6 +3210,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.19.1.orig/kernel/sys.c
494-+++ linux-4.19.1/kernel/sys.c
493+--- linux-4.19.12.orig/kernel/sys.c
494++++ linux-4.19.12/kernel/sys.c
495495 @@ -201,6 +201,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
496496
497497 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -521,8 +521,8 @@
521521
522522 errno = -EFAULT;
523523 if (!copy_from_user(tmp, name, len)) {
524---- linux-4.19.1.orig/kernel/time/timekeeping.c
525-+++ linux-4.19.1/kernel/time/timekeeping.c
524+--- linux-4.19.12.orig/kernel/time/timekeeping.c
525++++ linux-4.19.12/kernel/time/timekeeping.c
526526 @@ -26,6 +26,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.19.1.orig/net/ipv4/raw.c
560-+++ linux-4.19.1/net/ipv4/raw.c
559+--- linux-4.19.12.orig/net/ipv4/raw.c
560++++ linux-4.19.12/net/ipv4/raw.c
561561 @@ -772,6 +772,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.19.1.orig/net/ipv4/udp.c
573-+++ linux-4.19.1/net/ipv4/udp.c
572+--- linux-4.19.12.orig/net/ipv4/udp.c
573++++ linux-4.19.12/net/ipv4/udp.c
574574 @@ -1655,6 +1655,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.19.1.orig/net/ipv6/raw.c
584-+++ linux-4.19.1/net/ipv6/raw.c
583+--- linux-4.19.12.orig/net/ipv6/raw.c
584++++ linux-4.19.12/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.19.1.orig/net/ipv6/udp.c
597-+++ linux-4.19.1/net/ipv6/udp.c
596+--- linux-4.19.12.orig/net/ipv6/udp.c
597++++ linux-4.19.12/net/ipv6/udp.c
598598 @@ -343,6 +343,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.19.1.orig/net/socket.c
608-+++ linux-4.19.1/net/socket.c
607+--- linux-4.19.12.orig/net/socket.c
608++++ linux-4.19.12/net/socket.c
609609 @@ -1591,6 +1591,10 @@ int __sys_accept4(int fd, struct sockadd
610610 if (err < 0)
611611 goto out_fd;
@@ -617,8 +617,8 @@
617617 if (upeer_sockaddr) {
618618 len = newsock->ops->getname(newsock,
619619 (struct sockaddr *)&address, 2);
620---- linux-4.19.1.orig/net/unix/af_unix.c
621-+++ linux-4.19.1/net/unix/af_unix.c
620+--- linux-4.19.12.orig/net/unix/af_unix.c
621++++ linux-4.19.12/net/unix/af_unix.c
622622 @@ -2127,6 +2127,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.19.1.orig/security/Kconfig
642-+++ linux-4.19.1/security/Kconfig
641+--- linux-4.19.12.orig/security/Kconfig
642++++ linux-4.19.12/security/Kconfig
643643 @@ -276,5 +276,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.19.1.orig/security/Makefile
652-+++ linux-4.19.1/security/Makefile
651+--- linux-4.19.12.orig/security/Makefile
652++++ linux-4.19.12/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.19.1.orig/security/security.c
661-+++ linux-4.19.1/security/security.c
660+--- linux-4.19.12.orig/security/security.c
661++++ linux-4.19.12/security/security.c
662662 @@ -988,12 +988,19 @@ int security_file_open(struct file *file
663663
664664 int security_task_alloc(struct task_struct *task, unsigned long clone_flags)
--- trunk/caitsith-patch/patches/ccs-patch-4.20.diff (revision 269)
+++ trunk/caitsith-patch/patches/ccs-patch-4.20.diff (revision 270)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.20-rc1.
1+This is TOMOYO Linux patch for kernel 4.20.
22
3-Source code for this patch is https://git.kernel.org/torvalds/t/linux-4.20-rc1.tar.gz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.20.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.20-rc1.orig/fs/exec.c
32-+++ linux-4.20-rc1/fs/exec.c
31+--- linux-4.20.orig/fs/exec.c
32++++ linux-4.20/fs/exec.c
3333 @@ -1692,7 +1692,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.20-rc1.orig/fs/open.c
43-+++ linux-4.20-rc1/fs/open.c
42+--- linux-4.20.orig/fs/open.c
43++++ linux-4.20/fs/open.c
4444 @@ -1174,6 +1174,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd)
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.20-rc1.orig/fs/proc/version.c
54-+++ linux-4.20-rc1/fs/proc/version.c
53+--- linux-4.20.orig/fs/proc/version.c
54++++ linux-4.20/fs/proc/version.c
5555 @@ -21,3 +21,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.20-rc1 2018/11/05\n");
62++ printk(KERN_INFO "Hook version: 4.20 2018/12/24\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.20-rc1.orig/include/linux/sched.h
67-+++ linux-4.20-rc1/include/linux/sched.h
66+--- linux-4.20.orig/include/linux/sched.h
67++++ linux-4.20/include/linux/sched.h
6868 @@ -35,6 +35,7 @@ struct audit_context;
6969 struct backing_dev_info;
7070 struct bio_list;
@@ -73,7 +73,7 @@
7373 struct cfs_rq;
7474 struct fs_struct;
7575 struct futex_pi_state;
76-@@ -1204,6 +1205,10 @@ struct task_struct {
76+@@ -1205,6 +1206,10 @@ struct task_struct {
7777 unsigned long lowest_stack;
7878 unsigned long prev_lowest_stack;
7979 #endif
@@ -84,8 +84,8 @@
8484
8585 /*
8686 * New fields for task_struct should be added above here, so that
87---- linux-4.20-rc1.orig/include/linux/security.h
88-+++ linux-4.20-rc1/include/linux/security.h
87+--- linux-4.20.orig/include/linux/security.h
88++++ linux-4.20/include/linux/security.h
8989 @@ -53,6 +53,7 @@ struct msg_msg;
9090 struct xattr;
9191 struct xfrm_sec_ctx;
@@ -306,8 +306,8 @@
306306 }
307307 #endif /* CONFIG_SECURITY_PATH */
308308
309---- linux-4.20-rc1.orig/include/net/ip.h
310-+++ linux-4.20-rc1/include/net/ip.h
309+--- linux-4.20.orig/include/net/ip.h
310++++ linux-4.20/include/net/ip.h
311311 @@ -301,6 +301,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.20-rc1.orig/init/init_task.c
330-+++ linux-4.20-rc1/init/init_task.c
329+--- linux-4.20.orig/init/init_task.c
330++++ linux-4.20/init/init_task.c
331331 @@ -179,6 +179,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.20-rc1.orig/kernel/kexec.c
343-+++ linux-4.20-rc1/kernel/kexec.c
342+--- linux-4.20.orig/kernel/kexec.c
343++++ linux-4.20/kernel/kexec.c
344344 @@ -18,7 +18,7 @@
345345 #include <linux/syscalls.h>
346346 #include <linux/vmalloc.h>
@@ -359,8 +359,8 @@
359359
360360 /* Permit LSMs and IMA to fail the kexec */
361361 result = security_kernel_load_data(LOADING_KEXEC_IMAGE);
362---- linux-4.20-rc1.orig/kernel/module.c
363-+++ linux-4.20-rc1/kernel/module.c
362+--- linux-4.20.orig/kernel/module.c
363++++ linux-4.20/kernel/module.c
364364 @@ -66,6 +66,7 @@
365365 #include <linux/audit.h>
366366 #include <uapi/linux/module.h>
@@ -387,9 +387,9 @@
387387
388388 return 0;
389389 }
390---- linux-4.20-rc1.orig/kernel/ptrace.c
391-+++ linux-4.20-rc1/kernel/ptrace.c
392-@@ -1121,6 +1121,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
390+--- linux-4.20.orig/kernel/ptrace.c
391++++ linux-4.20/kernel/ptrace.c
392+@@ -1111,6 +1111,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
393393 {
394394 struct task_struct *child;
395395 long ret;
@@ -401,7 +401,7 @@
401401
402402 if (request == PTRACE_TRACEME) {
403403 ret = ptrace_traceme();
404-@@ -1268,6 +1273,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
404+@@ -1258,6 +1263,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
405405 {
406406 struct task_struct *child;
407407 long ret;
@@ -413,8 +413,8 @@
413413
414414 if (request == PTRACE_TRACEME) {
415415 ret = ptrace_traceme();
416---- linux-4.20-rc1.orig/kernel/reboot.c
417-+++ linux-4.20-rc1/kernel/reboot.c
416+--- linux-4.20.orig/kernel/reboot.c
417++++ linux-4.20/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.20-rc1.orig/kernel/sched/core.c
436-+++ linux-4.20-rc1/kernel/sched/core.c
435+--- linux-4.20.orig/kernel/sched/core.c
436++++ linux-4.20/kernel/sched/core.c
437437 @@ -3943,6 +3943,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.20-rc1.orig/kernel/signal.c
447-+++ linux-4.20-rc1/kernel/signal.c
446+--- linux-4.20.orig/kernel/signal.c
447++++ linux-4.20/kernel/signal.c
448448 @@ -3294,6 +3294,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.20-rc1.orig/kernel/sys.c
494-+++ linux-4.20-rc1/kernel/sys.c
493+--- linux-4.20.orig/kernel/sys.c
494++++ linux-4.20/kernel/sys.c
495495 @@ -201,6 +201,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
496496
497497 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -521,8 +521,8 @@
521521
522522 errno = -EFAULT;
523523 if (!copy_from_user(tmp, name, len)) {
524---- linux-4.20-rc1.orig/kernel/time/timekeeping.c
525-+++ linux-4.20-rc1/kernel/time/timekeeping.c
524+--- linux-4.20.orig/kernel/time/timekeeping.c
525++++ linux-4.20/kernel/time/timekeeping.c
526526 @@ -26,6 +26,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.20-rc1.orig/net/ipv4/raw.c
560-+++ linux-4.20-rc1/net/ipv4/raw.c
559+--- linux-4.20.orig/net/ipv4/raw.c
560++++ linux-4.20/net/ipv4/raw.c
561561 @@ -772,6 +772,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.20-rc1.orig/net/ipv4/udp.c
573-+++ linux-4.20-rc1/net/ipv4/udp.c
572+--- linux-4.20.orig/net/ipv4/udp.c
573++++ linux-4.20/net/ipv4/udp.c
574574 @@ -1655,6 +1655,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.20-rc1.orig/net/ipv6/raw.c
584-+++ linux-4.20-rc1/net/ipv6/raw.c
583+--- linux-4.20.orig/net/ipv6/raw.c
584++++ linux-4.20/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.20-rc1.orig/net/ipv6/udp.c
597-+++ linux-4.20-rc1/net/ipv6/udp.c
596+--- linux-4.20.orig/net/ipv6/udp.c
597++++ linux-4.20/net/ipv6/udp.c
598598 @@ -343,6 +343,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.20-rc1.orig/net/socket.c
608-+++ linux-4.20-rc1/net/socket.c
607+--- linux-4.20.orig/net/socket.c
608++++ linux-4.20/net/socket.c
609609 @@ -1591,6 +1591,10 @@ int __sys_accept4(int fd, struct sockadd
610610 if (err < 0)
611611 goto out_fd;
@@ -617,8 +617,8 @@
617617 if (upeer_sockaddr) {
618618 len = newsock->ops->getname(newsock,
619619 (struct sockaddr *)&address, 2);
620---- linux-4.20-rc1.orig/net/unix/af_unix.c
621-+++ linux-4.20-rc1/net/unix/af_unix.c
620+--- linux-4.20.orig/net/unix/af_unix.c
621++++ linux-4.20/net/unix/af_unix.c
622622 @@ -2129,6 +2129,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.20-rc1.orig/security/Kconfig
642-+++ linux-4.20-rc1/security/Kconfig
641+--- linux-4.20.orig/security/Kconfig
642++++ linux-4.20/security/Kconfig
643643 @@ -276,5 +276,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.20-rc1.orig/security/Makefile
652-+++ linux-4.20-rc1/security/Makefile
651+--- linux-4.20.orig/security/Makefile
652++++ linux-4.20/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.20-rc1.orig/security/security.c
661-+++ linux-4.20-rc1/security/security.c
660+--- linux-4.20.orig/security/security.c
661++++ linux-4.20/security/security.c
662662 @@ -999,12 +999,19 @@ int security_file_open(struct file *file
663663
664664 int security_task_alloc(struct task_struct *task, unsigned long clone_flags)
--- trunk/caitsith-patch/patches/ccs-patch-4.4.diff (revision 269)
+++ trunk/caitsith-patch/patches/ccs-patch-4.4.diff (revision 270)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.4.163.
1+This is TOMOYO Linux patch for kernel 4.4.169.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.163.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.169.tar.xz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,9 +28,9 @@
2828 security/Makefile | 3 ++
2929 24 files changed, 150 insertions(+), 26 deletions(-)
3030
31---- linux-4.4.163.orig/fs/exec.c
32-+++ linux-4.4.163/fs/exec.c
33-@@ -1508,7 +1508,7 @@ static int exec_binprm(struct linux_binp
31+--- linux-4.4.169.orig/fs/exec.c
32++++ linux-4.4.169/fs/exec.c
33+@@ -1512,7 +1512,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();
3636
@@ -39,8 +39,8 @@
3939 if (ret >= 0) {
4040 audit_bprm(bprm);
4141 trace_sched_process_exec(current, old_pid, bprm);
42---- linux-4.4.163.orig/fs/open.c
43-+++ linux-4.4.163/fs/open.c
42+--- linux-4.4.169.orig/fs/open.c
43++++ linux-4.4.169/fs/open.c
4444 @@ -1117,6 +1117,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.4.163.orig/fs/proc/version.c
54-+++ linux-4.4.163/fs/proc/version.c
53+--- linux-4.4.169.orig/fs/proc/version.c
54++++ linux-4.4.169/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.4.163 2018/11/11\n");
62++ printk(KERN_INFO "Hook version: 4.4.169 2018/12/24\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.4.163.orig/include/linux/init_task.h
67-+++ linux-4.4.163/include/linux/init_task.h
66+--- linux-4.4.169.orig/include/linux/init_task.h
67++++ linux-4.4.169/include/linux/init_task.h
6868 @@ -183,6 +183,14 @@ extern struct task_group root_task_group
6969 # define INIT_KASAN(tsk)
7070 #endif
@@ -88,8 +88,8 @@
8888 }
8989
9090
91---- linux-4.4.163.orig/include/linux/sched.h
92-+++ linux-4.4.163/include/linux/sched.h
91+--- linux-4.4.169.orig/include/linux/sched.h
92++++ linux-4.4.169/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.4.163.orig/include/linux/security.h
114-+++ linux-4.4.163/include/linux/security.h
113+--- linux-4.4.169.orig/include/linux/security.h
114++++ linux-4.4.169/include/linux/security.h
115115 @@ -53,6 +53,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.4.163.orig/include/net/ip.h
322-+++ linux-4.4.163/include/net/ip.h
321+--- linux-4.4.169.orig/include/net/ip.h
322++++ linux-4.4.169/include/net/ip.h
323323 @@ -225,6 +225,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.4.163.orig/kernel/fork.c
342-+++ linux-4.4.163/kernel/fork.c
341+--- linux-4.4.169.orig/kernel/fork.c
342++++ linux-4.4.169/kernel/fork.c
343343 @@ -260,6 +260,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.4.163.orig/kernel/kexec.c
370-+++ linux-4.4.163/kernel/kexec.c
369+--- linux-4.4.169.orig/kernel/kexec.c
370++++ linux-4.4.169/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.4.163.orig/kernel/module.c
390-+++ linux-4.4.163/kernel/module.c
389+--- linux-4.4.169.orig/kernel/module.c
390++++ linux-4.4.169/kernel/module.c
391391 @@ -61,6 +61,7 @@
392392 #include <linux/bsearch.h>
393393 #include <uapi/linux/module.h>
@@ -414,8 +414,8 @@
414414
415415 return 0;
416416 }
417---- linux-4.4.163.orig/kernel/ptrace.c
418-+++ linux-4.4.163/kernel/ptrace.c
417+--- linux-4.4.169.orig/kernel/ptrace.c
418++++ linux-4.4.169/kernel/ptrace.c
419419 @@ -1085,6 +1085,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.4.163.orig/kernel/reboot.c
444-+++ linux-4.4.163/kernel/reboot.c
443+--- linux-4.4.169.orig/kernel/reboot.c
444++++ linux-4.4.169/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.4.163.orig/kernel/sched/core.c
463-+++ linux-4.4.163/kernel/sched/core.c
462+--- linux-4.4.169.orig/kernel/sched/core.c
463++++ linux-4.4.169/kernel/sched/core.c
464464 @@ -3549,6 +3549,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.4.163.orig/kernel/signal.c
474-+++ linux-4.4.163/kernel/signal.c
473+--- linux-4.4.169.orig/kernel/signal.c
474++++ linux-4.4.169/kernel/signal.c
475475 @@ -2868,6 +2868,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.4.163.orig/kernel/sys.c
521-+++ linux-4.4.163/kernel/sys.c
520+--- linux-4.4.169.orig/kernel/sys.c
521++++ linux-4.4.169/kernel/sys.c
522522 @@ -185,6 +185,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
523523
524524 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -548,8 +548,8 @@
548548
549549 errno = -EFAULT;
550550 if (!copy_from_user(tmp, name, len)) {
551---- linux-4.4.163.orig/kernel/time/ntp.c
552-+++ linux-4.4.163/kernel/time/ntp.c
551+--- linux-4.4.169.orig/kernel/time/ntp.c
552++++ linux-4.4.169/kernel/time/ntp.c
553553 @@ -16,6 +16,7 @@
554554 #include <linux/mm.h>
555555 #include <linux/module.h>
@@ -583,8 +583,8 @@
583583
584584 if (txc->modes & ADJ_NANO) {
585585 struct timespec ts;
586---- linux-4.4.163.orig/net/ipv4/raw.c
587-+++ linux-4.4.163/net/ipv4/raw.c
586+--- linux-4.4.169.orig/net/ipv4/raw.c
587++++ linux-4.4.169/net/ipv4/raw.c
588588 @@ -747,6 +747,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.4.163.orig/net/ipv4/udp.c
600-+++ linux-4.4.163/net/ipv4/udp.c
599+--- linux-4.4.169.orig/net/ipv4/udp.c
600++++ linux-4.4.169/net/ipv4/udp.c
601601 @@ -1289,6 +1289,10 @@ try_again:
602602 &peeked, &off, &err);
603603 if (!skb)
@@ -609,8 +609,8 @@
609609
610610 ulen = skb->len - sizeof(struct udphdr);
611611 copied = len;
612---- linux-4.4.163.orig/net/ipv6/raw.c
613-+++ linux-4.4.163/net/ipv6/raw.c
612+--- linux-4.4.169.orig/net/ipv6/raw.c
613++++ linux-4.4.169/net/ipv6/raw.c
614614 @@ -478,6 +478,10 @@ static int rawv6_recvmsg(struct sock *sk
615615 skb = skb_recv_datagram(sk, flags, noblock, &err);
616616 if (!skb)
@@ -622,8 +622,8 @@
622622
623623 copied = skb->len;
624624 if (copied > len) {
625---- linux-4.4.163.orig/net/ipv6/udp.c
626-+++ linux-4.4.163/net/ipv6/udp.c
625+--- linux-4.4.169.orig/net/ipv6/udp.c
626++++ linux-4.4.169/net/ipv6/udp.c
627627 @@ -417,6 +417,10 @@ try_again:
628628 &peeked, &off, &err);
629629 if (!skb)
@@ -635,8 +635,8 @@
635635
636636 ulen = skb->len - sizeof(struct udphdr);
637637 copied = len;
638---- linux-4.4.163.orig/net/socket.c
639-+++ linux-4.4.163/net/socket.c
638+--- linux-4.4.169.orig/net/socket.c
639++++ linux-4.4.169/net/socket.c
640640 @@ -1477,6 +1477,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
641641 if (err < 0)
642642 goto out_fd;
@@ -648,8 +648,8 @@
648648 if (upeer_sockaddr) {
649649 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
650650 &len, 2) < 0) {
651---- linux-4.4.163.orig/net/unix/af_unix.c
652-+++ linux-4.4.163/net/unix/af_unix.c
651+--- linux-4.4.169.orig/net/unix/af_unix.c
652++++ linux-4.4.169/net/unix/af_unix.c
653653 @@ -2141,6 +2141,10 @@ static int unix_dgram_recvmsg(struct soc
654654 wake_up_interruptible_sync_poll(&u->peer_wait,
655655 POLLOUT | POLLWRNORM | POLLWRBAND);
@@ -661,8 +661,8 @@
661661 if (msg->msg_name)
662662 unix_copy_addr(msg, skb->sk);
663663
664---- linux-4.4.163.orig/security/Kconfig
665-+++ linux-4.4.163/security/Kconfig
664+--- linux-4.4.169.orig/security/Kconfig
665++++ linux-4.4.169/security/Kconfig
666666 @@ -173,5 +173,7 @@ config DEFAULT_SECURITY
667667 default "apparmor" if DEFAULT_SECURITY_APPARMOR
668668 default "" if DEFAULT_SECURITY_DAC
@@ -671,8 +671,8 @@
671671 +
672672 endmenu
673673
674---- linux-4.4.163.orig/security/Makefile
675-+++ linux-4.4.163/security/Makefile
674+--- linux-4.4.169.orig/security/Makefile
675++++ linux-4.4.169/security/Makefile
676676 @@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
677677 # Object integrity file lists
678678 subdir-$(CONFIG_INTEGRITY) += integrity
--- trunk/caitsith-patch/patches/ccs-patch-4.9.diff (revision 269)
+++ trunk/caitsith-patch/patches/ccs-patch-4.9.diff (revision 270)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.9.136.
1+This is TOMOYO Linux patch for kernel 4.9.147.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.136.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.147.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.136.orig/fs/exec.c
32-+++ linux-4.9.136/fs/exec.c
31+--- linux-4.9.147.orig/fs/exec.c
32++++ linux-4.9.147/fs/exec.c
3333 @@ -1660,7 +1660,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.136.orig/fs/open.c
43-+++ linux-4.9.136/fs/open.c
42+--- linux-4.9.147.orig/fs/open.c
43++++ linux-4.9.147/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.136.orig/fs/proc/version.c
54-+++ linux-4.9.136/fs/proc/version.c
53+--- linux-4.9.147.orig/fs/proc/version.c
54++++ linux-4.9.147/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.136 2018/11/11\n");
62++ printk(KERN_INFO "Hook version: 4.9.147 2018/12/24\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.9.136.orig/include/linux/init_task.h
67-+++ linux-4.9.136/include/linux/init_task.h
66+--- linux-4.9.147.orig/include/linux/init_task.h
67++++ linux-4.9.147/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.136.orig/include/linux/sched.h
92-+++ linux-4.9.136/include/linux/sched.h
91+--- linux-4.9.147.orig/include/linux/sched.h
92++++ linux-4.9.147/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.136.orig/include/linux/security.h
114-+++ linux-4.9.136/include/linux/security.h
113+--- linux-4.9.147.orig/include/linux/security.h
114++++ linux-4.9.147/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.136.orig/include/net/ip.h
322-+++ linux-4.9.136/include/net/ip.h
321+--- linux-4.9.147.orig/include/net/ip.h
322++++ linux-4.9.147/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.136.orig/kernel/fork.c
342-+++ linux-4.9.136/kernel/fork.c
341+--- linux-4.9.147.orig/kernel/fork.c
342++++ linux-4.9.147/kernel/fork.c
343343 @@ -395,6 +395,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.136.orig/kernel/kexec.c
370-+++ linux-4.9.136/kernel/kexec.c
369+--- linux-4.9.147.orig/kernel/kexec.c
370++++ linux-4.9.147/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.136.orig/kernel/module.c
390-+++ linux-4.9.136/kernel/module.c
389+--- linux-4.9.147.orig/kernel/module.c
390++++ linux-4.9.147/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.136.orig/kernel/ptrace.c
418-+++ linux-4.9.136/kernel/ptrace.c
417+--- linux-4.9.147.orig/kernel/ptrace.c
418++++ linux-4.9.147/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.136.orig/kernel/reboot.c
444-+++ linux-4.9.136/kernel/reboot.c
443+--- linux-4.9.147.orig/kernel/reboot.c
444++++ linux-4.9.147/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.136.orig/kernel/sched/core.c
463-+++ linux-4.9.136/kernel/sched/core.c
462+--- linux-4.9.147.orig/kernel/sched/core.c
463++++ linux-4.9.147/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.136.orig/kernel/signal.c
474-+++ linux-4.9.136/kernel/signal.c
473+--- linux-4.9.147.orig/kernel/signal.c
474++++ linux-4.9.147/kernel/signal.c
475475 @@ -2868,6 +2868,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.136.orig/kernel/sys.c
521-+++ linux-4.9.136/kernel/sys.c
520+--- linux-4.9.147.orig/kernel/sys.c
521++++ linux-4.9.147/kernel/sys.c
522522 @@ -185,6 +185,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
523523
524524 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -548,8 +548,8 @@
548548
549549 errno = -EFAULT;
550550 if (!copy_from_user(tmp, name, len)) {
551---- linux-4.9.136.orig/kernel/time/ntp.c
552-+++ linux-4.9.136/kernel/time/ntp.c
551+--- linux-4.9.147.orig/kernel/time/ntp.c
552++++ linux-4.9.147/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.136.orig/net/ipv4/raw.c
587-+++ linux-4.9.136/net/ipv4/raw.c
586+--- linux-4.9.147.orig/net/ipv4/raw.c
587++++ linux-4.9.147/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.136.orig/net/ipv4/udp.c
600-+++ linux-4.9.136/net/ipv4/udp.c
599+--- linux-4.9.147.orig/net/ipv4/udp.c
600++++ linux-4.9.147/net/ipv4/udp.c
601601 @@ -1267,6 +1267,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.136.orig/net/ipv6/raw.c
611-+++ linux-4.9.136/net/ipv6/raw.c
610+--- linux-4.9.147.orig/net/ipv6/raw.c
611++++ linux-4.9.147/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.136.orig/net/ipv6/udp.c
624-+++ linux-4.9.136/net/ipv6/udp.c
623+--- linux-4.9.147.orig/net/ipv6/udp.c
624++++ linux-4.9.147/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.136.orig/net/socket.c
635-+++ linux-4.9.136/net/socket.c
634+--- linux-4.9.147.orig/net/socket.c
635++++ linux-4.9.147/net/socket.c
636636 @@ -1482,6 +1482,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.136.orig/net/unix/af_unix.c
648-+++ linux-4.9.136/net/unix/af_unix.c
647+--- linux-4.9.147.orig/net/unix/af_unix.c
648++++ linux-4.9.147/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.136.orig/security/Kconfig
669-+++ linux-4.9.136/security/Kconfig
668+--- linux-4.9.147.orig/security/Kconfig
669++++ linux-4.9.147/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.136.orig/security/Makefile
679-+++ linux-4.9.136/security/Makefile
678+--- linux-4.9.147.orig/security/Makefile
679++++ linux-4.9.147/security/Makefile
680680 @@ -29,3 +29,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
681681 # Object integrity file lists
682682 subdir-$(CONFIG_INTEGRITY) += integrity
--- trunk/caitsith-patch/specs/build-c6-2.6.32.sh (revision 269)
+++ trunk/caitsith-patch/specs/build-c6-2.6.32.sh (revision 270)
@@ -10,17 +10,17 @@
1010
1111 cd /tmp/ || die "Can't chdir to /tmp/ ."
1212
13-if [ ! -r kernel-2.6.32-754.6.3.el6.src.rpm ]
13+if [ ! -r kernel-2.6.32-754.9.1.el6.src.rpm ]
1414 then
15- wget http://vault.centos.org/6.10/updates/Source/SPackages/kernel-2.6.32-754.6.3.el6.src.rpm || die "Can't download source package."
15+ wget http://vault.centos.org/6.10/updates/Source/SPackages/kernel-2.6.32-754.9.1.el6.src.rpm || die "Can't download source package."
1616 fi
17-LANG=C rpm --checksig kernel-2.6.32-754.6.3.el6.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature."
18-rpm -ivh kernel-2.6.32-754.6.3.el6.src.rpm || die "Can't install source package."
17+LANG=C rpm --checksig kernel-2.6.32-754.9.1.el6.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature."
18+rpm -ivh kernel-2.6.32-754.9.1.el6.src.rpm || die "Can't install source package."
1919
2020 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
21-if [ ! -r caitsith-patch-0.2-20180827.tar.gz ]
21+if [ ! -r caitsith-patch-0.2-20181225.tar.gz ]
2222 then
23- wget -O caitsith-patch-0.2-20180827.tar.gz 'http://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20180827.tar.gz' || die "Can't download patch."
23+ wget -O caitsith-patch-0.2-20181225.tar.gz 'http://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20181225.tar.gz' || die "Can't download patch."
2424 fi
2525
2626 cd ~/rpmbuild/SPECS/ || die "Can't chdir to ~/rpmbuild/SPECS/ ."
@@ -35,7 +35,7 @@
3535 -# % define buildid .local
3636 +%define buildid _caitsith_0.2.3
3737
38- %define distro_build 754.6.3
38+ %define distro_build 754.9.1
3939 %define kabi_build 754
4040 @@ -438,7 +438,7 @@
4141 # Packages that need to be installed before the kernel is, because the %post
@@ -69,7 +69,7 @@
6969 ApplyOptionalPatch linux-kernel-test.patch
7070
7171 +# CaitSith
72-+tar -zxf %_sourcedir/caitsith-patch-0.2-20180827.tar.gz
72++tar -zxf %_sourcedir/caitsith-patch-0.2-20181225.tar.gz
7373 +sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
7474 +patch -sp1 < patches/ccs-patch-2.6.32-centos-6.diff
7575 # Any further pre-build tree manipulations happen here.
--- trunk/caitsith-patch/specs/build-c7-3.10.sh (revision 269)
+++ trunk/caitsith-patch/specs/build-c7-3.10.sh (revision 270)
@@ -10,17 +10,17 @@
1010
1111 cd /tmp/ || die "Can't chdir to /tmp/ ."
1212
13-if [ ! -r kernel-3.10.0-862.14.4.el7.src.rpm ]
13+if [ ! -r kernel-3.10.0-957.1.3.el7.src.rpm ]
1414 then
15- wget http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-862.14.4.el7.src.rpm || die "Can't download source package."
15+ wget http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-957.1.3.el7.src.rpm || die "Can't download source package."
1616 fi
17-LANG=C rpm --checksig kernel-3.10.0-862.14.4.el7.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature."
18-rpm -ivh kernel-3.10.0-862.14.4.el7.src.rpm || die "Can't install source package."
17+LANG=C rpm --checksig kernel-3.10.0-957.1.3.el7.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature."
18+rpm -ivh kernel-3.10.0-957.1.3.el7.src.rpm || die "Can't install source package."
1919
2020 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
21-if [ ! -r caitsith-patch-0.2-20180827.tar.gz ]
21+if [ ! -r caitsith-patch-0.2-20181225.tar.gz ]
2222 then
23- wget -O caitsith-patch-0.2-20180827.tar.gz 'http://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20180827.tar.gz' || die "Can't download patch."
23+ wget -O caitsith-patch-0.2-20181225.tar.gz 'http://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20181225.tar.gz' || die "Can't download patch."
2424 fi
2525
2626 cd ~/rpmbuild/SPECS/ || die "Can't chdir to ~/rpmbuild/SPECS/ ."
@@ -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-@@ -314,7 +314,7 @@
40+@@ -324,7 +324,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-@@ -638,13 +638,13 @@
49+@@ -664,13 +664,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,18 +64,18 @@
6464 This package provides kernel headers and makefiles sufficient to build modules\
6565 against the %{?2:%{2} }kernel package.\
6666 %{nil}
67-@@ -756,6 +756,10 @@
67+@@ -782,6 +782,10 @@
6868 ApplyOptionalPatch debrand-rh_taint.patch
6969 ApplyOptionalPatch debrand-rh-i686-cpu.patch
7070
7171 +# CaitSith
72-+tar -zxf %_sourcedir/caitsith-patch-0.2-20180827.tar.gz
72++tar -zxf %_sourcedir/caitsith-patch-0.2-20181225.tar.gz
7373 +sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
7474 +patch -sp1 < patches/ccs-patch-3.10-centos-7.diff
7575 # Any further pre-build tree manipulations happen here.
7676
7777 chmod +x scripts/checkpatch.pl
78-@@ -794,6 +798,17 @@
78+@@ -820,6 +824,17 @@
7979 for i in *.config
8080 do
8181 mv $i .config
--- trunk/caitsith-patch/specs/build-debian_wheezy.sh (revision 269)
+++ trunk/caitsith-patch/specs/build-debian_wheezy.sh (revision 270)
@@ -23,10 +23,10 @@
2323 # Download CaitSith patches.
2424 mkdir -p ~/rpmbuild/SOURCES/
2525 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
26-if [ ! -r caitsith-patch-0.2-20180827.tar.gz ]
26+if [ ! -r caitsith-patch-0.2-20181225.tar.gz ]
2727 then
2828 apt-get -y install wget
29- wget -O caitsith-patch-0.2-20180827.tar.gz 'http://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20180827.tar.gz' || die "Can't download patch."
29+ wget -O caitsith-patch-0.2-20181225.tar.gz 'http://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20181225.tar.gz' || die "Can't download patch."
3030 fi
3131
3232 # Install kernel source packages.
@@ -38,7 +38,7 @@
3838
3939 # Apply patches and create kernel config.
4040 cd linux-source-3.2 || die "Can't chdir to linux-source-3.2/ ."
41-tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20180827.tar.gz || die "Can't extract patch."
41+tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20181225.tar.gz || die "Can't extract patch."
4242 sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
4343 patch -p1 < patches/ccs-patch-3.2-debian-wheezy.diff || die "Can't apply patch."
4444 cat /boot/config-3.2.0-$ABI_VERSION-$ORIGINAL_FLAVOUR config.caitsith > .config || die "Can't create config."
--- trunk/caitsith-patch/specs/build-ubuntu_12.04.sh (revision 269)
+++ trunk/caitsith-patch/specs/build-ubuntu_12.04.sh (revision 270)
@@ -29,9 +29,9 @@
2929 # Download CaitSith patches.
3030 mkdir -p ~/rpmbuild/SOURCES/
3131 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32-if [ ! -r caitsith-patch-0.2-20180827.tar.gz ]
32+if [ ! -r caitsith-patch-0.2-20181225.tar.gz ]
3333 then
34- wget -O caitsith-patch-0.2-20180827.tar.gz 'http://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20180827.tar.gz' || die "Can't download patch."
34+ wget -O caitsith-patch-0.2-20181225.tar.gz 'http://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20181225.tar.gz' || die "Can't download patch."
3535 fi
3636
3737 # Install kernel source packages.
@@ -44,7 +44,7 @@
4444 # Apply patches and create kernel config.
4545 cd linux-3.2.0/ || die "Can't chdir to linux-3.2.0/ ."
4646 update_maintainer
47-tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20180827.tar.gz || die "Can't extract patch."
47+tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20181225.tar.gz || die "Can't extract patch."
4848 sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
4949 patch -p1 < patches/ccs-patch-3.2-ubuntu-12.04.diff || die "Can't apply patch."
5050 rm -fR patches/ specs/ || die "Can't delete patch."
--- trunk/caitsith-patch/specs/build-ubuntu_14.04.sh (revision 269)
+++ trunk/caitsith-patch/specs/build-ubuntu_14.04.sh (revision 270)
@@ -29,9 +29,9 @@
2929 # Download CaitSith patches.
3030 mkdir -p ~/rpmbuild/SOURCES/
3131 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32-if [ ! -r caitsith-patch-0.2-20180827.tar.gz ]
32+if [ ! -r caitsith-patch-0.2-20181225.tar.gz ]
3333 then
34- wget -O caitsith-patch-0.2-20180827.tar.gz 'http://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20180827.tar.gz' || die "Can't download patch."
34+ wget -O caitsith-patch-0.2-20181225.tar.gz 'http://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20181225.tar.gz' || die "Can't download patch."
3535 fi
3636
3737 # Install kernel source packages.
@@ -44,7 +44,7 @@
4444 # Apply patches and create kernel config.
4545 cd linux-3.13.0/ || die "Can't chdir to linux-3.13.0/ ."
4646 update_maintainer
47-tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20180827.tar.gz || die "Can't extract patch."
47+tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20181225.tar.gz || die "Can't extract patch."
4848 sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
4949 patch -p1 < patches/ccs-patch-3.13-ubuntu-14.04.diff || die "Can't apply patch."
5050 rm -fR patches/ specs/ || die "Can't delete patch."
--- trunk/caitsith-patch/specs/build-vl6-4.4.sh (revision 269)
+++ trunk/caitsith-patch/specs/build-vl6-4.4.sh (revision 270)
@@ -18,9 +18,9 @@
1818 rpm -ivh kernel-4.4.110-2vl6.src.rpm || die "Can't install source package."
1919
2020 cd ~/rpm/SOURCES/ || die "Can't chdir to ~/rpm/SOURCES/ ."
21-if [ ! -r caitsith-patch-0.2-20180827.tar.gz ]
21+if [ ! -r caitsith-patch-0.2-20181225.tar.gz ]
2222 then
23- wget -O caitsith-patch-0.2-20180827.tar.gz 'http://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20180827.tar.gz' || die "Can't download patch."
23+ wget -O caitsith-patch-0.2-20181225.tar.gz 'http://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20181225.tar.gz' || die "Can't download patch."
2424 fi
2525
2626 cd /tmp/ || die "Can't chdir to /tmp/ ."
@@ -61,7 +61,7 @@
6161 # END OF PATCH APPLICATIONS
6262
6363 +# CaitSith
64-+tar -zxf %_sourcedir/caitsith-patch-0.2-20180827.tar.gz
64++tar -zxf %_sourcedir/caitsith-patch-0.2-20181225.tar.gz
6565 +sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
6666 +patch -sp1 < patches/ccs-patch-4.4-vine-linux-6.diff
6767 cp %{SOURCE10} Documentation/
旧リポジトリブラウザで表示