• R/O
  • SSH
  • HTTPS

tomoyo: コミット


コミットメタ情報

リビジョン6630 (tree)
日時2018-03-05 23:39:36
作者kumaneko

ログメッセージ

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

変更サマリ

差分

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-3.16.diff (revision 6629)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-3.16.diff (revision 6630)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 3.16.54.
1+This is TOMOYO Linux patch for kernel 3.16.55.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.16.54.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.16.55.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.54.orig/fs/exec.c
33-+++ linux-3.16.54/fs/exec.c
32+--- linux-3.16.55.orig/fs/exec.c
33++++ linux-3.16.55/fs/exec.c
3434 @@ -1481,7 +1481,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.54.orig/fs/open.c
44-+++ linux-3.16.54/fs/open.c
43+--- linux-3.16.55.orig/fs/open.c
44++++ linux-3.16.55/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.54.orig/fs/proc/version.c
55-+++ linux-3.16.54/fs/proc/version.c
54+--- linux-3.16.55.orig/fs/proc/version.c
55++++ linux-3.16.55/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.54 2018/02/22\n");
63++ printk(KERN_INFO "Hook version: 3.16.55 2018/03/05\n");
6464 + return 0;
6565 +}
6666 +fs_initcall(ccs_show_version);
67---- linux-3.16.54.orig/include/linux/init_task.h
68-+++ linux-3.16.54/include/linux/init_task.h
67+--- linux-3.16.55.orig/include/linux/init_task.h
68++++ linux-3.16.55/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.54.orig/include/linux/sched.h
93-+++ linux-3.16.54/include/linux/sched.h
92+--- linux-3.16.55.orig/include/linux/sched.h
93++++ linux-3.16.55/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.54.orig/include/linux/security.h
115-+++ linux-3.16.54/include/linux/security.h
114+--- linux-3.16.55.orig/include/linux/security.h
115++++ linux-3.16.55/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.54.orig/include/net/ip.h
328-+++ linux-3.16.54/include/net/ip.h
327+--- linux-3.16.55.orig/include/net/ip.h
328++++ linux-3.16.55/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.54.orig/kernel/fork.c
348-+++ linux-3.16.54/kernel/fork.c
347+--- linux-3.16.55.orig/kernel/fork.c
348++++ linux-3.16.55/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.54.orig/kernel/kexec.c
376-+++ linux-3.16.54/kernel/kexec.c
375+--- linux-3.16.55.orig/kernel/kexec.c
376++++ linux-3.16.55/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.54.orig/kernel/module.c
395-+++ linux-3.16.54/kernel/module.c
394+--- linux-3.16.55.orig/kernel/module.c
395++++ linux-3.16.55/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.54.orig/kernel/ptrace.c
423-+++ linux-3.16.54/kernel/ptrace.c
422+--- linux-3.16.55.orig/kernel/ptrace.c
423++++ linux-3.16.55/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.54.orig/kernel/reboot.c
449-+++ linux-3.16.54/kernel/reboot.c
448+--- linux-3.16.55.orig/kernel/reboot.c
449++++ linux-3.16.55/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.54.orig/kernel/sched/core.c
468-+++ linux-3.16.54/kernel/sched/core.c
467+--- linux-3.16.55.orig/kernel/sched/core.c
468++++ linux-3.16.55/kernel/sched/core.c
469469 @@ -3149,6 +3149,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.54.orig/kernel/signal.c
479-+++ linux-3.16.54/kernel/signal.c
478+--- linux-3.16.55.orig/kernel/signal.c
479++++ linux-3.16.55/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.54.orig/kernel/sys.c
526-+++ linux-3.16.54/kernel/sys.c
525+--- linux-3.16.55.orig/kernel/sys.c
526++++ linux-3.16.55/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.16.54.orig/kernel/time/ntp.c
557-+++ linux-3.16.54/kernel/time/ntp.c
556+--- linux-3.16.55.orig/kernel/time/ntp.c
557++++ linux-3.16.55/kernel/time/ntp.c
558558 @@ -16,6 +16,7 @@
559559 #include <linux/mm.h>
560560 #include <linux/module.h>
@@ -588,9 +588,9 @@
588588
589589 /*
590590 * Check for potential multiplication overflows that can
591---- linux-3.16.54.orig/net/ipv4/raw.c
592-+++ linux-3.16.54/net/ipv4/raw.c
593-@@ -706,6 +706,10 @@ static int raw_recvmsg(struct kiocb *ioc
591+--- linux-3.16.55.orig/net/ipv4/raw.c
592++++ linux-3.16.55/net/ipv4/raw.c
593+@@ -731,6 +731,10 @@ static int raw_recvmsg(struct kiocb *ioc
594594 skb = skb_recv_datagram(sk, flags, noblock, &err);
595595 if (!skb)
596596 goto out;
@@ -601,8 +601,8 @@
601601
602602 copied = skb->len;
603603 if (len < copied) {
604---- linux-3.16.54.orig/net/ipv4/udp.c
605-+++ linux-3.16.54/net/ipv4/udp.c
604+--- linux-3.16.55.orig/net/ipv4/udp.c
605++++ linux-3.16.55/net/ipv4/udp.c
606606 @@ -1285,6 +1285,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.54.orig/net/ipv6/raw.c
618-+++ linux-3.16.54/net/ipv6/raw.c
617+--- linux-3.16.55.orig/net/ipv6/raw.c
618++++ linux-3.16.55/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.54.orig/net/ipv6/udp.c
631-+++ linux-3.16.54/net/ipv6/udp.c
630+--- linux-3.16.55.orig/net/ipv6/udp.c
631++++ linux-3.16.55/net/ipv6/udp.c
632632 @@ -404,6 +404,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.16.54.orig/net/socket.c
644-+++ linux-3.16.54/net/socket.c
643+--- linux-3.16.55.orig/net/socket.c
644++++ linux-3.16.55/net/socket.c
645645 @@ -1631,6 +1631,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.16.54.orig/net/unix/af_unix.c
657-+++ linux-3.16.54/net/unix/af_unix.c
656+--- linux-3.16.55.orig/net/unix/af_unix.c
657++++ linux-3.16.55/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.54.orig/security/Kconfig
670-+++ linux-3.16.54/security/Kconfig
669+--- linux-3.16.55.orig/security/Kconfig
670++++ linux-3.16.55/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.54.orig/security/Makefile
680-+++ linux-3.16.54/security/Makefile
679+--- linux-3.16.55.orig/security/Makefile
680++++ linux-3.16.55/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.54.orig/security/security.c
689-+++ linux-3.16.54/security/security.c
688+--- linux-3.16.55.orig/security/security.c
689++++ linux-3.16.55/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-3.18.diff (revision 6629)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-3.18.diff (revision 6630)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 3.18.97.
1+This is TOMOYO Linux patch for kernel 3.18.98.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.97.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.98.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.97.orig/fs/exec.c
33-+++ linux-3.18.97/fs/exec.c
32+--- linux-3.18.98.orig/fs/exec.c
33++++ linux-3.18.98/fs/exec.c
3434 @@ -1463,7 +1463,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.97.orig/fs/open.c
44-+++ linux-3.18.97/fs/open.c
43+--- linux-3.18.98.orig/fs/open.c
44++++ linux-3.18.98/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.97.orig/fs/proc/version.c
55-+++ linux-3.18.97/fs/proc/version.c
54+--- linux-3.18.98.orig/fs/proc/version.c
55++++ linux-3.18.98/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.97 2018/03/03\n");
63++ printk(KERN_INFO "Hook version: 3.18.98 2018/03/05\n");
6464 + return 0;
6565 +}
6666 +fs_initcall(ccs_show_version);
67---- linux-3.18.97.orig/include/linux/init_task.h
68-+++ linux-3.18.97/include/linux/init_task.h
67+--- linux-3.18.98.orig/include/linux/init_task.h
68++++ linux-3.18.98/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.97.orig/include/linux/sched.h
93-+++ linux-3.18.97/include/linux/sched.h
92+--- linux-3.18.98.orig/include/linux/sched.h
93++++ linux-3.18.98/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.97.orig/include/linux/security.h
115-+++ linux-3.18.97/include/linux/security.h
114+--- linux-3.18.98.orig/include/linux/security.h
115++++ linux-3.18.98/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.97.orig/include/net/ip.h
328-+++ linux-3.18.97/include/net/ip.h
327+--- linux-3.18.98.orig/include/net/ip.h
328++++ linux-3.18.98/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.97.orig/kernel/fork.c
348-+++ linux-3.18.97/kernel/fork.c
347+--- linux-3.18.98.orig/kernel/fork.c
348++++ linux-3.18.98/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.97.orig/kernel/kexec.c
376-+++ linux-3.18.97/kernel/kexec.c
375+--- linux-3.18.98.orig/kernel/kexec.c
376++++ linux-3.18.98/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.97.orig/kernel/module.c
395-+++ linux-3.18.97/kernel/module.c
394+--- linux-3.18.98.orig/kernel/module.c
395++++ linux-3.18.98/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.97.orig/kernel/ptrace.c
423-+++ linux-3.18.97/kernel/ptrace.c
422+--- linux-3.18.98.orig/kernel/ptrace.c
423++++ linux-3.18.98/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.97.orig/kernel/reboot.c
449-+++ linux-3.18.97/kernel/reboot.c
448+--- linux-3.18.98.orig/kernel/reboot.c
449++++ linux-3.18.98/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.97.orig/kernel/sched/core.c
468-+++ linux-3.18.97/kernel/sched/core.c
467+--- linux-3.18.98.orig/kernel/sched/core.c
468++++ linux-3.18.98/kernel/sched/core.c
469469 @@ -3217,6 +3217,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.97.orig/kernel/signal.c
479-+++ linux-3.18.97/kernel/signal.c
478+--- linux-3.18.98.orig/kernel/signal.c
479++++ linux-3.18.98/kernel/signal.c
480480 @@ -2897,6 +2897,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.97.orig/kernel/sys.c
526-+++ linux-3.18.97/kernel/sys.c
525+--- linux-3.18.98.orig/kernel/sys.c
526++++ linux-3.18.98/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.97.orig/kernel/time/ntp.c
557-+++ linux-3.18.97/kernel/time/ntp.c
556+--- linux-3.18.98.orig/kernel/time/ntp.c
557++++ linux-3.18.98/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.97.orig/net/ipv4/raw.c
592-+++ linux-3.18.97/net/ipv4/raw.c
591+--- linux-3.18.98.orig/net/ipv4/raw.c
592++++ linux-3.18.98/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.97.orig/net/ipv4/udp.c
605-+++ linux-3.18.97/net/ipv4/udp.c
604+--- linux-3.18.98.orig/net/ipv4/udp.c
605++++ linux-3.18.98/net/ipv4/udp.c
606606 @@ -1263,6 +1263,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.97.orig/net/ipv6/raw.c
618-+++ linux-3.18.97/net/ipv6/raw.c
617+--- linux-3.18.98.orig/net/ipv6/raw.c
618++++ linux-3.18.98/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.97.orig/net/ipv6/udp.c
631-+++ linux-3.18.97/net/ipv6/udp.c
630+--- linux-3.18.98.orig/net/ipv6/udp.c
631++++ linux-3.18.98/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.97.orig/net/socket.c
644-+++ linux-3.18.97/net/socket.c
643+--- linux-3.18.98.orig/net/socket.c
644++++ linux-3.18.98/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.97.orig/net/unix/af_unix.c
657-+++ linux-3.18.97/net/unix/af_unix.c
656+--- linux-3.18.98.orig/net/unix/af_unix.c
657++++ linux-3.18.98/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.18.97.orig/security/Kconfig
670-+++ linux-3.18.97/security/Kconfig
669+--- linux-3.18.98.orig/security/Kconfig
670++++ linux-3.18.98/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.97.orig/security/Makefile
680-+++ linux-3.18.97/security/Makefile
679+--- linux-3.18.98.orig/security/Makefile
680++++ linux-3.18.98/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.97.orig/security/security.c
689-+++ linux-3.18.97/security/security.c
688+--- linux-3.18.98.orig/security/security.c
689++++ linux-3.18.98/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-3.2.diff (revision 6629)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-3.2.diff (revision 6630)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 3.2.99.
1+This is TOMOYO Linux patch for kernel 3.2.100.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.99.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.100.tar.xz
44 ---
55 fs/exec.c | 2
66 fs/open.c | 2
@@ -28,8 +28,8 @@
2828 security/security.c | 134 +++++++++++++++++++++++++++++++++++++---------
2929 24 files changed, 247 insertions(+), 49 deletions(-)
3030
31---- linux-3.2.99.orig/fs/exec.c
32-+++ linux-3.2.99/fs/exec.c
31+--- linux-3.2.100.orig/fs/exec.c
32++++ linux-3.2.100/fs/exec.c
3333 @@ -1592,7 +1592,7 @@ static int do_execve_common(const char *
3434 if (retval < 0)
3535 goto out;
@@ -39,8 +39,8 @@
3939 if (retval < 0)
4040 goto out;
4141
42---- linux-3.2.99.orig/fs/open.c
43-+++ linux-3.2.99/fs/open.c
42+--- linux-3.2.100.orig/fs/open.c
43++++ linux-3.2.100/fs/open.c
4444 @@ -1105,6 +1105,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.2.99.orig/fs/proc/version.c
54-+++ linux-3.2.99/fs/proc/version.c
53+--- linux-3.2.100.orig/fs/proc/version.c
54++++ linux-3.2.100/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.2.99 2018/02/22\n");
62++ printk(KERN_INFO "Hook version: 3.2.100 2018/03/05\n");
6363 + return 0;
6464 +}
6565 +module_init(ccs_show_version);
66---- linux-3.2.99.orig/include/linux/init_task.h
67-+++ linux-3.2.99/include/linux/init_task.h
66+--- linux-3.2.100.orig/include/linux/init_task.h
67++++ linux-3.2.100/include/linux/init_task.h
6868 @@ -144,6 +144,14 @@ extern struct task_group root_task_group
6969
7070 #define INIT_TASK_COMM "swapper"
@@ -88,8 +88,8 @@
8888 }
8989
9090
91---- linux-3.2.99.orig/include/linux/sched.h
92-+++ linux-3.2.99/include/linux/sched.h
91+--- linux-3.2.100.orig/include/linux/sched.h
92++++ linux-3.2.100/include/linux/sched.h
9393 @@ -44,6 +44,8 @@
9494
9595 #ifdef __KERNEL__
@@ -110,8 +110,8 @@
110110 };
111111
112112 /* Future-safe accessor for struct task_struct's cpus_allowed. */
113---- linux-3.2.99.orig/include/linux/security.h
114-+++ linux-3.2.99/include/linux/security.h
113+--- linux-3.2.100.orig/include/linux/security.h
114++++ linux-3.2.100/include/linux/security.h
115115 @@ -38,6 +38,7 @@
116116 #include <linux/slab.h>
117117 #include <linux/xattr.h>
@@ -310,8 +310,8 @@
310310 }
311311 #endif /* CONFIG_SECURITY_PATH */
312312
313---- linux-3.2.99.orig/include/net/ip.h
314-+++ linux-3.2.99/include/net/ip.h
313+--- linux-3.2.100.orig/include/net/ip.h
314++++ linux-3.2.100/include/net/ip.h
315315 @@ -218,6 +218,8 @@ extern void inet_get_local_port_range(in
316316 extern unsigned long *sysctl_local_reserved_ports;
317317 static inline int inet_is_reserved_local_port(int port)
@@ -321,8 +321,8 @@
321321 return test_bit(port, sysctl_local_reserved_ports);
322322 }
323323
324---- linux-3.2.99.orig/kernel/fork.c
325-+++ linux-3.2.99/kernel/fork.c
324+--- linux-3.2.100.orig/kernel/fork.c
325++++ linux-3.2.100/kernel/fork.c
326326 @@ -197,6 +197,7 @@ void __put_task_struct(struct task_struc
327327 delayacct_tsk_free(tsk);
328328 put_signal_struct(tsk->signal);
@@ -349,8 +349,8 @@
349349 bad_fork_cleanup_perf:
350350 perf_event_free_task(p);
351351 bad_fork_cleanup_policy:
352---- linux-3.2.99.orig/kernel/kexec.c
353-+++ linux-3.2.99/kernel/kexec.c
352+--- linux-3.2.100.orig/kernel/kexec.c
353++++ linux-3.2.100/kernel/kexec.c
354354 @@ -40,6 +40,7 @@
355355 #include <asm/io.h>
356356 #include <asm/system.h>
@@ -368,8 +368,8 @@
368368
369369 /*
370370 * Verify we have a legal set of flags
371---- linux-3.2.99.orig/kernel/module.c
372-+++ linux-3.2.99/kernel/module.c
371+--- linux-3.2.100.orig/kernel/module.c
372++++ linux-3.2.100/kernel/module.c
373373 @@ -58,6 +58,7 @@
374374 #include <linux/jump_label.h>
375375 #include <linux/pfn.h>
@@ -396,8 +396,8 @@
396396
397397 /* Do all the hard work */
398398 mod = load_module(umod, len, uargs);
399---- linux-3.2.99.orig/kernel/ptrace.c
400-+++ linux-3.2.99/kernel/ptrace.c
399+--- linux-3.2.100.orig/kernel/ptrace.c
400++++ linux-3.2.100/kernel/ptrace.c
401401 @@ -956,6 +956,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
402402 {
403403 struct task_struct *child;
@@ -422,8 +422,8 @@
422422
423423 if (request == PTRACE_TRACEME) {
424424 ret = ptrace_traceme();
425---- linux-3.2.99.orig/kernel/sched.c
426-+++ linux-3.2.99/kernel/sched.c
425+--- linux-3.2.100.orig/kernel/sched.c
426++++ linux-3.2.100/kernel/sched.c
427427 @@ -5342,6 +5342,8 @@ int can_nice(const struct task_struct *p
428428 SYSCALL_DEFINE1(nice, int, increment)
429429 {
@@ -433,8 +433,8 @@
433433
434434 /*
435435 * Setpriority might change our priority at the same moment.
436---- linux-3.2.99.orig/kernel/signal.c
437-+++ linux-3.2.99/kernel/signal.c
436+--- linux-3.2.100.orig/kernel/signal.c
437++++ linux-3.2.100/kernel/signal.c
438438 @@ -2756,6 +2756,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
439439 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
440440 {
@@ -480,8 +480,8 @@
480480
481481 return do_send_specific(tgid, pid, sig, info);
482482 }
483---- linux-3.2.99.orig/kernel/sys.c
484-+++ linux-3.2.99/kernel/sys.c
483+--- linux-3.2.100.orig/kernel/sys.c
484++++ linux-3.2.100/kernel/sys.c
485485 @@ -180,6 +180,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
486486
487487 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -520,8 +520,8 @@
520520
521521 down_write(&uts_sem);
522522 errno = -EFAULT;
523---- linux-3.2.99.orig/kernel/time/ntp.c
524-+++ linux-3.2.99/kernel/time/ntp.c
523+--- linux-3.2.100.orig/kernel/time/ntp.c
524++++ linux-3.2.100/kernel/time/ntp.c
525525 @@ -15,6 +15,7 @@
526526 #include <linux/time.h>
527527 #include <linux/mm.h>
@@ -555,9 +555,9 @@
555555 if (!(txc->modes & ADJ_NANO))
556556 delta.tv_nsec *= 1000;
557557 result = timekeeping_inject_offset(&delta);
558---- linux-3.2.99.orig/net/ipv4/raw.c
559-+++ linux-3.2.99/net/ipv4/raw.c
560-@@ -699,6 +699,10 @@ static int raw_recvmsg(struct kiocb *ioc
558+--- linux-3.2.100.orig/net/ipv4/raw.c
559++++ linux-3.2.100/net/ipv4/raw.c
560+@@ -724,6 +724,10 @@ static int raw_recvmsg(struct kiocb *ioc
561561 skb = skb_recv_datagram(sk, flags, noblock, &err);
562562 if (!skb)
563563 goto out;
@@ -568,8 +568,8 @@
568568
569569 copied = skb->len;
570570 if (len < copied) {
571---- linux-3.2.99.orig/net/ipv4/udp.c
572-+++ linux-3.2.99/net/ipv4/udp.c
571+--- linux-3.2.100.orig/net/ipv4/udp.c
572++++ linux-3.2.100/net/ipv4/udp.c
573573 @@ -1185,6 +1185,10 @@ try_again:
574574 &peeked, &err);
575575 if (!skb)
@@ -581,8 +581,8 @@
581581
582582 ulen = skb->len - sizeof(struct udphdr);
583583 copied = len;
584---- linux-3.2.99.orig/net/ipv6/raw.c
585-+++ linux-3.2.99/net/ipv6/raw.c
584+--- linux-3.2.100.orig/net/ipv6/raw.c
585++++ linux-3.2.100/net/ipv6/raw.c
586586 @@ -465,6 +465,10 @@ static int rawv6_recvmsg(struct kiocb *i
587587 skb = skb_recv_datagram(sk, flags, noblock, &err);
588588 if (!skb)
@@ -594,8 +594,8 @@
594594
595595 copied = skb->len;
596596 if (copied > len) {
597---- linux-3.2.99.orig/net/ipv6/udp.c
598-+++ linux-3.2.99/net/ipv6/udp.c
597+--- linux-3.2.100.orig/net/ipv6/udp.c
598++++ linux-3.2.100/net/ipv6/udp.c
599599 @@ -359,6 +359,10 @@ try_again:
600600 &peeked, &err);
601601 if (!skb)
@@ -607,8 +607,8 @@
607607
608608 ulen = skb->len - sizeof(struct udphdr);
609609 copied = len;
610---- linux-3.2.99.orig/net/socket.c
611-+++ linux-3.2.99/net/socket.c
610+--- linux-3.2.100.orig/net/socket.c
611++++ linux-3.2.100/net/socket.c
612612 @@ -1531,6 +1531,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
613613 if (err < 0)
614614 goto out_fd;
@@ -620,8 +620,8 @@
620620 if (upeer_sockaddr) {
621621 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
622622 &len, 2) < 0) {
623---- linux-3.2.99.orig/net/unix/af_unix.c
624-+++ linux-3.2.99/net/unix/af_unix.c
623+--- linux-3.2.100.orig/net/unix/af_unix.c
624++++ linux-3.2.100/net/unix/af_unix.c
625625 @@ -1957,6 +1957,10 @@ static int unix_dgram_recvmsg(struct kio
626626 wake_up_interruptible_sync_poll(&u->peer_wait,
627627 POLLOUT | POLLWRNORM | POLLWRBAND);
@@ -633,8 +633,8 @@
633633 if (msg->msg_name)
634634 unix_copy_addr(msg, skb->sk);
635635
636---- linux-3.2.99.orig/security/Kconfig
637-+++ linux-3.2.99/security/Kconfig
636+--- linux-3.2.100.orig/security/Kconfig
637++++ linux-3.2.100/security/Kconfig
638638 @@ -237,5 +237,7 @@ config DEFAULT_SECURITY
639639 default "apparmor" if DEFAULT_SECURITY_APPARMOR
640640 default "" if DEFAULT_SECURITY_DAC
@@ -643,8 +643,8 @@
643643 +
644644 endmenu
645645
646---- linux-3.2.99.orig/security/Makefile
647-+++ linux-3.2.99/security/Makefile
646+--- linux-3.2.100.orig/security/Makefile
647++++ linux-3.2.100/security/Makefile
648648 @@ -26,3 +26,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
649649 # Object integrity file lists
650650 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -652,8 +652,8 @@
652652 +
653653 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
654654 +obj-$(CONFIG_CCSECURITY) += ccsecurity/built-in.o
655---- linux-3.2.99.orig/security/security.c
656-+++ linux-3.2.99/security/security.c
655+--- linux-3.2.100.orig/security/security.c
656++++ linux-3.2.100/security/security.c
657657 @@ -203,7 +203,10 @@ int security_syslog(int type)
658658
659659 int security_settime(const struct timespec *ts, const struct timezone *tz)
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.14.diff (revision 6629)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.14.diff (revision 6630)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.14.23.
1+This is TOMOYO Linux patch for kernel 4.14.24.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.23.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.24.tar.xz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,9 +28,9 @@
2828 security/security.c | 9 +++++-
2929 24 files changed, 153 insertions(+), 29 deletions(-)
3030
31---- linux-4.14.23.orig/fs/exec.c
32-+++ linux-4.14.23/fs/exec.c
33-@@ -1678,7 +1678,7 @@ static int exec_binprm(struct linux_binp
31+--- linux-4.14.24.orig/fs/exec.c
32++++ linux-4.14.24/fs/exec.c
33+@@ -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();
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.14.23.orig/fs/open.c
43-+++ linux-4.14.23/fs/open.c
42+--- linux-4.14.24.orig/fs/open.c
43++++ linux-4.14.24/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.23.orig/fs/proc/version.c
54-+++ linux-4.14.23/fs/proc/version.c
53+--- linux-4.14.24.orig/fs/proc/version.c
54++++ linux-4.14.24/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.23 2018/03/03\n");
62++ printk(KERN_INFO "Hook version: 4.14.24 2018/03/05\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.14.23.orig/include/linux/init_task.h
67-+++ linux-4.14.23/include/linux/init_task.h
66+--- linux-4.14.24.orig/include/linux/init_task.h
67++++ linux-4.14.24/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.23.orig/include/linux/sched.h
92-+++ linux-4.14.23/include/linux/sched.h
91+--- linux-4.14.24.orig/include/linux/sched.h
92++++ linux-4.14.24/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.23.orig/include/linux/security.h
113-+++ linux-4.14.23/include/linux/security.h
112+--- linux-4.14.24.orig/include/linux/security.h
113++++ linux-4.14.24/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.23.orig/include/net/ip.h
335-+++ linux-4.14.23/include/net/ip.h
334+--- linux-4.14.24.orig/include/net/ip.h
335++++ linux-4.14.24/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.23.orig/kernel/kexec.c
355-+++ linux-4.14.23/kernel/kexec.c
354+--- linux-4.14.24.orig/kernel/kexec.c
355++++ linux-4.14.24/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.23.orig/kernel/module.c
375-+++ linux-4.14.23/kernel/module.c
374+--- linux-4.14.24.orig/kernel/module.c
375++++ linux-4.14.24/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.23.orig/kernel/ptrace.c
403-+++ linux-4.14.23/kernel/ptrace.c
402+--- linux-4.14.24.orig/kernel/ptrace.c
403++++ linux-4.14.24/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.23.orig/kernel/reboot.c
429-+++ linux-4.14.23/kernel/reboot.c
428+--- linux-4.14.24.orig/kernel/reboot.c
429++++ linux-4.14.24/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.23.orig/kernel/sched/core.c
448-+++ linux-4.14.23/kernel/sched/core.c
447+--- linux-4.14.24.orig/kernel/sched/core.c
448++++ linux-4.14.24/kernel/sched/core.c
449449 @@ -3851,6 +3851,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.23.orig/kernel/signal.c
459-+++ linux-4.14.23/kernel/signal.c
458+--- linux-4.14.24.orig/kernel/signal.c
459++++ linux-4.14.24/kernel/signal.c
460460 @@ -2954,6 +2954,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait,
461461 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
462462 {
@@ -502,8 +502,8 @@
502502
503503 return do_send_specific(tgid, pid, sig, info);
504504 }
505---- linux-4.14.23.orig/kernel/sys.c
506-+++ linux-4.14.23/kernel/sys.c
505+--- linux-4.14.24.orig/kernel/sys.c
506++++ linux-4.14.24/kernel/sys.c
507507 @@ -191,6 +191,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
508508
509509 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -533,8 +533,8 @@
533533
534534 down_write(&uts_sem);
535535 errno = -EFAULT;
536---- linux-4.14.23.orig/kernel/time/ntp.c
537-+++ linux-4.14.23/kernel/time/ntp.c
536+--- linux-4.14.24.orig/kernel/time/ntp.c
537++++ linux-4.14.24/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.23.orig/net/ipv4/raw.c
572-+++ linux-4.14.23/net/ipv4/raw.c
571+--- linux-4.14.24.orig/net/ipv4/raw.c
572++++ linux-4.14.24/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.23.orig/net/ipv4/udp.c
585-+++ linux-4.14.23/net/ipv4/udp.c
584+--- linux-4.14.24.orig/net/ipv4/udp.c
585++++ linux-4.14.24/net/ipv4/udp.c
586586 @@ -1590,6 +1590,8 @@ try_again:
587587 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
588588 if (!skb)
@@ -592,8 +592,8 @@
592592
593593 ulen = udp_skb_len(skb);
594594 copied = len;
595---- linux-4.14.23.orig/net/ipv6/raw.c
596-+++ linux-4.14.23/net/ipv6/raw.c
595+--- linux-4.14.24.orig/net/ipv6/raw.c
596++++ linux-4.14.24/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.23.orig/net/ipv6/udp.c
609-+++ linux-4.14.23/net/ipv6/udp.c
608+--- linux-4.14.24.orig/net/ipv6/udp.c
609++++ linux-4.14.24/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.23.orig/net/socket.c
620-+++ linux-4.14.23/net/socket.c
619+--- linux-4.14.24.orig/net/socket.c
620++++ linux-4.14.24/net/socket.c
621621 @@ -1574,6 +1574,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
622622 if (err < 0)
623623 goto out_fd;
@@ -629,8 +629,8 @@
629629 if (upeer_sockaddr) {
630630 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
631631 &len, 2) < 0) {
632---- linux-4.14.23.orig/net/unix/af_unix.c
633-+++ linux-4.14.23/net/unix/af_unix.c
632+--- linux-4.14.24.orig/net/unix/af_unix.c
633++++ linux-4.14.24/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.23.orig/security/Kconfig
654-+++ linux-4.14.23/security/Kconfig
653+--- linux-4.14.24.orig/security/Kconfig
654++++ linux-4.14.24/security/Kconfig
655655 @@ -262,5 +262,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.23.orig/security/Makefile
664-+++ linux-4.14.23/security/Makefile
663+--- linux-4.14.24.orig/security/Makefile
664++++ linux-4.14.24/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.23.orig/security/security.c
673-+++ linux-4.14.23/security/security.c
672+--- linux-4.14.24.orig/security/security.c
673++++ linux-4.14.24/security/security.c
674674 @@ -976,12 +976,19 @@ int security_file_open(struct file *file
675675
676676 int security_task_alloc(struct task_struct *task, unsigned long clone_flags)
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.16.diff (revision 6629)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.16.diff (revision 6630)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.16-rc3.
1+This is TOMOYO Linux patch for kernel 4.16-rc4.
22
3-Source code for this patch is https://git.kernel.org/torvalds/t/linux-4.16-rc3.tar.gz
3+Source code for this patch is https://git.kernel.org/torvalds/t/linux-4.16-rc4.tar.gz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,8 +28,8 @@
2828 security/security.c | 9 +++++-
2929 24 files changed, 148 insertions(+), 29 deletions(-)
3030
31---- linux-4.16-rc3.orig/fs/exec.c
32-+++ linux-4.16-rc3/fs/exec.c
31+--- linux-4.16-rc4.orig/fs/exec.c
32++++ linux-4.16-rc4/fs/exec.c
3333 @@ -1677,7 +1677,7 @@ static int exec_binprm(struct linux_binp
3434 old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
3535 rcu_read_unlock();
@@ -39,8 +39,8 @@
3939 if (ret >= 0) {
4040 audit_bprm(bprm);
4141 trace_sched_process_exec(current, old_pid, bprm);
42---- linux-4.16-rc3.orig/fs/open.c
43-+++ linux-4.16-rc3/fs/open.c
42+--- linux-4.16-rc4.orig/fs/open.c
43++++ linux-4.16-rc4/fs/open.c
4444 @@ -1171,6 +1171,8 @@ EXPORT_SYMBOL(sys_close);
4545 */
4646 SYSCALL_DEFINE0(vhangup)
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-4.16-rc3.orig/fs/proc/version.c
54-+++ linux-4.16-rc3/fs/proc/version.c
53+--- linux-4.16-rc4.orig/fs/proc/version.c
54++++ linux-4.16-rc4/fs/proc/version.c
5555 @@ -33,3 +33,10 @@ static int __init proc_version_init(void
5656 return 0;
5757 }
@@ -59,12 +59,12 @@
5959 +
6060 +static int __init ccs_show_version(void)
6161 +{
62-+ printk(KERN_INFO "Hook version: 4.16-rc3 2018/03/03\n");
62++ printk(KERN_INFO "Hook version: 4.16-rc4 2018/03/05\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.16-rc3.orig/include/linux/sched.h
67-+++ linux-4.16-rc3/include/linux/sched.h
66+--- linux-4.16-rc4.orig/include/linux/sched.h
67++++ linux-4.16-rc4/include/linux/sched.h
6868 @@ -33,6 +33,7 @@ struct audit_context;
6969 struct backing_dev_info;
7070 struct bio_list;
@@ -84,8 +84,8 @@
8484
8585 /*
8686 * New fields for task_struct should be added above here, so that
87---- linux-4.16-rc3.orig/include/linux/security.h
88-+++ linux-4.16-rc3/include/linux/security.h
87+--- linux-4.16-rc4.orig/include/linux/security.h
88++++ linux-4.16-rc4/include/linux/security.h
8989 @@ -56,6 +56,7 @@ struct msg_queue;
9090 struct xattr;
9191 struct xfrm_sec_ctx;
@@ -306,8 +306,8 @@
306306 }
307307 #endif /* CONFIG_SECURITY_PATH */
308308
309---- linux-4.16-rc3.orig/include/net/ip.h
310-+++ linux-4.16-rc3/include/net/ip.h
309+--- linux-4.16-rc4.orig/include/net/ip.h
310++++ linux-4.16-rc4/include/net/ip.h
311311 @@ -268,6 +268,8 @@ void inet_get_local_port_range(struct ne
312312 #ifdef CONFIG_SYSCTL
313313 static inline int inet_is_local_reserved_port(struct net *net, int port)
@@ -326,8 +326,8 @@
326326 return 0;
327327 }
328328
329---- linux-4.16-rc3.orig/init/init_task.c
330-+++ linux-4.16-rc3/init/init_task.c
329+--- linux-4.16-rc4.orig/init/init_task.c
330++++ linux-4.16-rc4/init/init_task.c
331331 @@ -175,6 +175,10 @@ struct task_struct init_task
332332 #ifdef CONFIG_SECURITY
333333 .security = NULL,
@@ -339,8 +339,8 @@
339339 };
340340 EXPORT_SYMBOL(init_task);
341341
342---- linux-4.16-rc3.orig/kernel/kexec.c
343-+++ linux-4.16-rc3/kernel/kexec.c
342+--- linux-4.16-rc4.orig/kernel/kexec.c
343++++ linux-4.16-rc4/kernel/kexec.c
344344 @@ -17,7 +17,7 @@
345345 #include <linux/syscalls.h>
346346 #include <linux/vmalloc.h>
@@ -359,8 +359,8 @@
359359
360360 /*
361361 * Verify we have a legal set of flags
362---- linux-4.16-rc3.orig/kernel/module.c
363-+++ linux-4.16-rc3/kernel/module.c
362+--- linux-4.16-rc4.orig/kernel/module.c
363++++ linux-4.16-rc4/kernel/module.c
364364 @@ -66,6 +66,7 @@
365365 #include <linux/audit.h>
366366 #include <uapi/linux/module.h>
@@ -387,8 +387,8 @@
387387
388388 return 0;
389389 }
390---- linux-4.16-rc3.orig/kernel/ptrace.c
391-+++ linux-4.16-rc3/kernel/ptrace.c
390+--- linux-4.16-rc4.orig/kernel/ptrace.c
391++++ linux-4.16-rc4/kernel/ptrace.c
392392 @@ -1112,6 +1112,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
393393 {
394394 struct task_struct *child;
@@ -413,8 +413,8 @@
413413
414414 if (request == PTRACE_TRACEME) {
415415 ret = ptrace_traceme();
416---- linux-4.16-rc3.orig/kernel/reboot.c
417-+++ linux-4.16-rc3/kernel/reboot.c
416+--- linux-4.16-rc4.orig/kernel/reboot.c
417++++ linux-4.16-rc4/kernel/reboot.c
418418 @@ -16,6 +16,7 @@
419419 #include <linux/syscalls.h>
420420 #include <linux/syscore_ops.h>
@@ -432,8 +432,8 @@
432432
433433 /*
434434 * If pid namespaces are enabled and the current task is in a child
435---- linux-4.16-rc3.orig/kernel/sched/core.c
436-+++ linux-4.16-rc3/kernel/sched/core.c
435+--- linux-4.16-rc4.orig/kernel/sched/core.c
436++++ linux-4.16-rc4/kernel/sched/core.c
437437 @@ -3926,6 +3926,8 @@ int can_nice(const struct task_struct *p
438438 SYSCALL_DEFINE1(nice, int, increment)
439439 {
@@ -443,8 +443,8 @@
443443
444444 /*
445445 * Setpriority might change our priority at the same moment.
446---- linux-4.16-rc3.orig/kernel/signal.c
447-+++ linux-4.16-rc3/kernel/signal.c
446+--- linux-4.16-rc4.orig/kernel/signal.c
447++++ linux-4.16-rc4/kernel/signal.c
448448 @@ -3245,6 +3245,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait,
449449 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
450450 {
@@ -490,8 +490,8 @@
490490
491491 return do_send_specific(tgid, pid, sig, info);
492492 }
493---- linux-4.16-rc3.orig/kernel/sys.c
494-+++ linux-4.16-rc3/kernel/sys.c
493+--- linux-4.16-rc4.orig/kernel/sys.c
494++++ linux-4.16-rc4/kernel/sys.c
495495 @@ -197,6 +197,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
496496
497497 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -521,8 +521,8 @@
521521
522522 down_write(&uts_sem);
523523 errno = -EFAULT;
524---- linux-4.16-rc3.orig/kernel/time/timekeeping.c
525-+++ linux-4.16-rc3/kernel/time/timekeeping.c
524+--- linux-4.16-rc4.orig/kernel/time/timekeeping.c
525++++ linux-4.16-rc4/kernel/time/timekeeping.c
526526 @@ -25,6 +25,7 @@
527527 #include <linux/stop_machine.h>
528528 #include <linux/pvclock_gtod.h>
@@ -556,8 +556,8 @@
556556
557557 /*
558558 * Validate if a timespec/timeval used to inject a time
559---- linux-4.16-rc3.orig/net/ipv4/raw.c
560-+++ linux-4.16-rc3/net/ipv4/raw.c
559+--- linux-4.16-rc4.orig/net/ipv4/raw.c
560++++ linux-4.16-rc4/net/ipv4/raw.c
561561 @@ -781,6 +781,10 @@ static int raw_recvmsg(struct sock *sk,
562562 skb = skb_recv_datagram(sk, flags, noblock, &err);
563563 if (!skb)
@@ -569,8 +569,8 @@
569569
570570 copied = skb->len;
571571 if (len < copied) {
572---- linux-4.16-rc3.orig/net/ipv4/udp.c
573-+++ linux-4.16-rc3/net/ipv4/udp.c
572+--- linux-4.16-rc4.orig/net/ipv4/udp.c
573++++ linux-4.16-rc4/net/ipv4/udp.c
574574 @@ -1582,6 +1582,8 @@ try_again:
575575 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
576576 if (!skb)
@@ -580,8 +580,8 @@
580580
581581 ulen = udp_skb_len(skb);
582582 copied = len;
583---- linux-4.16-rc3.orig/net/ipv6/raw.c
584-+++ linux-4.16-rc3/net/ipv6/raw.c
583+--- linux-4.16-rc4.orig/net/ipv6/raw.c
584++++ linux-4.16-rc4/net/ipv6/raw.c
585585 @@ -483,6 +483,10 @@ static int rawv6_recvmsg(struct sock *sk
586586 skb = skb_recv_datagram(sk, flags, noblock, &err);
587587 if (!skb)
@@ -593,8 +593,8 @@
593593
594594 copied = skb->len;
595595 if (copied > len) {
596---- linux-4.16-rc3.orig/net/ipv6/udp.c
597-+++ linux-4.16-rc3/net/ipv6/udp.c
596+--- linux-4.16-rc4.orig/net/ipv6/udp.c
597++++ linux-4.16-rc4/net/ipv6/udp.c
598598 @@ -341,6 +341,8 @@ try_again:
599599 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
600600 if (!skb)
@@ -604,8 +604,8 @@
604604
605605 ulen = udp6_skb_len(skb);
606606 copied = len;
607---- linux-4.16-rc3.orig/net/socket.c
608-+++ linux-4.16-rc3/net/socket.c
607+--- linux-4.16-rc4.orig/net/socket.c
608++++ linux-4.16-rc4/net/socket.c
609609 @@ -1572,6 +1572,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
610610 if (err < 0)
611611 goto out_fd;
@@ -617,8 +617,8 @@
617617 if (upeer_sockaddr) {
618618 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
619619 &len, 2) < 0) {
620---- linux-4.16-rc3.orig/net/unix/af_unix.c
621-+++ linux-4.16-rc3/net/unix/af_unix.c
620+--- linux-4.16-rc4.orig/net/unix/af_unix.c
621++++ linux-4.16-rc4/net/unix/af_unix.c
622622 @@ -2132,6 +2132,10 @@ static int unix_dgram_recvmsg(struct soc
623623 EPOLLOUT | EPOLLWRNORM |
624624 EPOLLWRBAND);
@@ -638,8 +638,8 @@
638638 mutex_unlock(&u->iolock);
639639 out:
640640 return err;
641---- linux-4.16-rc3.orig/security/Kconfig
642-+++ linux-4.16-rc3/security/Kconfig
641+--- linux-4.16-rc4.orig/security/Kconfig
642++++ linux-4.16-rc4/security/Kconfig
643643 @@ -277,5 +277,7 @@ config DEFAULT_SECURITY
644644 default "apparmor" if DEFAULT_SECURITY_APPARMOR
645645 default "" if DEFAULT_SECURITY_DAC
@@ -648,8 +648,8 @@
648648 +
649649 endmenu
650650
651---- linux-4.16-rc3.orig/security/Makefile
652-+++ linux-4.16-rc3/security/Makefile
651+--- linux-4.16-rc4.orig/security/Makefile
652++++ linux-4.16-rc4/security/Makefile
653653 @@ -30,3 +30,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
654654 # Object integrity file lists
655655 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -657,8 +657,8 @@
657657 +
658658 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
659659 +obj-$(CONFIG_CCSECURITY) += ccsecurity/
660---- linux-4.16-rc3.orig/security/security.c
661-+++ linux-4.16-rc3/security/security.c
660+--- linux-4.16-rc4.orig/security/security.c
661++++ linux-4.16-rc4/security/security.c
662662 @@ -977,12 +977,19 @@ int security_file_open(struct file *file
663663
664664 int security_task_alloc(struct task_struct *task, unsigned long clone_flags)
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.4.diff (revision 6629)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.4.diff (revision 6630)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.4.119.
1+This is TOMOYO Linux patch for kernel 4.4.120.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.119.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.120.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.119.orig/fs/exec.c
32-+++ linux-4.4.119/fs/exec.c
31+--- linux-4.4.120.orig/fs/exec.c
32++++ linux-4.4.120/fs/exec.c
3333 @@ -1508,7 +1508,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.4.119.orig/fs/open.c
43-+++ linux-4.4.119/fs/open.c
42+--- linux-4.4.120.orig/fs/open.c
43++++ linux-4.4.120/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.119.orig/fs/proc/version.c
54-+++ linux-4.4.119/fs/proc/version.c
53+--- linux-4.4.120.orig/fs/proc/version.c
54++++ linux-4.4.120/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.119 2018/03/03\n");
62++ printk(KERN_INFO "Hook version: 4.4.120 2018/03/05\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.4.119.orig/include/linux/init_task.h
67-+++ linux-4.4.119/include/linux/init_task.h
66+--- linux-4.4.120.orig/include/linux/init_task.h
67++++ linux-4.4.120/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.119.orig/include/linux/sched.h
92-+++ linux-4.4.119/include/linux/sched.h
91+--- linux-4.4.120.orig/include/linux/sched.h
92++++ linux-4.4.120/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.119.orig/include/linux/security.h
114-+++ linux-4.4.119/include/linux/security.h
113+--- linux-4.4.120.orig/include/linux/security.h
114++++ linux-4.4.120/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.119.orig/include/net/ip.h
322-+++ linux-4.4.119/include/net/ip.h
321+--- linux-4.4.120.orig/include/net/ip.h
322++++ linux-4.4.120/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.119.orig/kernel/fork.c
342-+++ linux-4.4.119/kernel/fork.c
341+--- linux-4.4.120.orig/kernel/fork.c
342++++ linux-4.4.120/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.119.orig/kernel/kexec.c
370-+++ linux-4.4.119/kernel/kexec.c
369+--- linux-4.4.120.orig/kernel/kexec.c
370++++ linux-4.4.120/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.119.orig/kernel/module.c
390-+++ linux-4.4.119/kernel/module.c
389+--- linux-4.4.120.orig/kernel/module.c
390++++ linux-4.4.120/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.119.orig/kernel/ptrace.c
418-+++ linux-4.4.119/kernel/ptrace.c
417+--- linux-4.4.120.orig/kernel/ptrace.c
418++++ linux-4.4.120/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.119.orig/kernel/reboot.c
444-+++ linux-4.4.119/kernel/reboot.c
443+--- linux-4.4.120.orig/kernel/reboot.c
444++++ linux-4.4.120/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.119.orig/kernel/sched/core.c
463-+++ linux-4.4.119/kernel/sched/core.c
462+--- linux-4.4.120.orig/kernel/sched/core.c
463++++ linux-4.4.120/kernel/sched/core.c
464464 @@ -3548,6 +3548,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.119.orig/kernel/signal.c
474-+++ linux-4.4.119/kernel/signal.c
473+--- linux-4.4.120.orig/kernel/signal.c
474++++ linux-4.4.120/kernel/signal.c
475475 @@ -2857,6 +2857,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
476476 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
477477 {
@@ -517,8 +517,8 @@
517517
518518 return do_send_specific(tgid, pid, sig, info);
519519 }
520---- linux-4.4.119.orig/kernel/sys.c
521-+++ linux-4.4.119/kernel/sys.c
520+--- linux-4.4.120.orig/kernel/sys.c
521++++ linux-4.4.120/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.119.orig/kernel/time/ntp.c
552-+++ linux-4.4.119/kernel/time/ntp.c
551+--- linux-4.4.120.orig/kernel/time/ntp.c
552++++ linux-4.4.120/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.119.orig/net/ipv4/raw.c
587-+++ linux-4.4.119/net/ipv4/raw.c
586+--- linux-4.4.120.orig/net/ipv4/raw.c
587++++ linux-4.4.120/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.119.orig/net/ipv4/udp.c
600-+++ linux-4.4.119/net/ipv4/udp.c
599+--- linux-4.4.120.orig/net/ipv4/udp.c
600++++ linux-4.4.120/net/ipv4/udp.c
601601 @@ -1286,6 +1286,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.119.orig/net/ipv6/raw.c
613-+++ linux-4.4.119/net/ipv6/raw.c
612+--- linux-4.4.120.orig/net/ipv6/raw.c
613++++ linux-4.4.120/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.119.orig/net/ipv6/udp.c
626-+++ linux-4.4.119/net/ipv6/udp.c
625+--- linux-4.4.120.orig/net/ipv6/udp.c
626++++ linux-4.4.120/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.119.orig/net/socket.c
639-+++ linux-4.4.119/net/socket.c
638+--- linux-4.4.120.orig/net/socket.c
639++++ linux-4.4.120/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.119.orig/net/unix/af_unix.c
652-+++ linux-4.4.119/net/unix/af_unix.c
651+--- linux-4.4.120.orig/net/unix/af_unix.c
652++++ linux-4.4.120/net/unix/af_unix.c
653653 @@ -2144,6 +2144,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.119.orig/security/Kconfig
665-+++ linux-4.4.119/security/Kconfig
664+--- linux-4.4.120.orig/security/Kconfig
665++++ linux-4.4.120/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.119.orig/security/Makefile
675-+++ linux-4.4.119/security/Makefile
674+--- linux-4.4.120.orig/security/Makefile
675++++ linux-4.4.120/security/Makefile
676676 @@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
677677 # Object integrity file lists
678678 subdir-$(CONFIG_INTEGRITY) += integrity
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.9.diff (revision 6629)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.9.diff (revision 6630)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.9.85.
1+This is TOMOYO Linux patch for kernel 4.9.86.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.85.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.86.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.85.orig/fs/exec.c
32-+++ linux-4.9.85/fs/exec.c
31+--- linux-4.9.86.orig/fs/exec.c
32++++ linux-4.9.86/fs/exec.c
3333 @@ -1661,7 +1661,7 @@ static int exec_binprm(struct linux_binp
3434 old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
3535 rcu_read_unlock();
@@ -39,8 +39,8 @@
3939 if (ret >= 0) {
4040 audit_bprm(bprm);
4141 trace_sched_process_exec(current, old_pid, bprm);
42---- linux-4.9.85.orig/fs/open.c
43-+++ linux-4.9.85/fs/open.c
42+--- linux-4.9.86.orig/fs/open.c
43++++ linux-4.9.86/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.85.orig/fs/proc/version.c
54-+++ linux-4.9.85/fs/proc/version.c
53+--- linux-4.9.86.orig/fs/proc/version.c
54++++ linux-4.9.86/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.85 2018/03/03\n");
62++ printk(KERN_INFO "Hook version: 4.9.86 2018/03/05\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.9.85.orig/include/linux/init_task.h
67-+++ linux-4.9.85/include/linux/init_task.h
66+--- linux-4.9.86.orig/include/linux/init_task.h
67++++ linux-4.9.86/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.85.orig/include/linux/sched.h
92-+++ linux-4.9.85/include/linux/sched.h
91+--- linux-4.9.86.orig/include/linux/sched.h
92++++ linux-4.9.86/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.85.orig/include/linux/security.h
114-+++ linux-4.9.85/include/linux/security.h
113+--- linux-4.9.86.orig/include/linux/security.h
114++++ linux-4.9.86/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.85.orig/include/net/ip.h
322-+++ linux-4.9.85/include/net/ip.h
321+--- linux-4.9.86.orig/include/net/ip.h
322++++ linux-4.9.86/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.85.orig/kernel/fork.c
342-+++ linux-4.9.85/kernel/fork.c
341+--- linux-4.9.86.orig/kernel/fork.c
342++++ linux-4.9.86/kernel/fork.c
343343 @@ -392,6 +392,7 @@ void __put_task_struct(struct task_struc
344344 delayacct_tsk_free(tsk);
345345 put_signal_struct(tsk->signal);
@@ -366,8 +366,8 @@
366366 bad_fork_cleanup_perf:
367367 perf_event_free_task(p);
368368 bad_fork_cleanup_policy:
369---- linux-4.9.85.orig/kernel/kexec.c
370-+++ linux-4.9.85/kernel/kexec.c
369+--- linux-4.9.86.orig/kernel/kexec.c
370++++ linux-4.9.86/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.85.orig/kernel/module.c
390-+++ linux-4.9.85/kernel/module.c
389+--- linux-4.9.86.orig/kernel/module.c
390++++ linux-4.9.86/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.85.orig/kernel/ptrace.c
418-+++ linux-4.9.85/kernel/ptrace.c
417+--- linux-4.9.86.orig/kernel/ptrace.c
418++++ linux-4.9.86/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.85.orig/kernel/reboot.c
444-+++ linux-4.9.85/kernel/reboot.c
443+--- linux-4.9.86.orig/kernel/reboot.c
444++++ linux-4.9.86/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.85.orig/kernel/sched/core.c
463-+++ linux-4.9.85/kernel/sched/core.c
462+--- linux-4.9.86.orig/kernel/sched/core.c
463++++ linux-4.9.86/kernel/sched/core.c
464464 @@ -3811,6 +3811,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.85.orig/kernel/signal.c
474-+++ linux-4.9.85/kernel/signal.c
473+--- linux-4.9.86.orig/kernel/signal.c
474++++ linux-4.9.86/kernel/signal.c
475475 @@ -2857,6 +2857,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
476476 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
477477 {
@@ -517,8 +517,8 @@
517517
518518 return do_send_specific(tgid, pid, sig, info);
519519 }
520---- linux-4.9.85.orig/kernel/sys.c
521-+++ linux-4.9.85/kernel/sys.c
520+--- linux-4.9.86.orig/kernel/sys.c
521++++ linux-4.9.86/kernel/sys.c
522522 @@ -183,6 +183,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
523523
524524 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -548,8 +548,8 @@
548548
549549 down_write(&uts_sem);
550550 errno = -EFAULT;
551---- linux-4.9.85.orig/kernel/time/ntp.c
552-+++ linux-4.9.85/kernel/time/ntp.c
551+--- linux-4.9.86.orig/kernel/time/ntp.c
552++++ linux-4.9.86/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.85.orig/net/ipv4/raw.c
587-+++ linux-4.9.85/net/ipv4/raw.c
586+--- linux-4.9.86.orig/net/ipv4/raw.c
587++++ linux-4.9.86/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.85.orig/net/ipv4/udp.c
600-+++ linux-4.9.85/net/ipv4/udp.c
599+--- linux-4.9.86.orig/net/ipv4/udp.c
600++++ linux-4.9.86/net/ipv4/udp.c
601601 @@ -1264,6 +1264,8 @@ try_again:
602602 &peeked, &off, &err);
603603 if (!skb)
@@ -607,8 +607,8 @@
607607
608608 ulen = skb->len;
609609 copied = len;
610---- linux-4.9.85.orig/net/ipv6/raw.c
611-+++ linux-4.9.85/net/ipv6/raw.c
610+--- linux-4.9.86.orig/net/ipv6/raw.c
611++++ linux-4.9.86/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.85.orig/net/ipv6/udp.c
624-+++ linux-4.9.85/net/ipv6/udp.c
623+--- linux-4.9.86.orig/net/ipv6/udp.c
624++++ linux-4.9.86/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.85.orig/net/socket.c
635-+++ linux-4.9.85/net/socket.c
634+--- linux-4.9.86.orig/net/socket.c
635++++ linux-4.9.86/net/socket.c
636636 @@ -1481,6 +1481,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
637637 if (err < 0)
638638 goto out_fd;
@@ -644,8 +644,8 @@
644644 if (upeer_sockaddr) {
645645 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
646646 &len, 2) < 0) {
647---- linux-4.9.85.orig/net/unix/af_unix.c
648-+++ linux-4.9.85/net/unix/af_unix.c
647+--- linux-4.9.86.orig/net/unix/af_unix.c
648++++ linux-4.9.86/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.85.orig/security/Kconfig
669-+++ linux-4.9.85/security/Kconfig
668+--- linux-4.9.86.orig/security/Kconfig
669++++ linux-4.9.86/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.85.orig/security/Makefile
679-+++ linux-4.9.85/security/Makefile
678+--- linux-4.9.86.orig/security/Makefile
679++++ linux-4.9.86/security/Makefile
680680 @@ -29,3 +29,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
681681 # Object integrity file lists
682682 subdir-$(CONFIG_INTEGRITY) += integrity
旧リポジトリブラウザで表示