• R/O
  • SSH
  • HTTPS

tomoyo: コミット


コミットメタ情報

リビジョン6477 (tree)
日時2016-04-16 20:55:30
作者kumaneko

ログメッセージ

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

変更サマリ

差分

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.1.diff (revision 6476)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.1.diff (revision 6477)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.1.20.
1+This is TOMOYO Linux patch for kernel 4.1.21.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.20.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.21.tar.xz
44 ---
55 fs/exec.c | 2
66 fs/open.c | 2
@@ -29,8 +29,8 @@
2929 security/security.c | 110 ++++++++++++++++++++++++++++++++++++++++------
3030 25 files changed, 248 insertions(+), 37 deletions(-)
3131
32---- linux-4.1.20.orig/fs/exec.c
33-+++ linux-4.1.20/fs/exec.c
32+--- linux-4.1.21.orig/fs/exec.c
33++++ linux-4.1.21/fs/exec.c
3434 @@ -1461,7 +1461,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-4.1.20.orig/fs/open.c
44-+++ linux-4.1.20/fs/open.c
43+--- linux-4.1.21.orig/fs/open.c
44++++ linux-4.1.21/fs/open.c
4545 @@ -1109,6 +1109,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-4.1.20.orig/fs/proc/version.c
55-+++ linux-4.1.20/fs/proc/version.c
54+--- linux-4.1.21.orig/fs/proc/version.c
55++++ linux-4.1.21/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: 4.1.20 2016/03/24\n");
63++ printk(KERN_INFO "Hook version: 4.1.21 2016/04/16\n");
6464 + return 0;
6565 +}
6666 +fs_initcall(ccs_show_version);
67---- linux-4.1.20.orig/include/linux/init_task.h
68-+++ linux-4.1.20/include/linux/init_task.h
67+--- linux-4.1.21.orig/include/linux/init_task.h
68++++ linux-4.1.21/include/linux/init_task.h
6969 @@ -182,6 +182,14 @@ extern struct task_group root_task_group
7070 # define INIT_KASAN(tsk)
7171 #endif
@@ -89,8 +89,8 @@
8989 }
9090
9191
92---- linux-4.1.20.orig/include/linux/sched.h
93-+++ linux-4.1.20/include/linux/sched.h
92+--- linux-4.1.21.orig/include/linux/sched.h
93++++ linux-4.1.21/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-4.1.20.orig/include/linux/security.h
115-+++ linux-4.1.20/include/linux/security.h
114+--- linux-4.1.21.orig/include/linux/security.h
115++++ linux-4.1.21/include/linux/security.h
116116 @@ -53,6 +53,7 @@ struct msg_queue;
117117 struct xattr;
118118 struct xfrm_sec_ctx;
@@ -319,8 +319,8 @@
319319 }
320320 #endif /* CONFIG_SECURITY_PATH */
321321
322---- linux-4.1.20.orig/include/net/ip.h
323-+++ linux-4.1.20/include/net/ip.h
322+--- linux-4.1.21.orig/include/net/ip.h
323++++ linux-4.1.21/include/net/ip.h
324324 @@ -217,6 +217,8 @@ void inet_get_local_port_range(struct ne
325325 #ifdef CONFIG_SYSCTL
326326 static inline int inet_is_local_reserved_port(struct net *net, int port)
@@ -339,8 +339,8 @@
339339 return 0;
340340 }
341341 #endif
342---- linux-4.1.20.orig/kernel/fork.c
343-+++ linux-4.1.20/kernel/fork.c
342+--- linux-4.1.21.orig/kernel/fork.c
343++++ linux-4.1.21/kernel/fork.c
344344 @@ -257,6 +257,7 @@ void __put_task_struct(struct task_struc
345345 delayacct_tsk_free(tsk);
346346 put_signal_struct(tsk->signal);
@@ -367,8 +367,8 @@
367367 bad_fork_cleanup_perf:
368368 perf_event_free_task(p);
369369 bad_fork_cleanup_policy:
370---- linux-4.1.20.orig/kernel/kexec.c
371-+++ linux-4.1.20/kernel/kexec.c
370+--- linux-4.1.21.orig/kernel/kexec.c
371++++ linux-4.1.21/kernel/kexec.c
372372 @@ -41,6 +41,7 @@
373373 #include <asm/uaccess.h>
374374 #include <asm/io.h>
@@ -386,8 +386,8 @@
386386
387387 /*
388388 * Verify we have a legal set of flags
389---- linux-4.1.20.orig/kernel/module.c
390-+++ linux-4.1.20/kernel/module.c
389+--- linux-4.1.21.orig/kernel/module.c
390++++ linux-4.1.21/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.1.20.orig/kernel/ptrace.c
418-+++ linux-4.1.20/kernel/ptrace.c
417+--- linux-4.1.21.orig/kernel/ptrace.c
418++++ linux-4.1.21/kernel/ptrace.c
419419 @@ -1034,6 +1034,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.1.20.orig/kernel/reboot.c
444-+++ linux-4.1.20/kernel/reboot.c
443+--- linux-4.1.21.orig/kernel/reboot.c
444++++ linux-4.1.21/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.1.20.orig/kernel/sched/core.c
463-+++ linux-4.1.20/kernel/sched/core.c
462+--- linux-4.1.21.orig/kernel/sched/core.c
463++++ linux-4.1.21/kernel/sched/core.c
464464 @@ -3152,6 +3152,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.1.20.orig/kernel/signal.c
474-+++ linux-4.1.20/kernel/signal.c
473+--- linux-4.1.21.orig/kernel/signal.c
474++++ linux-4.1.21/kernel/signal.c
475475 @@ -2901,6 +2901,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.1.20.orig/kernel/sys.c
521-+++ linux-4.1.20/kernel/sys.c
520+--- linux-4.1.21.orig/kernel/sys.c
521++++ linux-4.1.21/kernel/sys.c
522522 @@ -183,6 +183,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
523523
524524 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -548,8 +548,8 @@
548548
549549 down_write(&uts_sem);
550550 errno = -EFAULT;
551---- linux-4.1.20.orig/kernel/time/ntp.c
552-+++ linux-4.1.20/kernel/time/ntp.c
551+--- linux-4.1.21.orig/kernel/time/ntp.c
552++++ linux-4.1.21/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 /*
585585 * Check for potential multiplication overflows that can
586---- linux-4.1.20.orig/net/ipv4/raw.c
587-+++ linux-4.1.20/net/ipv4/raw.c
586+--- linux-4.1.21.orig/net/ipv4/raw.c
587++++ linux-4.1.21/net/ipv4/raw.c
588588 @@ -729,6 +729,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.1.20.orig/net/ipv4/udp.c
600-+++ linux-4.1.20/net/ipv4/udp.c
599+--- linux-4.1.21.orig/net/ipv4/udp.c
600++++ linux-4.1.21/net/ipv4/udp.c
601601 @@ -1274,6 +1274,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.1.20.orig/net/ipv6/raw.c
613-+++ linux-4.1.20/net/ipv6/raw.c
612+--- linux-4.1.21.orig/net/ipv6/raw.c
613++++ linux-4.1.21/net/ipv6/raw.c
614614 @@ -477,6 +477,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.1.20.orig/net/ipv6/udp.c
626-+++ linux-4.1.20/net/ipv6/udp.c
625+--- linux-4.1.21.orig/net/ipv6/udp.c
626++++ linux-4.1.21/net/ipv6/udp.c
627627 @@ -413,6 +413,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.1.20.orig/net/socket.c
639-+++ linux-4.1.20/net/socket.c
638+--- linux-4.1.21.orig/net/socket.c
639++++ linux-4.1.21/net/socket.c
640640 @@ -1485,6 +1485,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.1.20.orig/net/unix/af_unix.c
652-+++ linux-4.1.20/net/unix/af_unix.c
651+--- linux-4.1.21.orig/net/unix/af_unix.c
652++++ linux-4.1.21/net/unix/af_unix.c
653653 @@ -1964,6 +1964,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.1.20.orig/security/Kconfig
665-+++ linux-4.1.20/security/Kconfig
664+--- linux-4.1.21.orig/security/Kconfig
665++++ linux-4.1.21/security/Kconfig
666666 @@ -168,5 +168,7 @@ config DEFAULT_SECURITY
667667 default "yama" if DEFAULT_SECURITY_YAMA
668668 default "" if DEFAULT_SECURITY_DAC
@@ -671,8 +671,8 @@
671671 +
672672 endmenu
673673
674---- linux-4.1.20.orig/security/Makefile
675-+++ linux-4.1.20/security/Makefile
674+--- linux-4.1.21.orig/security/Makefile
675++++ linux-4.1.21/security/Makefile
676676 @@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
677677 # Object integrity file lists
678678 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -680,8 +680,8 @@
680680 +
681681 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
682682 +obj-$(CONFIG_CCSECURITY) += ccsecurity/
683---- linux-4.1.20.orig/security/security.c
684-+++ linux-4.1.20/security/security.c
683+--- linux-4.1.21.orig/security/security.c
684++++ linux-4.1.21/security/security.c
685685 @@ -226,7 +226,10 @@ int security_syslog(int type)
686686
687687 int security_settime(const struct timespec *ts, const struct timezone *tz)
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.5.diff (revision 6476)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.5.diff (revision 6477)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.5.
1+This is TOMOYO Linux patch for kernel 4.5.1.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.5.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.5.1.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, 151 insertions(+), 26 deletions(-)
3030
31---- linux-4.5.orig/fs/exec.c
32-+++ linux-4.5/fs/exec.c
31+--- linux-4.5.1.orig/fs/exec.c
32++++ linux-4.5.1/fs/exec.c
3333 @@ -1467,7 +1467,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,9 +39,9 @@
3939 if (ret >= 0) {
4040 audit_bprm(bprm);
4141 trace_sched_process_exec(current, old_pid, bprm);
42---- linux-4.5.orig/fs/open.c
43-+++ linux-4.5/fs/open.c
44-@@ -1114,6 +1114,8 @@ EXPORT_SYMBOL(sys_close);
42+--- linux-4.5.1.orig/fs/open.c
43++++ linux-4.5.1/fs/open.c
44+@@ -1112,6 +1112,8 @@ EXPORT_SYMBOL(sys_close);
4545 */
4646 SYSCALL_DEFINE0(vhangup)
4747 {
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-4.5.orig/fs/proc/version.c
54-+++ linux-4.5/fs/proc/version.c
53+--- linux-4.5.1.orig/fs/proc/version.c
54++++ linux-4.5.1/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.5 2016/03/14\n");
62++ printk(KERN_INFO "Hook version: 4.5.1 2016/04/16\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.5.orig/include/linux/init_task.h
67-+++ linux-4.5/include/linux/init_task.h
66+--- linux-4.5.1.orig/include/linux/init_task.h
67++++ linux-4.5.1/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.5.orig/include/linux/sched.h
92-+++ linux-4.5/include/linux/sched.h
91+--- linux-4.5.1.orig/include/linux/sched.h
92++++ linux-4.5.1/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.5.orig/include/linux/security.h
114-+++ linux-4.5/include/linux/security.h
113+--- linux-4.5.1.orig/include/linux/security.h
114++++ linux-4.5.1/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.5.orig/include/net/ip.h
322-+++ linux-4.5/include/net/ip.h
321+--- linux-4.5.1.orig/include/net/ip.h
322++++ linux-4.5.1/include/net/ip.h
323323 @@ -223,6 +223,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.5.orig/kernel/fork.c
342-+++ linux-4.5/kernel/fork.c
341+--- linux-4.5.1.orig/kernel/fork.c
342++++ linux-4.5.1/kernel/fork.c
343343 @@ -258,6 +258,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.5.orig/kernel/kexec.c
370-+++ linux-4.5/kernel/kexec.c
369+--- linux-4.5.1.orig/kernel/kexec.c
370++++ linux-4.5.1/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.5.orig/kernel/module.c
390-+++ linux-4.5/kernel/module.c
389+--- linux-4.5.1.orig/kernel/module.c
390++++ linux-4.5.1/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.5.orig/kernel/ptrace.c
418-+++ linux-4.5/kernel/ptrace.c
417+--- linux-4.5.1.orig/kernel/ptrace.c
418++++ linux-4.5.1/kernel/ptrace.c
419419 @@ -1081,6 +1081,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.5.orig/kernel/reboot.c
444-+++ linux-4.5/kernel/reboot.c
443+--- linux-4.5.1.orig/kernel/reboot.c
444++++ linux-4.5.1/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.5.orig/kernel/sched/core.c
463-+++ linux-4.5/kernel/sched/core.c
462+--- linux-4.5.1.orig/kernel/sched/core.c
463++++ linux-4.5.1/kernel/sched/core.c
464464 @@ -3625,6 +3625,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.5.orig/kernel/signal.c
474-+++ linux-4.5/kernel/signal.c
473+--- linux-4.5.1.orig/kernel/signal.c
474++++ linux-4.5.1/kernel/signal.c
475475 @@ -2847,6 +2847,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.5.orig/kernel/sys.c
521-+++ linux-4.5/kernel/sys.c
520+--- linux-4.5.1.orig/kernel/sys.c
521++++ linux-4.5.1/kernel/sys.c
522522 @@ -183,6 +183,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
523523
524524 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -548,8 +548,8 @@
548548
549549 down_write(&uts_sem);
550550 errno = -EFAULT;
551---- linux-4.5.orig/kernel/time/ntp.c
552-+++ linux-4.5/kernel/time/ntp.c
551+--- linux-4.5.1.orig/kernel/time/ntp.c
552++++ linux-4.5.1/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.5.orig/net/ipv4/raw.c
587-+++ linux-4.5/net/ipv4/raw.c
586+--- linux-4.5.1.orig/net/ipv4/raw.c
587++++ linux-4.5.1/net/ipv4/raw.c
588588 @@ -739,6 +739,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.5.orig/net/ipv4/udp.c
600-+++ linux-4.5/net/ipv4/udp.c
599+--- linux-4.5.1.orig/net/ipv4/udp.c
600++++ linux-4.5.1/net/ipv4/udp.c
601601 @@ -1368,6 +1368,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.5.orig/net/ipv6/raw.c
613-+++ linux-4.5/net/ipv6/raw.c
612+--- linux-4.5.1.orig/net/ipv6/raw.c
613++++ linux-4.5.1/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.5.orig/net/ipv6/udp.c
626-+++ linux-4.5/net/ipv6/udp.c
625+--- linux-4.5.1.orig/net/ipv6/udp.c
626++++ linux-4.5.1/net/ipv6/udp.c
627627 @@ -461,6 +461,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.5.orig/net/socket.c
639-+++ linux-4.5/net/socket.c
638+--- linux-4.5.1.orig/net/socket.c
639++++ linux-4.5.1/net/socket.c
640640 @@ -1476,6 +1476,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.5.orig/net/unix/af_unix.c
652-+++ linux-4.5/net/unix/af_unix.c
651+--- linux-4.5.1.orig/net/unix/af_unix.c
652++++ linux-4.5.1/net/unix/af_unix.c
653653 @@ -2155,6 +2155,10 @@ static int unix_dgram_recvmsg(struct soc
654654 POLLOUT | POLLWRNORM |
655655 POLLWRBAND);
@@ -669,8 +669,8 @@
669669 mutex_unlock(&u->readlock);
670670 out:
671671 return err;
672---- linux-4.5.orig/security/Kconfig
673-+++ linux-4.5/security/Kconfig
672+--- linux-4.5.1.orig/security/Kconfig
673++++ linux-4.5.1/security/Kconfig
674674 @@ -163,5 +163,7 @@ config DEFAULT_SECURITY
675675 default "apparmor" if DEFAULT_SECURITY_APPARMOR
676676 default "" if DEFAULT_SECURITY_DAC
@@ -679,8 +679,8 @@
679679 +
680680 endmenu
681681
682---- linux-4.5.orig/security/Makefile
683-+++ linux-4.5/security/Makefile
682+--- linux-4.5.1.orig/security/Makefile
683++++ linux-4.5.1/security/Makefile
684684 @@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
685685 # Object integrity file lists
686686 subdir-$(CONFIG_INTEGRITY) += integrity
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-3.14.diff (revision 6476)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-3.14.diff (revision 6477)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 3.14.65.
1+This is TOMOYO Linux patch for kernel 3.14.66.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.14.65.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.14.66.tar.xz
44 ---
55 fs/exec.c | 2
66 fs/open.c | 2
@@ -29,8 +29,8 @@
2929 security/security.c | 107 ++++++++++++++++++++++++++++++++++++++++------
3030 25 files changed, 236 insertions(+), 37 deletions(-)
3131
32---- linux-3.14.65.orig/fs/exec.c
33-+++ linux-3.14.65/fs/exec.c
32+--- linux-3.14.66.orig/fs/exec.c
33++++ linux-3.14.66/fs/exec.c
3434 @@ -1446,7 +1446,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,9 +40,9 @@
4040 if (ret >= 0) {
4141 audit_bprm(bprm);
4242 trace_sched_process_exec(current, old_pid, bprm);
43---- linux-3.14.65.orig/fs/open.c
44-+++ linux-3.14.65/fs/open.c
45-@@ -1070,6 +1070,8 @@ EXPORT_SYMBOL(sys_close);
43+--- linux-3.14.66.orig/fs/open.c
44++++ linux-3.14.66/fs/open.c
45+@@ -1068,6 +1068,8 @@ EXPORT_SYMBOL(sys_close);
4646 */
4747 SYSCALL_DEFINE0(vhangup)
4848 {
@@ -51,8 +51,8 @@
5151 if (capable(CAP_SYS_TTY_CONFIG)) {
5252 tty_vhangup_self();
5353 return 0;
54---- linux-3.14.65.orig/fs/proc/version.c
55-+++ linux-3.14.65/fs/proc/version.c
54+--- linux-3.14.66.orig/fs/proc/version.c
55++++ linux-3.14.66/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.14.65 2016/03/24\n");
63++ printk(KERN_INFO "Hook version: 3.14.66 2016/04/16\n");
6464 + return 0;
6565 +}
6666 +fs_initcall(ccs_show_version);
67---- linux-3.14.65.orig/include/linux/init_task.h
68-+++ linux-3.14.65/include/linux/init_task.h
67+--- linux-3.14.66.orig/include/linux/init_task.h
68++++ linux-3.14.66/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.14.65.orig/include/linux/sched.h
93-+++ linux-3.14.65/include/linux/sched.h
92+--- linux-3.14.66.orig/include/linux/sched.h
93++++ linux-3.14.66/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.14.65.orig/include/linux/security.h
115-+++ linux-3.14.65/include/linux/security.h
114+--- linux-3.14.66.orig/include/linux/security.h
115++++ linux-3.14.66/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.14.65.orig/include/net/ip.h
318-+++ linux-3.14.65/include/net/ip.h
317+--- linux-3.14.66.orig/include/net/ip.h
318++++ linux-3.14.66/include/net/ip.h
319319 @@ -219,6 +219,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.14.65.orig/kernel/fork.c
329-+++ linux-3.14.65/kernel/fork.c
328+--- linux-3.14.66.orig/kernel/fork.c
329++++ linux-3.14.66/kernel/fork.c
330330 @@ -244,6 +244,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.14.65.orig/kernel/kexec.c
357-+++ linux-3.14.65/kernel/kexec.c
356+--- linux-3.14.66.orig/kernel/kexec.c
357++++ linux-3.14.66/kernel/kexec.c
358358 @@ -37,6 +37,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.14.65.orig/kernel/module.c
376-+++ linux-3.14.65/kernel/module.c
375+--- linux-3.14.66.orig/kernel/module.c
376++++ linux-3.14.66/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.14.65.orig/kernel/ptrace.c
404-+++ linux-3.14.65/kernel/ptrace.c
403+--- linux-3.14.66.orig/kernel/ptrace.c
404++++ linux-3.14.66/kernel/ptrace.c
405405 @@ -1081,6 +1081,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.14.65.orig/kernel/reboot.c
430-+++ linux-3.14.65/kernel/reboot.c
429+--- linux-3.14.66.orig/kernel/reboot.c
430++++ linux-3.14.66/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.14.65.orig/kernel/sched/core.c
449-+++ linux-3.14.65/kernel/sched/core.c
448+--- linux-3.14.66.orig/kernel/sched/core.c
449++++ linux-3.14.66/kernel/sched/core.c
450450 @@ -3097,6 +3097,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.14.65.orig/kernel/signal.c
460-+++ linux-3.14.65/kernel/signal.c
459+--- linux-3.14.66.orig/kernel/signal.c
460++++ linux-3.14.66/kernel/signal.c
461461 @@ -2910,6 +2910,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
462462 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
463463 {
@@ -503,8 +503,8 @@
503503
504504 return do_send_specific(tgid, pid, sig, info);
505505 }
506---- linux-3.14.65.orig/kernel/sys.c
507-+++ linux-3.14.65/kernel/sys.c
506+--- linux-3.14.66.orig/kernel/sys.c
507++++ linux-3.14.66/kernel/sys.c
508508 @@ -171,6 +171,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
509509
510510 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -534,8 +534,8 @@
534534
535535 down_write(&uts_sem);
536536 errno = -EFAULT;
537---- linux-3.14.65.orig/kernel/time/ntp.c
538-+++ linux-3.14.65/kernel/time/ntp.c
537+--- linux-3.14.66.orig/kernel/time/ntp.c
538++++ linux-3.14.66/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.14.65.orig/net/ipv4/raw.c
573-+++ linux-3.14.65/net/ipv4/raw.c
572+--- linux-3.14.66.orig/net/ipv4/raw.c
573++++ linux-3.14.66/net/ipv4/raw.c
574574 @@ -704,6 +704,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.14.65.orig/net/ipv4/udp.c
586-+++ linux-3.14.65/net/ipv4/udp.c
585+--- linux-3.14.66.orig/net/ipv4/udp.c
586++++ linux-3.14.66/net/ipv4/udp.c
587587 @@ -1243,6 +1243,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.14.65.orig/net/ipv6/raw.c
599-+++ linux-3.14.65/net/ipv6/raw.c
598+--- linux-3.14.66.orig/net/ipv6/raw.c
599++++ linux-3.14.66/net/ipv6/raw.c
600600 @@ -478,6 +478,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.14.65.orig/net/ipv6/udp.c
612-+++ linux-3.14.65/net/ipv6/udp.c
611+--- linux-3.14.66.orig/net/ipv6/udp.c
612++++ linux-3.14.66/net/ipv6/udp.c
613613 @@ -403,6 +403,10 @@ try_again:
614614 &peeked, &off, &err);
615615 if (!skb)
@@ -621,8 +621,8 @@
621621
622622 ulen = skb->len - sizeof(struct udphdr);
623623 copied = len;
624---- linux-3.14.65.orig/net/socket.c
625-+++ linux-3.14.65/net/socket.c
624+--- linux-3.14.66.orig/net/socket.c
625++++ linux-3.14.66/net/socket.c
626626 @@ -1630,6 +1630,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
627627 if (err < 0)
628628 goto out_fd;
@@ -634,8 +634,8 @@
634634 if (upeer_sockaddr) {
635635 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
636636 &len, 2) < 0) {
637---- linux-3.14.65.orig/net/unix/af_unix.c
638-+++ linux-3.14.65/net/unix/af_unix.c
637+--- linux-3.14.66.orig/net/unix/af_unix.c
638++++ linux-3.14.66/net/unix/af_unix.c
639639 @@ -1970,6 +1970,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.14.65.orig/security/Kconfig
651-+++ linux-3.14.65/security/Kconfig
650+--- linux-3.14.66.orig/security/Kconfig
651++++ linux-3.14.66/security/Kconfig
652652 @@ -167,5 +167,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.14.65.orig/security/Makefile
661-+++ linux-3.14.65/security/Makefile
660+--- linux-3.14.66.orig/security/Makefile
661++++ linux-3.14.66/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.14.65.orig/security/security.c
670-+++ linux-3.14.65/security/security.c
669+--- linux-3.14.66.orig/security/security.c
670++++ linux-3.14.66/security/security.c
671671 @@ -203,7 +203,10 @@ int security_syslog(int type)
672672
673673 int security_settime(const struct timespec *ts, const struct timezone *tz)
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-3.18.diff (revision 6476)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-3.18.diff (revision 6477)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 3.18.29.
1+This is TOMOYO Linux patch for kernel 3.18.30.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.29.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.30.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.18.29.orig/fs/exec.c
33-+++ linux-3.18.29/fs/exec.c
32+--- linux-3.18.30.orig/fs/exec.c
33++++ linux-3.18.30/fs/exec.c
3434 @@ -1436,7 +1436,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.18.29.orig/fs/open.c
44-+++ linux-3.18.29/fs/open.c
43+--- linux-3.18.30.orig/fs/open.c
44++++ linux-3.18.30/fs/open.c
4545 @@ -1093,6 +1093,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.29.orig/fs/proc/version.c
55-+++ linux-3.18.29/fs/proc/version.c
54+--- linux-3.18.30.orig/fs/proc/version.c
55++++ linux-3.18.30/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.29 2016/03/24\n");
63++ printk(KERN_INFO "Hook version: 3.18.30 2016/04/16\n");
6464 + return 0;
6565 +}
6666 +fs_initcall(ccs_show_version);
67---- linux-3.18.29.orig/include/linux/init_task.h
68-+++ linux-3.18.29/include/linux/init_task.h
67+--- linux-3.18.30.orig/include/linux/init_task.h
68++++ linux-3.18.30/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.29.orig/include/linux/sched.h
93-+++ linux-3.18.29/include/linux/sched.h
92+--- linux-3.18.30.orig/include/linux/sched.h
93++++ linux-3.18.30/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.29.orig/include/linux/security.h
115-+++ linux-3.18.29/include/linux/security.h
114+--- linux-3.18.30.orig/include/linux/security.h
115++++ linux-3.18.30/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.29.orig/include/net/ip.h
328-+++ linux-3.18.29/include/net/ip.h
327+--- linux-3.18.30.orig/include/net/ip.h
328++++ linux-3.18.30/include/net/ip.h
329329 @@ -216,6 +216,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.29.orig/kernel/fork.c
348-+++ linux-3.18.29/kernel/fork.c
347+--- linux-3.18.30.orig/kernel/fork.c
348++++ linux-3.18.30/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.29.orig/kernel/kexec.c
376-+++ linux-3.18.29/kernel/kexec.c
375+--- linux-3.18.30.orig/kernel/kexec.c
376++++ linux-3.18.30/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.29.orig/kernel/module.c
395-+++ linux-3.18.29/kernel/module.c
394+--- linux-3.18.30.orig/kernel/module.c
395++++ linux-3.18.30/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.29.orig/kernel/ptrace.c
423-+++ linux-3.18.29/kernel/ptrace.c
422+--- linux-3.18.30.orig/kernel/ptrace.c
423++++ linux-3.18.30/kernel/ptrace.c
424424 @@ -1052,6 +1052,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.29.orig/kernel/reboot.c
449-+++ linux-3.18.29/kernel/reboot.c
448+--- linux-3.18.30.orig/kernel/reboot.c
449++++ linux-3.18.30/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.29.orig/kernel/sched/core.c
468-+++ linux-3.18.29/kernel/sched/core.c
467+--- linux-3.18.30.orig/kernel/sched/core.c
468++++ linux-3.18.30/kernel/sched/core.c
469469 @@ -3195,6 +3195,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.29.orig/kernel/signal.c
479-+++ linux-3.18.29/kernel/signal.c
478+--- linux-3.18.30.orig/kernel/signal.c
479++++ linux-3.18.30/kernel/signal.c
480480 @@ -2887,6 +2887,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.29.orig/kernel/sys.c
526-+++ linux-3.18.29/kernel/sys.c
525+--- linux-3.18.30.orig/kernel/sys.c
526++++ linux-3.18.30/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 down_write(&uts_sem);
555555 errno = -EFAULT;
556---- linux-3.18.29.orig/kernel/time/ntp.c
557-+++ linux-3.18.29/kernel/time/ntp.c
556+--- linux-3.18.30.orig/kernel/time/ntp.c
557++++ linux-3.18.30/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.29.orig/net/ipv4/raw.c
592-+++ linux-3.18.29/net/ipv4/raw.c
591+--- linux-3.18.30.orig/net/ipv4/raw.c
592++++ linux-3.18.30/net/ipv4/raw.c
593593 @@ -711,6 +711,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.29.orig/net/ipv4/udp.c
605-+++ linux-3.18.29/net/ipv4/udp.c
604+--- linux-3.18.30.orig/net/ipv4/udp.c
605++++ linux-3.18.30/net/ipv4/udp.c
606606 @@ -1262,6 +1262,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.29.orig/net/ipv6/raw.c
618-+++ linux-3.18.29/net/ipv6/raw.c
617+--- linux-3.18.30.orig/net/ipv6/raw.c
618++++ linux-3.18.30/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.29.orig/net/ipv6/udp.c
631-+++ linux-3.18.29/net/ipv6/udp.c
630+--- linux-3.18.30.orig/net/ipv6/udp.c
631++++ linux-3.18.30/net/ipv6/udp.c
632632 @@ -402,6 +402,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.29.orig/net/socket.c
644-+++ linux-3.18.29/net/socket.c
643+--- linux-3.18.30.orig/net/socket.c
644++++ linux-3.18.30/net/socket.c
645645 @@ -1637,6 +1637,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
646646 if (err < 0)
647647 goto out_fd;
@@ -653,8 +653,8 @@
653653 if (upeer_sockaddr) {
654654 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
655655 &len, 2) < 0) {
656---- linux-3.18.29.orig/net/unix/af_unix.c
657-+++ linux-3.18.29/net/unix/af_unix.c
656+--- linux-3.18.30.orig/net/unix/af_unix.c
657++++ linux-3.18.30/net/unix/af_unix.c
658658 @@ -1976,6 +1976,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.18.29.orig/security/Kconfig
670-+++ linux-3.18.29/security/Kconfig
669+--- linux-3.18.30.orig/security/Kconfig
670++++ linux-3.18.30/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.29.orig/security/Makefile
680-+++ linux-3.18.29/security/Makefile
679+--- linux-3.18.30.orig/security/Makefile
680++++ linux-3.18.30/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.29.orig/security/security.c
689-+++ linux-3.18.29/security/security.c
688+--- linux-3.18.30.orig/security/security.c
689++++ linux-3.18.30/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/1.8.x/ccs-patch/patches/ccs-patch-4.6.diff (revision 6476)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.6.diff (revision 6477)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.6-rc2.
1+This is TOMOYO Linux patch for kernel 4.6-rc3.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/testing/linux-4.6-rc2.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/testing/linux-4.6-rc3.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, 151 insertions(+), 26 deletions(-)
3030
31---- linux-4.6-rc2.orig/fs/exec.c
32-+++ linux-4.6-rc2/fs/exec.c
31+--- linux-4.6-rc3.orig/fs/exec.c
32++++ linux-4.6-rc3/fs/exec.c
3333 @@ -1563,7 +1563,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.6-rc2.orig/fs/open.c
43-+++ linux-4.6-rc2/fs/open.c
42+--- linux-4.6-rc3.orig/fs/open.c
43++++ linux-4.6-rc3/fs/open.c
4444 @@ -1112,6 +1112,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.6-rc2.orig/fs/proc/version.c
54-+++ linux-4.6-rc2/fs/proc/version.c
53+--- linux-4.6-rc3.orig/fs/proc/version.c
54++++ linux-4.6-rc3/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.6-rc2 2016/04/04\n");
62++ printk(KERN_INFO "Hook version: 4.6-rc3 2016/04/16\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.6-rc2.orig/include/linux/init_task.h
67-+++ linux-4.6-rc2/include/linux/init_task.h
66+--- linux-4.6-rc3.orig/include/linux/init_task.h
67++++ linux-4.6-rc3/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.6-rc2.orig/include/linux/sched.h
92-+++ linux-4.6-rc2/include/linux/sched.h
91+--- linux-4.6-rc3.orig/include/linux/sched.h
92++++ linux-4.6-rc3/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.6-rc2.orig/include/linux/security.h
114-+++ linux-4.6-rc2/include/linux/security.h
113+--- linux-4.6-rc3.orig/include/linux/security.h
114++++ linux-4.6-rc3/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.6-rc2.orig/include/net/ip.h
322-+++ linux-4.6-rc2/include/net/ip.h
321+--- linux-4.6-rc3.orig/include/net/ip.h
322++++ linux-4.6-rc3/include/net/ip.h
323323 @@ -223,6 +223,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.6-rc2.orig/kernel/fork.c
342-+++ linux-4.6-rc2/kernel/fork.c
341+--- linux-4.6-rc3.orig/kernel/fork.c
342++++ linux-4.6-rc3/kernel/fork.c
343343 @@ -267,6 +267,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.6-rc2.orig/kernel/kexec.c
370-+++ linux-4.6-rc2/kernel/kexec.c
369+--- linux-4.6-rc3.orig/kernel/kexec.c
370++++ linux-4.6-rc3/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.6-rc2.orig/kernel/module.c
390-+++ linux-4.6-rc2/kernel/module.c
389+--- linux-4.6-rc3.orig/kernel/module.c
390++++ linux-4.6-rc3/kernel/module.c
391391 @@ -62,6 +62,7 @@
392392 #include <linux/bsearch.h>
393393 #include <uapi/linux/module.h>
@@ -414,8 +414,8 @@
414414
415415 return 0;
416416 }
417---- linux-4.6-rc2.orig/kernel/ptrace.c
418-+++ linux-4.6-rc2/kernel/ptrace.c
417+--- linux-4.6-rc3.orig/kernel/ptrace.c
418++++ linux-4.6-rc3/kernel/ptrace.c
419419 @@ -1080,6 +1080,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.6-rc2.orig/kernel/reboot.c
444-+++ linux-4.6-rc2/kernel/reboot.c
443+--- linux-4.6-rc3.orig/kernel/reboot.c
444++++ linux-4.6-rc3/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.6-rc2.orig/kernel/sched/core.c
463-+++ linux-4.6-rc2/kernel/sched/core.c
462+--- linux-4.6-rc3.orig/kernel/sched/core.c
463++++ linux-4.6-rc3/kernel/sched/core.c
464464 @@ -3564,6 +3564,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.6-rc2.orig/kernel/signal.c
474-+++ linux-4.6-rc2/kernel/signal.c
473+--- linux-4.6-rc3.orig/kernel/signal.c
474++++ linux-4.6-rc3/kernel/signal.c
475475 @@ -2851,6 +2851,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.6-rc2.orig/kernel/sys.c
521-+++ linux-4.6-rc2/kernel/sys.c
520+--- linux-4.6-rc3.orig/kernel/sys.c
521++++ linux-4.6-rc3/kernel/sys.c
522522 @@ -183,6 +183,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
523523
524524 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -548,8 +548,8 @@
548548
549549 down_write(&uts_sem);
550550 errno = -EFAULT;
551---- linux-4.6-rc2.orig/kernel/time/ntp.c
552-+++ linux-4.6-rc2/kernel/time/ntp.c
551+--- linux-4.6-rc3.orig/kernel/time/ntp.c
552++++ linux-4.6-rc3/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.6-rc2.orig/net/ipv4/raw.c
587-+++ linux-4.6-rc2/net/ipv4/raw.c
586+--- linux-4.6-rc3.orig/net/ipv4/raw.c
587++++ linux-4.6-rc3/net/ipv4/raw.c
588588 @@ -741,6 +741,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.6-rc2.orig/net/ipv4/udp.c
600-+++ linux-4.6-rc2/net/ipv4/udp.c
599+--- linux-4.6-rc3.orig/net/ipv4/udp.c
600++++ linux-4.6-rc3/net/ipv4/udp.c
601601 @@ -1356,6 +1356,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.6-rc2.orig/net/ipv6/raw.c
613-+++ linux-4.6-rc2/net/ipv6/raw.c
612+--- linux-4.6-rc3.orig/net/ipv6/raw.c
613++++ linux-4.6-rc3/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.6-rc2.orig/net/ipv6/udp.c
626-+++ linux-4.6-rc2/net/ipv6/udp.c
625+--- linux-4.6-rc3.orig/net/ipv6/udp.c
626++++ linux-4.6-rc3/net/ipv6/udp.c
627627 @@ -419,6 +419,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.6-rc2.orig/net/socket.c
639-+++ linux-4.6-rc2/net/socket.c
638+--- linux-4.6-rc3.orig/net/socket.c
639++++ linux-4.6-rc3/net/socket.c
640640 @@ -1473,6 +1473,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.6-rc2.orig/net/unix/af_unix.c
652-+++ linux-4.6-rc2/net/unix/af_unix.c
651+--- linux-4.6-rc3.orig/net/unix/af_unix.c
652++++ linux-4.6-rc3/net/unix/af_unix.c
653653 @@ -2152,6 +2152,10 @@ static int unix_dgram_recvmsg(struct soc
654654 POLLOUT | POLLWRNORM |
655655 POLLWRBAND);
@@ -669,8 +669,8 @@
669669 mutex_unlock(&u->readlock);
670670 out:
671671 return err;
672---- linux-4.6-rc2.orig/security/Kconfig
673-+++ linux-4.6-rc2/security/Kconfig
672+--- linux-4.6-rc3.orig/security/Kconfig
673++++ linux-4.6-rc3/security/Kconfig
674674 @@ -163,5 +163,7 @@ config DEFAULT_SECURITY
675675 default "apparmor" if DEFAULT_SECURITY_APPARMOR
676676 default "" if DEFAULT_SECURITY_DAC
@@ -679,8 +679,8 @@
679679 +
680680 endmenu
681681
682---- linux-4.6-rc2.orig/security/Makefile
683-+++ linux-4.6-rc2/security/Makefile
682+--- linux-4.6-rc3.orig/security/Makefile
683++++ linux-4.6-rc3/security/Makefile
684684 @@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
685685 # Object integrity file lists
686686 subdir-$(CONFIG_INTEGRITY) += integrity
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-3.12.diff (revision 6476)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-3.12.diff (revision 6477)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 3.12.57.
1+This is TOMOYO Linux patch for kernel 3.12.58.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.12.57.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.12.58.tar.xz
44 ---
55 fs/exec.c | 2
66 fs/open.c | 2
@@ -29,8 +29,8 @@
2929 security/security.c | 107 ++++++++++++++++++++++++++++++++++++++++------
3030 25 files changed, 236 insertions(+), 37 deletions(-)
3131
32---- linux-3.12.57.orig/fs/exec.c
33-+++ linux-3.12.57/fs/exec.c
32+--- linux-3.12.58.orig/fs/exec.c
33++++ linux-3.12.58/fs/exec.c
3434 @@ -1457,7 +1457,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,9 +40,9 @@
4040 if (ret >= 0) {
4141 trace_sched_process_exec(current, old_pid, bprm);
4242 ptrace_event(PTRACE_EVENT_EXEC, old_vpid);
43---- linux-3.12.57.orig/fs/open.c
44-+++ linux-3.12.57/fs/open.c
45-@@ -1048,6 +1048,8 @@ EXPORT_SYMBOL(sys_close);
43+--- linux-3.12.58.orig/fs/open.c
44++++ linux-3.12.58/fs/open.c
45+@@ -1046,6 +1046,8 @@ EXPORT_SYMBOL(sys_close);
4646 */
4747 SYSCALL_DEFINE0(vhangup)
4848 {
@@ -51,8 +51,8 @@
5151 if (capable(CAP_SYS_TTY_CONFIG)) {
5252 tty_vhangup_self();
5353 return 0;
54---- linux-3.12.57.orig/fs/proc/version.c
55-+++ linux-3.12.57/fs/proc/version.c
54+--- linux-3.12.58.orig/fs/proc/version.c
55++++ linux-3.12.58/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.12.57 2016/03/24\n");
63++ printk(KERN_INFO "Hook version: 3.12.58 2016/04/16\n");
6464 + return 0;
6565 +}
6666 +module_init(ccs_show_version);
67---- linux-3.12.57.orig/include/linux/init_task.h
68-+++ linux-3.12.57/include/linux/init_task.h
67+--- linux-3.12.58.orig/include/linux/init_task.h
68++++ linux-3.12.58/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.12.57.orig/include/linux/sched.h
93-+++ linux-3.12.57/include/linux/sched.h
92+--- linux-3.12.58.orig/include/linux/sched.h
93++++ linux-3.12.58/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.12.57.orig/include/linux/security.h
115-+++ linux-3.12.57/include/linux/security.h
114+--- linux-3.12.58.orig/include/linux/security.h
115++++ linux-3.12.58/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.12.57.orig/include/net/ip.h
318-+++ linux-3.12.57/include/net/ip.h
317+--- linux-3.12.58.orig/include/net/ip.h
318++++ linux-3.12.58/include/net/ip.h
319319 @@ -217,6 +217,8 @@ extern void inet_get_local_port_range(in
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.12.57.orig/kernel/fork.c
329-+++ linux-3.12.57/kernel/fork.c
328+--- linux-3.12.58.orig/kernel/fork.c
329++++ linux-3.12.58/kernel/fork.c
330330 @@ -244,6 +244,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.12.57.orig/kernel/kexec.c
357-+++ linux-3.12.57/kernel/kexec.c
356+--- linux-3.12.58.orig/kernel/kexec.c
357++++ linux-3.12.58/kernel/kexec.c
358358 @@ -37,6 +37,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.12.57.orig/kernel/module.c
376-+++ linux-3.12.57/kernel/module.c
375+--- linux-3.12.58.orig/kernel/module.c
376++++ linux-3.12.58/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.12.57.orig/kernel/ptrace.c
404-+++ linux-3.12.57/kernel/ptrace.c
403+--- linux-3.12.58.orig/kernel/ptrace.c
404++++ linux-3.12.58/kernel/ptrace.c
405405 @@ -1081,6 +1081,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.12.57.orig/kernel/reboot.c
430-+++ linux-3.12.57/kernel/reboot.c
429+--- linux-3.12.58.orig/kernel/reboot.c
430++++ linux-3.12.58/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.12.57.orig/kernel/sched/core.c
449-+++ linux-3.12.57/kernel/sched/core.c
448+--- linux-3.12.58.orig/kernel/sched/core.c
449++++ linux-3.12.58/kernel/sched/core.c
450450 @@ -3177,6 +3177,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.12.57.orig/kernel/signal.c
460-+++ linux-3.12.57/kernel/signal.c
459+--- linux-3.12.58.orig/kernel/signal.c
460++++ linux-3.12.58/kernel/signal.c
461461 @@ -2910,6 +2910,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
462462 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
463463 {
@@ -503,8 +503,8 @@
503503
504504 return do_send_specific(tgid, pid, sig, info);
505505 }
506---- linux-3.12.57.orig/kernel/sys.c
507-+++ linux-3.12.57/kernel/sys.c
506+--- linux-3.12.58.orig/kernel/sys.c
507++++ linux-3.12.58/kernel/sys.c
508508 @@ -172,6 +172,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
509509
510510 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -534,8 +534,8 @@
534534
535535 down_write(&uts_sem);
536536 errno = -EFAULT;
537---- linux-3.12.57.orig/kernel/time/ntp.c
538-+++ linux-3.12.57/kernel/time/ntp.c
537+--- linux-3.12.58.orig/kernel/time/ntp.c
538++++ linux-3.12.58/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.12.57.orig/net/ipv4/raw.c
573-+++ linux-3.12.57/net/ipv4/raw.c
572+--- linux-3.12.58.orig/net/ipv4/raw.c
573++++ linux-3.12.58/net/ipv4/raw.c
574574 @@ -704,6 +704,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.12.57.orig/net/ipv4/udp.c
586-+++ linux-3.12.57/net/ipv4/udp.c
585+--- linux-3.12.58.orig/net/ipv4/udp.c
586++++ linux-3.12.58/net/ipv4/udp.c
587587 @@ -1223,6 +1223,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.12.57.orig/net/ipv6/raw.c
599-+++ linux-3.12.57/net/ipv6/raw.c
598+--- linux-3.12.58.orig/net/ipv6/raw.c
599++++ linux-3.12.58/net/ipv6/raw.c
600600 @@ -475,6 +475,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.12.57.orig/net/ipv6/udp.c
612-+++ linux-3.12.57/net/ipv6/udp.c
611+--- linux-3.12.58.orig/net/ipv6/udp.c
612++++ linux-3.12.58/net/ipv6/udp.c
613613 @@ -386,6 +386,10 @@ try_again:
614614 &peeked, &off, &err);
615615 if (!skb)
@@ -621,8 +621,8 @@
621621
622622 ulen = skb->len - sizeof(struct udphdr);
623623 copied = len;
624---- linux-3.12.57.orig/net/socket.c
625-+++ linux-3.12.57/net/socket.c
624+--- linux-3.12.58.orig/net/socket.c
625++++ linux-3.12.58/net/socket.c
626626 @@ -1616,6 +1616,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
627627 if (err < 0)
628628 goto out_fd;
@@ -634,8 +634,8 @@
634634 if (upeer_sockaddr) {
635635 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
636636 &len, 2) < 0) {
637---- linux-3.12.57.orig/net/unix/af_unix.c
638-+++ linux-3.12.57/net/unix/af_unix.c
637+--- linux-3.12.58.orig/net/unix/af_unix.c
638++++ linux-3.12.58/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.12.57.orig/security/Kconfig
651-+++ linux-3.12.57/security/Kconfig
650+--- linux-3.12.58.orig/security/Kconfig
651++++ linux-3.12.58/security/Kconfig
652652 @@ -167,5 +167,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.12.57.orig/security/Makefile
661-+++ linux-3.12.57/security/Makefile
660+--- linux-3.12.58.orig/security/Makefile
661++++ linux-3.12.58/security/Makefile
662662 @@ -28,3 +28,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.12.57.orig/security/security.c
670-+++ linux-3.12.57/security/security.c
669+--- linux-3.12.58.orig/security/security.c
670++++ linux-3.12.58/security/security.c
671671 @@ -203,7 +203,10 @@ int security_syslog(int type)
672672
673673 int security_settime(const struct timespec *ts, const struct timezone *tz)
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.4.diff (revision 6476)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.4.diff (revision 6477)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.4.6.
1+This is TOMOYO Linux patch for kernel 4.4.7.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.6.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.7.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, 150 insertions(+), 26 deletions(-)
3030
31---- linux-4.4.6.orig/fs/exec.c
32-+++ linux-4.4.6/fs/exec.c
31+--- linux-4.4.7.orig/fs/exec.c
32++++ linux-4.4.7/fs/exec.c
3333 @@ -1467,7 +1467,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,9 +39,9 @@
3939 if (ret >= 0) {
4040 audit_bprm(bprm);
4141 trace_sched_process_exec(current, old_pid, bprm);
42---- linux-4.4.6.orig/fs/open.c
43-+++ linux-4.4.6/fs/open.c
44-@@ -1117,6 +1117,8 @@ EXPORT_SYMBOL(sys_close);
42+--- linux-4.4.7.orig/fs/open.c
43++++ linux-4.4.7/fs/open.c
44+@@ -1115,6 +1115,8 @@ EXPORT_SYMBOL(sys_close);
4545 */
4646 SYSCALL_DEFINE0(vhangup)
4747 {
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-4.4.6.orig/fs/proc/version.c
54-+++ linux-4.4.6/fs/proc/version.c
53+--- linux-4.4.7.orig/fs/proc/version.c
54++++ linux-4.4.7/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.6 2016/03/24\n");
62++ printk(KERN_INFO "Hook version: 4.4.7 2016/04/16\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.4.6.orig/include/linux/init_task.h
67-+++ linux-4.4.6/include/linux/init_task.h
66+--- linux-4.4.7.orig/include/linux/init_task.h
67++++ linux-4.4.7/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.6.orig/include/linux/sched.h
92-+++ linux-4.4.6/include/linux/sched.h
91+--- linux-4.4.7.orig/include/linux/sched.h
92++++ linux-4.4.7/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.6.orig/include/linux/security.h
114-+++ linux-4.4.6/include/linux/security.h
113+--- linux-4.4.7.orig/include/linux/security.h
114++++ linux-4.4.7/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.6.orig/include/net/ip.h
322-+++ linux-4.4.6/include/net/ip.h
321+--- linux-4.4.7.orig/include/net/ip.h
322++++ linux-4.4.7/include/net/ip.h
323323 @@ -223,6 +223,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.6.orig/kernel/fork.c
342-+++ linux-4.4.6/kernel/fork.c
341+--- linux-4.4.7.orig/kernel/fork.c
342++++ linux-4.4.7/kernel/fork.c
343343 @@ -258,6 +258,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.6.orig/kernel/kexec.c
370-+++ linux-4.4.6/kernel/kexec.c
369+--- linux-4.4.7.orig/kernel/kexec.c
370++++ linux-4.4.7/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.6.orig/kernel/module.c
390-+++ linux-4.4.6/kernel/module.c
389+--- linux-4.4.7.orig/kernel/module.c
390++++ linux-4.4.7/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.6.orig/kernel/ptrace.c
418-+++ linux-4.4.6/kernel/ptrace.c
417+--- linux-4.4.7.orig/kernel/ptrace.c
418++++ linux-4.4.7/kernel/ptrace.c
419419 @@ -1075,6 +1075,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.6.orig/kernel/reboot.c
444-+++ linux-4.4.6/kernel/reboot.c
443+--- linux-4.4.7.orig/kernel/reboot.c
444++++ linux-4.4.7/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.6.orig/kernel/sched/core.c
463-+++ linux-4.4.6/kernel/sched/core.c
462+--- linux-4.4.7.orig/kernel/sched/core.c
463++++ linux-4.4.7/kernel/sched/core.c
464464 @@ -3522,6 +3522,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.6.orig/kernel/signal.c
474-+++ linux-4.4.6/kernel/signal.c
473+--- linux-4.4.7.orig/kernel/signal.c
474++++ linux-4.4.7/kernel/signal.c
475475 @@ -2847,6 +2847,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.6.orig/kernel/sys.c
521-+++ linux-4.4.6/kernel/sys.c
520+--- linux-4.4.7.orig/kernel/sys.c
521++++ linux-4.4.7/kernel/sys.c
522522 @@ -183,6 +183,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
523523
524524 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -548,8 +548,8 @@
548548
549549 down_write(&uts_sem);
550550 errno = -EFAULT;
551---- linux-4.4.6.orig/kernel/time/ntp.c
552-+++ linux-4.4.6/kernel/time/ntp.c
551+--- linux-4.4.7.orig/kernel/time/ntp.c
552++++ linux-4.4.7/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 /*
585585 * Check for potential multiplication overflows that can
586---- linux-4.4.6.orig/net/ipv4/raw.c
587-+++ linux-4.4.6/net/ipv4/raw.c
586+--- linux-4.4.7.orig/net/ipv4/raw.c
587++++ linux-4.4.7/net/ipv4/raw.c
588588 @@ -739,6 +739,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.6.orig/net/ipv4/udp.c
600-+++ linux-4.4.6/net/ipv4/udp.c
599+--- linux-4.4.7.orig/net/ipv4/udp.c
600++++ linux-4.4.7/net/ipv4/udp.c
601601 @@ -1285,6 +1285,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.6.orig/net/ipv6/raw.c
613-+++ linux-4.4.6/net/ipv6/raw.c
612+--- linux-4.4.7.orig/net/ipv6/raw.c
613++++ linux-4.4.7/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.6.orig/net/ipv6/udp.c
626-+++ linux-4.4.6/net/ipv6/udp.c
625+--- linux-4.4.7.orig/net/ipv6/udp.c
626++++ linux-4.4.7/net/ipv6/udp.c
627627 @@ -416,6 +416,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.6.orig/net/socket.c
639-+++ linux-4.4.6/net/socket.c
638+--- linux-4.4.7.orig/net/socket.c
639++++ linux-4.4.7/net/socket.c
640640 @@ -1476,6 +1476,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.6.orig/net/unix/af_unix.c
652-+++ linux-4.4.6/net/unix/af_unix.c
651+--- linux-4.4.7.orig/net/unix/af_unix.c
652++++ linux-4.4.7/net/unix/af_unix.c
653653 @@ -2147,6 +2147,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.6.orig/security/Kconfig
665-+++ linux-4.4.6/security/Kconfig
664+--- linux-4.4.7.orig/security/Kconfig
665++++ linux-4.4.7/security/Kconfig
666666 @@ -163,5 +163,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.6.orig/security/Makefile
675-+++ linux-4.4.6/security/Makefile
674+--- linux-4.4.7.orig/security/Makefile
675++++ linux-4.4.7/security/Makefile
676676 @@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
677677 # Object integrity file lists
678678 subdir-$(CONFIG_INTEGRITY) += integrity
旧リポジトリブラウザで表示