• R/O
  • SSH
  • HTTPS

tomoyo: コミット


コミットメタ情報

リビジョン6609 (tree)
日時2017-10-23 23:02:02
作者kumaneko

ログメッセージ

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

変更サマリ

差分

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-3.13-ubuntu-14.04.diff (revision 6608)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-3.13-ubuntu-14.04.diff (revision 6609)
@@ -29,8 +29,8 @@
2929 security/security.c | 107 ++++++++++++++++++++++++++++++++++++++++------
3030 25 files changed, 236 insertions(+), 37 deletions(-)
3131
32---- linux-3.13.0-132.181.orig/fs/exec.c
33-+++ linux-3.13.0-132.181/fs/exec.c
32+--- linux-3.13.0-133.182.orig/fs/exec.c
33++++ linux-3.13.0-133.182/fs/exec.c
3434 @@ -1482,7 +1482,7 @@ static int exec_binprm(struct linux_binp
3535 old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
3636 rcu_read_unlock();
@@ -40,8 +40,8 @@
4040 if (ret >= 0) {
4141 audit_bprm(bprm);
4242 trace_sched_process_exec(current, old_pid, bprm);
43---- linux-3.13.0-132.181.orig/fs/open.c
44-+++ linux-3.13.0-132.181/fs/open.c
43+--- linux-3.13.0-133.182.orig/fs/open.c
44++++ linux-3.13.0-133.182/fs/open.c
4545 @@ -1088,6 +1088,8 @@ EXPORT_SYMBOL(sys_close);
4646 */
4747 SYSCALL_DEFINE0(vhangup)
@@ -51,8 +51,8 @@
5151 if (capable(CAP_SYS_TTY_CONFIG)) {
5252 tty_vhangup_self();
5353 return 0;
54---- linux-3.13.0-132.181.orig/fs/proc/version.c
55-+++ linux-3.13.0-132.181/fs/proc/version.c
54+--- linux-3.13.0-133.182.orig/fs/proc/version.c
55++++ linux-3.13.0-133.182/fs/proc/version.c
5656 @@ -32,3 +32,10 @@ static int __init proc_version_init(void
5757 return 0;
5858 }
@@ -60,12 +60,12 @@
6060 +
6161 +static int __init ccs_show_version(void)
6262 +{
63-+ printk(KERN_INFO "Hook version: 3.13.0-132.181 2017/09/25\n");
63++ printk(KERN_INFO "Hook version: 3.13.0-133.182 2017/10/23\n");
6464 + return 0;
6565 +}
6666 +module_init(ccs_show_version);
67---- linux-3.13.0-132.181.orig/include/linux/init_task.h
68-+++ linux-3.13.0-132.181/include/linux/init_task.h
67+--- linux-3.13.0-133.182.orig/include/linux/init_task.h
68++++ linux-3.13.0-133.182/include/linux/init_task.h
6969 @@ -155,6 +155,14 @@ extern struct task_group root_task_group
7070
7171 #define INIT_TASK_COMM "swapper"
@@ -89,8 +89,8 @@
8989 }
9090
9191
92---- linux-3.13.0-132.181.orig/include/linux/sched.h
93-+++ linux-3.13.0-132.181/include/linux/sched.h
92+--- linux-3.13.0-133.182.orig/include/linux/sched.h
93++++ linux-3.13.0-133.182/include/linux/sched.h
9494 @@ -4,6 +4,8 @@
9595 #include <uapi/linux/sched.h>
9696
@@ -111,8 +111,8 @@
111111 };
112112
113113 /* Future-safe accessor for struct task_struct's cpus_allowed. */
114---- linux-3.13.0-132.181.orig/include/linux/security.h
115-+++ linux-3.13.0-132.181/include/linux/security.h
114+--- linux-3.13.0-133.182.orig/include/linux/security.h
115++++ linux-3.13.0-133.182/include/linux/security.h
116116 @@ -53,6 +53,7 @@ struct msg_queue;
117117 struct xattr;
118118 struct xfrm_sec_ctx;
@@ -314,8 +314,8 @@
314314 }
315315 #endif /* CONFIG_SECURITY_PATH */
316316
317---- linux-3.13.0-132.181.orig/include/net/ip.h
318-+++ linux-3.13.0-132.181/include/net/ip.h
317+--- linux-3.13.0-133.182.orig/include/net/ip.h
318++++ linux-3.13.0-133.182/include/net/ip.h
319319 @@ -225,6 +225,8 @@ void inet_get_local_port_range(struct ne
320320 extern unsigned long *sysctl_local_reserved_ports;
321321 static inline int inet_is_reserved_local_port(int port)
@@ -325,8 +325,8 @@
325325 return test_bit(port, sysctl_local_reserved_ports);
326326 }
327327
328---- linux-3.13.0-132.181.orig/kernel/fork.c
329-+++ linux-3.13.0-132.181/kernel/fork.c
328+--- linux-3.13.0-133.182.orig/kernel/fork.c
329++++ linux-3.13.0-133.182/kernel/fork.c
330330 @@ -248,6 +248,7 @@ void __put_task_struct(struct task_struc
331331 delayacct_tsk_free(tsk);
332332 put_signal_struct(tsk->signal);
@@ -353,8 +353,8 @@
353353 bad_fork_cleanup_perf:
354354 perf_event_free_task(p);
355355 bad_fork_cleanup_policy:
356---- linux-3.13.0-132.181.orig/kernel/kexec.c
357-+++ linux-3.13.0-132.181/kernel/kexec.c
356+--- linux-3.13.0-133.182.orig/kernel/kexec.c
357++++ linux-3.13.0-133.182/kernel/kexec.c
358358 @@ -38,6 +38,7 @@
359359 #include <asm/uaccess.h>
360360 #include <asm/io.h>
@@ -372,8 +372,8 @@
372372
373373 /*
374374 * Verify we have a legal set of flags
375---- linux-3.13.0-132.181.orig/kernel/module.c
376-+++ linux-3.13.0-132.181/kernel/module.c
375+--- linux-3.13.0-133.182.orig/kernel/module.c
376++++ linux-3.13.0-133.182/kernel/module.c
377377 @@ -63,6 +63,7 @@
378378 #include <linux/fips.h>
379379 #include <uapi/linux/module.h>
@@ -400,8 +400,8 @@
400400
401401 return 0;
402402 }
403---- linux-3.13.0-132.181.orig/kernel/ptrace.c
404-+++ linux-3.13.0-132.181/kernel/ptrace.c
403+--- linux-3.13.0-133.182.orig/kernel/ptrace.c
404++++ linux-3.13.0-133.182/kernel/ptrace.c
405405 @@ -1055,6 +1055,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
406406 {
407407 struct task_struct *child;
@@ -426,8 +426,8 @@
426426
427427 if (request == PTRACE_TRACEME) {
428428 ret = ptrace_traceme();
429---- linux-3.13.0-132.181.orig/kernel/reboot.c
430-+++ linux-3.13.0-132.181/kernel/reboot.c
429+--- linux-3.13.0-133.182.orig/kernel/reboot.c
430++++ linux-3.13.0-133.182/kernel/reboot.c
431431 @@ -16,6 +16,7 @@
432432 #include <linux/syscalls.h>
433433 #include <linux/syscore_ops.h>
@@ -445,8 +445,8 @@
445445
446446 /*
447447 * If pid namespaces are enabled and the current task is in a child
448---- linux-3.13.0-132.181.orig/kernel/sched/core.c
449-+++ linux-3.13.0-132.181/kernel/sched/core.c
448+--- linux-3.13.0-133.182.orig/kernel/sched/core.c
449++++ linux-3.13.0-133.182/kernel/sched/core.c
450450 @@ -2922,6 +2922,8 @@ int can_nice(const struct task_struct *p
451451 SYSCALL_DEFINE1(nice, int, increment)
452452 {
@@ -456,8 +456,8 @@
456456
457457 /*
458458 * Setpriority might change our priority at the same moment.
459---- linux-3.13.0-132.181.orig/kernel/signal.c
460-+++ linux-3.13.0-132.181/kernel/signal.c
459+--- linux-3.13.0-133.182.orig/kernel/signal.c
460++++ linux-3.13.0-133.182/kernel/signal.c
461461 @@ -2909,6 +2909,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
462462 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
463463 {
@@ -503,8 +503,8 @@
503503
504504 return do_send_specific(tgid, pid, sig, info);
505505 }
506---- linux-3.13.0-132.181.orig/kernel/sys.c
507-+++ linux-3.13.0-132.181/kernel/sys.c
506+--- linux-3.13.0-133.182.orig/kernel/sys.c
507++++ linux-3.13.0-133.182/kernel/sys.c
508508 @@ -171,6 +171,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
509509
510510 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -534,8 +534,8 @@
534534
535535 down_write(&uts_sem);
536536 errno = -EFAULT;
537---- linux-3.13.0-132.181.orig/kernel/time/ntp.c
538-+++ linux-3.13.0-132.181/kernel/time/ntp.c
537+--- linux-3.13.0-133.182.orig/kernel/time/ntp.c
538++++ linux-3.13.0-133.182/kernel/time/ntp.c
539539 @@ -16,6 +16,7 @@
540540 #include <linux/mm.h>
541541 #include <linux/module.h>
@@ -569,8 +569,8 @@
569569
570570 /*
571571 * Check for potential multiplication overflows that can
572---- linux-3.13.0-132.181.orig/net/ipv4/raw.c
573-+++ linux-3.13.0-132.181/net/ipv4/raw.c
572+--- linux-3.13.0-133.182.orig/net/ipv4/raw.c
573++++ linux-3.13.0-133.182/net/ipv4/raw.c
574574 @@ -706,6 +706,10 @@ static int raw_recvmsg(struct kiocb *ioc
575575 skb = skb_recv_datagram(sk, flags, noblock, &err);
576576 if (!skb)
@@ -582,8 +582,8 @@
582582
583583 copied = skb->len;
584584 if (len < copied) {
585---- linux-3.13.0-132.181.orig/net/ipv4/udp.c
586-+++ linux-3.13.0-132.181/net/ipv4/udp.c
585+--- linux-3.13.0-133.182.orig/net/ipv4/udp.c
586++++ linux-3.13.0-133.182/net/ipv4/udp.c
587587 @@ -1247,6 +1247,10 @@ try_again:
588588 &peeked, &off, &err);
589589 if (!skb)
@@ -595,8 +595,8 @@
595595
596596 ulen = skb->len - sizeof(struct udphdr);
597597 copied = len;
598---- linux-3.13.0-132.181.orig/net/ipv6/raw.c
599-+++ linux-3.13.0-132.181/net/ipv6/raw.c
598+--- linux-3.13.0-133.182.orig/net/ipv6/raw.c
599++++ linux-3.13.0-133.182/net/ipv6/raw.c
600600 @@ -474,6 +474,10 @@ static int rawv6_recvmsg(struct kiocb *i
601601 skb = skb_recv_datagram(sk, flags, noblock, &err);
602602 if (!skb)
@@ -608,8 +608,8 @@
608608
609609 copied = skb->len;
610610 if (copied > len) {
611---- linux-3.13.0-132.181.orig/net/ipv6/udp.c
612-+++ linux-3.13.0-132.181/net/ipv6/udp.c
611+--- linux-3.13.0-133.182.orig/net/ipv6/udp.c
612++++ linux-3.13.0-133.182/net/ipv6/udp.c
613613 @@ -404,6 +404,10 @@ try_again:
614614 &peeked, &off, &err);
615615 if (!skb)
@@ -621,8 +621,8 @@
621621
622622 ulen = skb->len - sizeof(struct udphdr);
623623 copied = len;
624---- linux-3.13.0-132.181.orig/net/socket.c
625-+++ linux-3.13.0-132.181/net/socket.c
624+--- linux-3.13.0-133.182.orig/net/socket.c
625++++ linux-3.13.0-133.182/net/socket.c
626626 @@ -1616,6 +1616,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
627627 if (err < 0)
628628 goto out_fd;
@@ -634,8 +634,8 @@
634634 if (upeer_sockaddr) {
635635 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
636636 &len, 2) < 0) {
637---- linux-3.13.0-132.181.orig/net/unix/af_unix.c
638-+++ linux-3.13.0-132.181/net/unix/af_unix.c
637+--- linux-3.13.0-133.182.orig/net/unix/af_unix.c
638++++ linux-3.13.0-133.182/net/unix/af_unix.c
639639 @@ -1973,6 +1973,10 @@ static int unix_dgram_recvmsg(struct kio
640640 wake_up_interruptible_sync_poll(&u->peer_wait,
641641 POLLOUT | POLLWRNORM | POLLWRBAND);
@@ -647,8 +647,8 @@
647647 if (msg->msg_name)
648648 unix_copy_addr(msg, skb->sk);
649649
650---- linux-3.13.0-132.181.orig/security/Kconfig
651-+++ linux-3.13.0-132.181/security/Kconfig
650+--- linux-3.13.0-133.182.orig/security/Kconfig
651++++ linux-3.13.0-133.182/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.13.0-132.181.orig/security/Makefile
661-+++ linux-3.13.0-132.181/security/Makefile
660+--- linux-3.13.0-133.182.orig/security/Makefile
661++++ linux-3.13.0-133.182/security/Makefile
662662 @@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
663663 # Object integrity file lists
664664 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -666,8 +666,8 @@
666666 +
667667 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
668668 +obj-$(CONFIG_CCSECURITY) += ccsecurity/built-in.o
669---- linux-3.13.0-132.181.orig/security/security.c
670-+++ linux-3.13.0-132.181/security/security.c
669+--- linux-3.13.0-133.182.orig/security/security.c
670++++ linux-3.13.0-133.182/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 6608)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-3.18.diff (revision 6609)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 3.18.75.
1+This is TOMOYO Linux patch for kernel 3.18.77.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.75.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.77.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.75.orig/fs/exec.c
33-+++ linux-3.18.75/fs/exec.c
32+--- linux-3.18.77.orig/fs/exec.c
33++++ linux-3.18.77/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.75.orig/fs/open.c
44-+++ linux-3.18.75/fs/open.c
43+--- linux-3.18.77.orig/fs/open.c
44++++ linux-3.18.77/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.75.orig/fs/proc/version.c
55-+++ linux-3.18.75/fs/proc/version.c
54+--- linux-3.18.77.orig/fs/proc/version.c
55++++ linux-3.18.77/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.75 2017/10/16\n");
63++ printk(KERN_INFO "Hook version: 3.18.77 2017/10/23\n");
6464 + return 0;
6565 +}
6666 +fs_initcall(ccs_show_version);
67---- linux-3.18.75.orig/include/linux/init_task.h
68-+++ linux-3.18.75/include/linux/init_task.h
67+--- linux-3.18.77.orig/include/linux/init_task.h
68++++ linux-3.18.77/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.75.orig/include/linux/sched.h
93-+++ linux-3.18.75/include/linux/sched.h
92+--- linux-3.18.77.orig/include/linux/sched.h
93++++ linux-3.18.77/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.75.orig/include/linux/security.h
115-+++ linux-3.18.75/include/linux/security.h
114+--- linux-3.18.77.orig/include/linux/security.h
115++++ linux-3.18.77/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.75.orig/include/net/ip.h
328-+++ linux-3.18.75/include/net/ip.h
327+--- linux-3.18.77.orig/include/net/ip.h
328++++ linux-3.18.77/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.75.orig/kernel/fork.c
348-+++ linux-3.18.75/kernel/fork.c
347+--- linux-3.18.77.orig/kernel/fork.c
348++++ linux-3.18.77/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.75.orig/kernel/kexec.c
376-+++ linux-3.18.75/kernel/kexec.c
375+--- linux-3.18.77.orig/kernel/kexec.c
376++++ linux-3.18.77/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.75.orig/kernel/module.c
395-+++ linux-3.18.75/kernel/module.c
394+--- linux-3.18.77.orig/kernel/module.c
395++++ linux-3.18.77/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.75.orig/kernel/ptrace.c
423-+++ linux-3.18.75/kernel/ptrace.c
422+--- linux-3.18.77.orig/kernel/ptrace.c
423++++ linux-3.18.77/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.75.orig/kernel/reboot.c
449-+++ linux-3.18.75/kernel/reboot.c
448+--- linux-3.18.77.orig/kernel/reboot.c
449++++ linux-3.18.77/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.75.orig/kernel/sched/core.c
468-+++ linux-3.18.75/kernel/sched/core.c
467+--- linux-3.18.77.orig/kernel/sched/core.c
468++++ linux-3.18.77/kernel/sched/core.c
469469 @@ -3218,6 +3218,8 @@ int can_nice(const struct task_struct *p
470470 SYSCALL_DEFINE1(nice, int, increment)
471471 {
@@ -475,8 +475,8 @@
475475
476476 /*
477477 * Setpriority might change our priority at the same moment.
478---- linux-3.18.75.orig/kernel/signal.c
479-+++ linux-3.18.75/kernel/signal.c
478+--- linux-3.18.77.orig/kernel/signal.c
479++++ linux-3.18.77/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.18.75.orig/kernel/sys.c
526-+++ linux-3.18.75/kernel/sys.c
525+--- linux-3.18.77.orig/kernel/sys.c
526++++ linux-3.18.77/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.75.orig/kernel/time/ntp.c
557-+++ linux-3.18.75/kernel/time/ntp.c
556+--- linux-3.18.77.orig/kernel/time/ntp.c
557++++ linux-3.18.77/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.75.orig/net/ipv4/raw.c
592-+++ linux-3.18.75/net/ipv4/raw.c
591+--- linux-3.18.77.orig/net/ipv4/raw.c
592++++ linux-3.18.77/net/ipv4/raw.c
593593 @@ -714,6 +714,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.75.orig/net/ipv4/udp.c
605-+++ linux-3.18.75/net/ipv4/udp.c
604+--- linux-3.18.77.orig/net/ipv4/udp.c
605++++ linux-3.18.77/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.75.orig/net/ipv6/raw.c
618-+++ linux-3.18.75/net/ipv6/raw.c
617+--- linux-3.18.77.orig/net/ipv6/raw.c
618++++ linux-3.18.77/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.75.orig/net/ipv6/udp.c
631-+++ linux-3.18.75/net/ipv6/udp.c
630+--- linux-3.18.77.orig/net/ipv6/udp.c
631++++ linux-3.18.77/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.75.orig/net/socket.c
644-+++ linux-3.18.75/net/socket.c
643+--- linux-3.18.77.orig/net/socket.c
644++++ linux-3.18.77/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.75.orig/net/unix/af_unix.c
657-+++ linux-3.18.75/net/unix/af_unix.c
656+--- linux-3.18.77.orig/net/unix/af_unix.c
657++++ linux-3.18.77/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.75.orig/security/Kconfig
670-+++ linux-3.18.75/security/Kconfig
669+--- linux-3.18.77.orig/security/Kconfig
670++++ linux-3.18.77/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.75.orig/security/Makefile
680-+++ linux-3.18.75/security/Makefile
679+--- linux-3.18.77.orig/security/Makefile
680++++ linux-3.18.77/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.75.orig/security/security.c
689-+++ linux-3.18.75/security/security.c
688+--- linux-3.18.77.orig/security/security.c
689++++ linux-3.18.77/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.1.diff (revision 6608)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.1.diff (revision 6609)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.1.44.
1+This is TOMOYO Linux patch for kernel 4.1.45.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.44.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.45.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.44.orig/fs/exec.c
33-+++ linux-4.1.44/fs/exec.c
32+--- linux-4.1.45.orig/fs/exec.c
33++++ linux-4.1.45/fs/exec.c
3434 @@ -1488,7 +1488,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.44.orig/fs/open.c
44-+++ linux-4.1.44/fs/open.c
43+--- linux-4.1.45.orig/fs/open.c
44++++ linux-4.1.45/fs/open.c
4545 @@ -1113,6 +1113,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.44.orig/fs/proc/version.c
55-+++ linux-4.1.44/fs/proc/version.c
54+--- linux-4.1.45.orig/fs/proc/version.c
55++++ linux-4.1.45/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.44 2017/09/25\n");
63++ printk(KERN_INFO "Hook version: 4.1.45 2017/10/23\n");
6464 + return 0;
6565 +}
6666 +fs_initcall(ccs_show_version);
67---- linux-4.1.44.orig/include/linux/init_task.h
68-+++ linux-4.1.44/include/linux/init_task.h
67+--- linux-4.1.45.orig/include/linux/init_task.h
68++++ linux-4.1.45/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.44.orig/include/linux/sched.h
93-+++ linux-4.1.44/include/linux/sched.h
92+--- linux-4.1.45.orig/include/linux/sched.h
93++++ linux-4.1.45/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.44.orig/include/linux/security.h
115-+++ linux-4.1.44/include/linux/security.h
114+--- linux-4.1.45.orig/include/linux/security.h
115++++ linux-4.1.45/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.44.orig/include/net/ip.h
323-+++ linux-4.1.44/include/net/ip.h
322+--- linux-4.1.45.orig/include/net/ip.h
323++++ linux-4.1.45/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.44.orig/kernel/fork.c
343-+++ linux-4.1.44/kernel/fork.c
342+--- linux-4.1.45.orig/kernel/fork.c
343++++ linux-4.1.45/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.44.orig/kernel/kexec.c
371-+++ linux-4.1.44/kernel/kexec.c
370+--- linux-4.1.45.orig/kernel/kexec.c
371++++ linux-4.1.45/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.44.orig/kernel/module.c
390-+++ linux-4.1.44/kernel/module.c
389+--- linux-4.1.45.orig/kernel/module.c
390++++ linux-4.1.45/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.44.orig/kernel/ptrace.c
418-+++ linux-4.1.44/kernel/ptrace.c
417+--- linux-4.1.45.orig/kernel/ptrace.c
418++++ linux-4.1.45/kernel/ptrace.c
419419 @@ -1095,6 +1095,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.44.orig/kernel/reboot.c
444-+++ linux-4.1.44/kernel/reboot.c
443+--- linux-4.1.45.orig/kernel/reboot.c
444++++ linux-4.1.45/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.44.orig/kernel/sched/core.c
463-+++ linux-4.1.44/kernel/sched/core.c
462+--- linux-4.1.45.orig/kernel/sched/core.c
463++++ linux-4.1.45/kernel/sched/core.c
464464 @@ -3174,6 +3174,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.44.orig/kernel/signal.c
474-+++ linux-4.1.44/kernel/signal.c
473+--- linux-4.1.45.orig/kernel/signal.c
474++++ linux-4.1.45/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.44.orig/kernel/sys.c
521-+++ linux-4.1.44/kernel/sys.c
520+--- linux-4.1.45.orig/kernel/sys.c
521++++ linux-4.1.45/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.44.orig/kernel/time/ntp.c
552-+++ linux-4.1.44/kernel/time/ntp.c
551+--- linux-4.1.45.orig/kernel/time/ntp.c
552++++ linux-4.1.45/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.44.orig/net/ipv4/raw.c
587-+++ linux-4.1.44/net/ipv4/raw.c
586+--- linux-4.1.45.orig/net/ipv4/raw.c
587++++ linux-4.1.45/net/ipv4/raw.c
588588 @@ -732,6 +732,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.44.orig/net/ipv4/udp.c
600-+++ linux-4.1.44/net/ipv4/udp.c
599+--- linux-4.1.45.orig/net/ipv4/udp.c
600++++ linux-4.1.45/net/ipv4/udp.c
601601 @@ -1275,6 +1275,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.44.orig/net/ipv6/raw.c
613-+++ linux-4.1.44/net/ipv6/raw.c
612+--- linux-4.1.45.orig/net/ipv6/raw.c
613++++ linux-4.1.45/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.44.orig/net/ipv6/udp.c
626-+++ linux-4.1.44/net/ipv6/udp.c
625+--- linux-4.1.45.orig/net/ipv6/udp.c
626++++ linux-4.1.45/net/ipv6/udp.c
627627 @@ -414,6 +414,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.44.orig/net/socket.c
639-+++ linux-4.1.44/net/socket.c
638+--- linux-4.1.45.orig/net/socket.c
639++++ linux-4.1.45/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.44.orig/net/unix/af_unix.c
652-+++ linux-4.1.44/net/unix/af_unix.c
651+--- linux-4.1.45.orig/net/unix/af_unix.c
652++++ linux-4.1.45/net/unix/af_unix.c
653653 @@ -1983,6 +1983,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.44.orig/security/Kconfig
665-+++ linux-4.1.44/security/Kconfig
664+--- linux-4.1.45.orig/security/Kconfig
665++++ linux-4.1.45/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.44.orig/security/Makefile
675-+++ linux-4.1.44/security/Makefile
674+--- linux-4.1.45.orig/security/Makefile
675++++ linux-4.1.45/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.44.orig/security/security.c
684-+++ linux-4.1.44/security/security.c
683+--- linux-4.1.45.orig/security/security.c
684++++ linux-4.1.45/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.13.diff (revision 6608)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.13.diff (revision 6609)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.13.7.
1+This is TOMOYO Linux patch for kernel 4.13.9.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.13.7.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.13.9.tar.xz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,8 +28,8 @@
2828 security/security.c | 9 +++++-
2929 24 files changed, 153 insertions(+), 29 deletions(-)
3030
31---- linux-4.13.7.orig/fs/exec.c
32-+++ linux-4.13.7/fs/exec.c
31+--- linux-4.13.9.orig/fs/exec.c
32++++ linux-4.13.9/fs/exec.c
3333 @@ -1665,7 +1665,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.13.7.orig/fs/open.c
43-+++ linux-4.13.7/fs/open.c
42+--- linux-4.13.9.orig/fs/open.c
43++++ linux-4.13.9/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.13.7.orig/fs/proc/version.c
54-+++ linux-4.13.7/fs/proc/version.c
53+--- linux-4.13.9.orig/fs/proc/version.c
54++++ linux-4.13.9/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.13.7 2017/10/16\n");
62++ printk(KERN_INFO "Hook version: 4.13.9 2017/10/23\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.13.7.orig/include/linux/init_task.h
67-+++ linux-4.13.7/include/linux/init_task.h
66+--- linux-4.13.9.orig/include/linux/init_task.h
67++++ linux-4.13.9/include/linux/init_task.h
6868 @@ -225,6 +225,14 @@ extern struct cred init_cred;
6969 #define INIT_TASK_SECURITY
7070 #endif
@@ -88,8 +88,8 @@
8888 }
8989
9090
91---- linux-4.13.7.orig/include/linux/sched.h
92-+++ linux-4.13.7/include/linux/sched.h
91+--- linux-4.13.9.orig/include/linux/sched.h
92++++ linux-4.13.9/include/linux/sched.h
9393 @@ -32,6 +32,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.13.7.orig/include/linux/security.h
113-+++ linux-4.13.7/include/linux/security.h
112+--- linux-4.13.9.orig/include/linux/security.h
113++++ linux-4.13.9/include/linux/security.h
114114 @@ -56,6 +56,7 @@ struct msg_queue;
115115 struct xattr;
116116 struct xfrm_sec_ctx;
@@ -333,8 +333,8 @@
333333 }
334334 #endif /* CONFIG_SECURITY_PATH */
335335
336---- linux-4.13.7.orig/include/net/ip.h
337-+++ linux-4.13.7/include/net/ip.h
336+--- linux-4.13.9.orig/include/net/ip.h
337++++ linux-4.13.9/include/net/ip.h
338338 @@ -255,6 +255,8 @@ void inet_get_local_port_range(struct ne
339339 #ifdef CONFIG_SYSCTL
340340 static inline int inet_is_local_reserved_port(struct net *net, int port)
@@ -353,8 +353,8 @@
353353 return 0;
354354 }
355355
356---- linux-4.13.7.orig/kernel/kexec.c
357-+++ linux-4.13.7/kernel/kexec.c
356+--- linux-4.13.9.orig/kernel/kexec.c
357++++ linux-4.13.9/kernel/kexec.c
358358 @@ -17,7 +17,7 @@
359359 #include <linux/syscalls.h>
360360 #include <linux/vmalloc.h>
@@ -373,8 +373,8 @@
373373
374374 /*
375375 * Verify we have a legal set of flags
376---- linux-4.13.7.orig/kernel/module.c
377-+++ linux-4.13.7/kernel/module.c
376+--- linux-4.13.9.orig/kernel/module.c
377++++ linux-4.13.9/kernel/module.c
378378 @@ -66,6 +66,7 @@
379379 #include <linux/audit.h>
380380 #include <uapi/linux/module.h>
@@ -401,8 +401,8 @@
401401
402402 return 0;
403403 }
404---- linux-4.13.7.orig/kernel/ptrace.c
405-+++ linux-4.13.7/kernel/ptrace.c
404+--- linux-4.13.9.orig/kernel/ptrace.c
405++++ linux-4.13.9/kernel/ptrace.c
406406 @@ -1125,6 +1125,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
407407 {
408408 struct task_struct *child;
@@ -427,8 +427,8 @@
427427
428428 if (request == PTRACE_TRACEME) {
429429 ret = ptrace_traceme();
430---- linux-4.13.7.orig/kernel/reboot.c
431-+++ linux-4.13.7/kernel/reboot.c
430+--- linux-4.13.9.orig/kernel/reboot.c
431++++ linux-4.13.9/kernel/reboot.c
432432 @@ -16,6 +16,7 @@
433433 #include <linux/syscalls.h>
434434 #include <linux/syscore_ops.h>
@@ -446,8 +446,8 @@
446446
447447 /*
448448 * If pid namespaces are enabled and the current task is in a child
449---- linux-4.13.7.orig/kernel/sched/core.c
450-+++ linux-4.13.7/kernel/sched/core.c
449+--- linux-4.13.9.orig/kernel/sched/core.c
450++++ linux-4.13.9/kernel/sched/core.c
451451 @@ -3818,6 +3818,8 @@ int can_nice(const struct task_struct *p
452452 SYSCALL_DEFINE1(nice, int, increment)
453453 {
@@ -457,8 +457,8 @@
457457
458458 /*
459459 * Setpriority might change our priority at the same moment.
460---- linux-4.13.7.orig/kernel/signal.c
461-+++ linux-4.13.7/kernel/signal.c
460+--- linux-4.13.9.orig/kernel/signal.c
461++++ linux-4.13.9/kernel/signal.c
462462 @@ -2915,6 +2915,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait,
463463 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
464464 {
@@ -504,8 +504,8 @@
504504
505505 return do_send_specific(tgid, pid, sig, info);
506506 }
507---- linux-4.13.7.orig/kernel/sys.c
508-+++ linux-4.13.7/kernel/sys.c
507+--- linux-4.13.9.orig/kernel/sys.c
508++++ linux-4.13.9/kernel/sys.c
509509 @@ -190,6 +190,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
510510
511511 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -535,8 +535,8 @@
535535
536536 down_write(&uts_sem);
537537 errno = -EFAULT;
538---- linux-4.13.7.orig/kernel/time/ntp.c
539-+++ linux-4.13.7/kernel/time/ntp.c
538+--- linux-4.13.9.orig/kernel/time/ntp.c
539++++ linux-4.13.9/kernel/time/ntp.c
540540 @@ -17,6 +17,7 @@
541541 #include <linux/module.h>
542542 #include <linux/rtc.h>
@@ -570,8 +570,8 @@
570570
571571 if (txc->modes & ADJ_NANO) {
572572 struct timespec ts;
573---- linux-4.13.7.orig/net/ipv4/raw.c
574-+++ linux-4.13.7/net/ipv4/raw.c
573+--- linux-4.13.9.orig/net/ipv4/raw.c
574++++ linux-4.13.9/net/ipv4/raw.c
575575 @@ -755,6 +755,10 @@ static int raw_recvmsg(struct sock *sk,
576576 skb = skb_recv_datagram(sk, flags, noblock, &err);
577577 if (!skb)
@@ -583,8 +583,8 @@
583583
584584 copied = skb->len;
585585 if (len < copied) {
586---- linux-4.13.7.orig/net/ipv4/udp.c
587-+++ linux-4.13.7/net/ipv4/udp.c
586+--- linux-4.13.9.orig/net/ipv4/udp.c
587++++ linux-4.13.9/net/ipv4/udp.c
588588 @@ -1582,6 +1582,8 @@ try_again:
589589 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
590590 if (!skb)
@@ -594,8 +594,8 @@
594594
595595 ulen = udp_skb_len(skb);
596596 copied = len;
597---- linux-4.13.7.orig/net/ipv6/raw.c
598-+++ linux-4.13.7/net/ipv6/raw.c
597+--- linux-4.13.9.orig/net/ipv6/raw.c
598++++ linux-4.13.9/net/ipv6/raw.c
599599 @@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk
600600 skb = skb_recv_datagram(sk, flags, noblock, &err);
601601 if (!skb)
@@ -607,8 +607,8 @@
607607
608608 copied = skb->len;
609609 if (copied > len) {
610---- linux-4.13.7.orig/net/ipv6/udp.c
611-+++ linux-4.13.7/net/ipv6/udp.c
610+--- linux-4.13.9.orig/net/ipv6/udp.c
611++++ linux-4.13.9/net/ipv6/udp.c
612612 @@ -367,6 +367,8 @@ try_again:
613613 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
614614 if (!skb)
@@ -618,8 +618,8 @@
618618
619619 ulen = udp6_skb_len(skb);
620620 copied = len;
621---- linux-4.13.7.orig/net/socket.c
622-+++ linux-4.13.7/net/socket.c
621+--- linux-4.13.9.orig/net/socket.c
622++++ linux-4.13.9/net/socket.c
623623 @@ -1561,6 +1561,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
624624 if (err < 0)
625625 goto out_fd;
@@ -631,8 +631,8 @@
631631 if (upeer_sockaddr) {
632632 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
633633 &len, 2) < 0) {
634---- linux-4.13.7.orig/net/unix/af_unix.c
635-+++ linux-4.13.7/net/unix/af_unix.c
634+--- linux-4.13.9.orig/net/unix/af_unix.c
635++++ linux-4.13.9/net/unix/af_unix.c
636636 @@ -2152,6 +2152,10 @@ static int unix_dgram_recvmsg(struct soc
637637 POLLOUT | POLLWRNORM |
638638 POLLWRBAND);
@@ -652,8 +652,8 @@
652652 mutex_unlock(&u->iolock);
653653 out:
654654 return err;
655---- linux-4.13.7.orig/security/Kconfig
656-+++ linux-4.13.7/security/Kconfig
655+--- linux-4.13.9.orig/security/Kconfig
656++++ linux-4.13.9/security/Kconfig
657657 @@ -251,5 +251,7 @@ config DEFAULT_SECURITY
658658 default "apparmor" if DEFAULT_SECURITY_APPARMOR
659659 default "" if DEFAULT_SECURITY_DAC
@@ -662,8 +662,8 @@
662662 +
663663 endmenu
664664
665---- linux-4.13.7.orig/security/Makefile
666-+++ linux-4.13.7/security/Makefile
665+--- linux-4.13.9.orig/security/Makefile
666++++ linux-4.13.9/security/Makefile
667667 @@ -29,3 +29,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
668668 # Object integrity file lists
669669 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -671,8 +671,8 @@
671671 +
672672 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
673673 +obj-$(CONFIG_CCSECURITY) += ccsecurity/
674---- linux-4.13.7.orig/security/security.c
675-+++ linux-4.13.7/security/security.c
674+--- linux-4.13.9.orig/security/security.c
675++++ linux-4.13.9/security/security.c
676676 @@ -986,12 +986,19 @@ int security_task_create(unsigned long c
677677
678678 int security_task_alloc(struct task_struct *task, unsigned long clone_flags)
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.14.diff (revision 6608)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.14.diff (revision 6609)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.14-rc5.
1+This is TOMOYO Linux patch for kernel 4.14-rc6.
22
3-Source code for this patch is https://git.kernel.org/torvalds/t/linux-4.14-rc5.tar.gz
3+Source code for this patch is https://git.kernel.org/torvalds/t/linux-4.14-rc6.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, 153 insertions(+), 29 deletions(-)
3030
31---- linux-4.14-rc5.orig/fs/exec.c
32-+++ linux-4.14-rc5/fs/exec.c
31+--- linux-4.14-rc6.orig/fs/exec.c
32++++ linux-4.14-rc6/fs/exec.c
3333 @@ -1673,7 +1673,7 @@ static int exec_binprm(struct linux_binp
3434 old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
3535 rcu_read_unlock();
@@ -39,8 +39,8 @@
3939 if (ret >= 0) {
4040 audit_bprm(bprm);
4141 trace_sched_process_exec(current, old_pid, bprm);
42---- linux-4.14-rc5.orig/fs/open.c
43-+++ linux-4.14-rc5/fs/open.c
42+--- linux-4.14-rc6.orig/fs/open.c
43++++ linux-4.14-rc6/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-rc5.orig/fs/proc/version.c
54-+++ linux-4.14-rc5/fs/proc/version.c
53+--- linux-4.14-rc6.orig/fs/proc/version.c
54++++ linux-4.14-rc6/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.14-rc5 2017/10/16\n");
62++ printk(KERN_INFO "Hook version: 4.14-rc6 2017/10/23\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.14-rc5.orig/include/linux/init_task.h
67-+++ linux-4.14-rc5/include/linux/init_task.h
66+--- linux-4.14-rc6.orig/include/linux/init_task.h
67++++ linux-4.14-rc6/include/linux/init_task.h
6868 @@ -218,6 +218,14 @@ extern struct cred init_cred;
6969 #define INIT_TASK_SECURITY
7070 #endif
@@ -88,8 +88,8 @@
8888 }
8989
9090
91---- linux-4.14-rc5.orig/include/linux/sched.h
92-+++ linux-4.14-rc5/include/linux/sched.h
91+--- linux-4.14-rc6.orig/include/linux/sched.h
92++++ linux-4.14-rc6/include/linux/sched.h
9393 @@ -32,6 +32,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-rc5.orig/include/linux/security.h
113-+++ linux-4.14-rc5/include/linux/security.h
112+--- linux-4.14-rc6.orig/include/linux/security.h
113++++ linux-4.14-rc6/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-rc5.orig/include/net/ip.h
335-+++ linux-4.14-rc5/include/net/ip.h
334+--- linux-4.14-rc6.orig/include/net/ip.h
335++++ linux-4.14-rc6/include/net/ip.h
336336 @@ -265,6 +265,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-rc5.orig/kernel/kexec.c
355-+++ linux-4.14-rc5/kernel/kexec.c
354+--- linux-4.14-rc6.orig/kernel/kexec.c
355++++ linux-4.14-rc6/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-rc5.orig/kernel/module.c
375-+++ linux-4.14-rc5/kernel/module.c
374+--- linux-4.14-rc6.orig/kernel/module.c
375++++ linux-4.14-rc6/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-rc5.orig/kernel/ptrace.c
403-+++ linux-4.14-rc5/kernel/ptrace.c
402+--- linux-4.14-rc6.orig/kernel/ptrace.c
403++++ linux-4.14-rc6/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-rc5.orig/kernel/reboot.c
429-+++ linux-4.14-rc5/kernel/reboot.c
428+--- linux-4.14-rc6.orig/kernel/reboot.c
429++++ linux-4.14-rc6/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-rc5.orig/kernel/sched/core.c
448-+++ linux-4.14-rc5/kernel/sched/core.c
447+--- linux-4.14-rc6.orig/kernel/sched/core.c
448++++ linux-4.14-rc6/kernel/sched/core.c
449449 @@ -3852,6 +3852,8 @@ int can_nice(const struct task_struct *p
450450 SYSCALL_DEFINE1(nice, int, increment)
451451 {
@@ -455,8 +455,8 @@
455455
456456 /*
457457 * Setpriority might change our priority at the same moment.
458---- linux-4.14-rc5.orig/kernel/signal.c
459-+++ linux-4.14-rc5/kernel/signal.c
458+--- linux-4.14-rc6.orig/kernel/signal.c
459++++ linux-4.14-rc6/kernel/signal.c
460460 @@ -2953,6 +2953,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-rc5.orig/kernel/sys.c
506-+++ linux-4.14-rc5/kernel/sys.c
505+--- linux-4.14-rc6.orig/kernel/sys.c
506++++ linux-4.14-rc6/kernel/sys.c
507507 @@ -190,6 +190,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-rc5.orig/kernel/time/ntp.c
537-+++ linux-4.14-rc5/kernel/time/ntp.c
536+--- linux-4.14-rc6.orig/kernel/time/ntp.c
537++++ linux-4.14-rc6/kernel/time/ntp.c
538538 @@ -17,6 +17,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-rc5.orig/net/ipv4/raw.c
572-+++ linux-4.14-rc5/net/ipv4/raw.c
571+--- linux-4.14-rc6.orig/net/ipv4/raw.c
572++++ linux-4.14-rc6/net/ipv4/raw.c
573573 @@ -761,6 +761,10 @@ static int raw_recvmsg(struct sock *sk,
574574 skb = skb_recv_datagram(sk, flags, noblock, &err);
575575 if (!skb)
@@ -581,9 +581,9 @@
581581
582582 copied = skb->len;
583583 if (len < copied) {
584---- linux-4.14-rc5.orig/net/ipv4/udp.c
585-+++ linux-4.14-rc5/net/ipv4/udp.c
586-@@ -1593,6 +1593,8 @@ try_again:
584+--- linux-4.14-rc6.orig/net/ipv4/udp.c
585++++ linux-4.14-rc6/net/ipv4/udp.c
586+@@ -1590,6 +1590,8 @@ try_again:
587587 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
588588 if (!skb)
589589 return err;
@@ -592,8 +592,8 @@
592592
593593 ulen = udp_skb_len(skb);
594594 copied = len;
595---- linux-4.14-rc5.orig/net/ipv6/raw.c
596-+++ linux-4.14-rc5/net/ipv6/raw.c
595+--- linux-4.14-rc6.orig/net/ipv6/raw.c
596++++ linux-4.14-rc6/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-rc5.orig/net/ipv6/udp.c
609-+++ linux-4.14-rc5/net/ipv6/udp.c
608+--- linux-4.14-rc6.orig/net/ipv6/udp.c
609++++ linux-4.14-rc6/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-rc5.orig/net/socket.c
620-+++ linux-4.14-rc5/net/socket.c
619+--- linux-4.14-rc6.orig/net/socket.c
620++++ linux-4.14-rc6/net/socket.c
621621 @@ -1575,6 +1575,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-rc5.orig/net/unix/af_unix.c
633-+++ linux-4.14-rc5/net/unix/af_unix.c
632+--- linux-4.14-rc6.orig/net/unix/af_unix.c
633++++ linux-4.14-rc6/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-rc5.orig/security/Kconfig
654-+++ linux-4.14-rc5/security/Kconfig
653+--- linux-4.14-rc6.orig/security/Kconfig
654++++ linux-4.14-rc6/security/Kconfig
655655 @@ -251,5 +251,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-rc5.orig/security/Makefile
664-+++ linux-4.14-rc5/security/Makefile
663+--- linux-4.14-rc6.orig/security/Makefile
664++++ linux-4.14-rc6/security/Makefile
665665 @@ -29,3 +29,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-rc5.orig/security/security.c
673-+++ linux-4.14-rc5/security/security.c
672+--- linux-4.14-rc6.orig/security/security.c
673++++ linux-4.14-rc6/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.4.diff (revision 6608)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.4.diff (revision 6609)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.4.92.
1+This is TOMOYO Linux patch for kernel 4.4.94.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.92.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.94.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.92.orig/fs/exec.c
32-+++ linux-4.4.92/fs/exec.c
31+--- linux-4.4.94.orig/fs/exec.c
32++++ linux-4.4.94/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.92.orig/fs/open.c
43-+++ linux-4.4.92/fs/open.c
42+--- linux-4.4.94.orig/fs/open.c
43++++ linux-4.4.94/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.92.orig/fs/proc/version.c
54-+++ linux-4.4.92/fs/proc/version.c
53+--- linux-4.4.94.orig/fs/proc/version.c
54++++ linux-4.4.94/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.92 2017/10/16\n");
62++ printk(KERN_INFO "Hook version: 4.4.94 2017/10/23\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.4.92.orig/include/linux/init_task.h
67-+++ linux-4.4.92/include/linux/init_task.h
66+--- linux-4.4.94.orig/include/linux/init_task.h
67++++ linux-4.4.94/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.92.orig/include/linux/sched.h
92-+++ linux-4.4.92/include/linux/sched.h
91+--- linux-4.4.94.orig/include/linux/sched.h
92++++ linux-4.4.94/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.92.orig/include/linux/security.h
114-+++ linux-4.4.92/include/linux/security.h
113+--- linux-4.4.94.orig/include/linux/security.h
114++++ linux-4.4.94/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.92.orig/include/net/ip.h
322-+++ linux-4.4.92/include/net/ip.h
321+--- linux-4.4.94.orig/include/net/ip.h
322++++ linux-4.4.94/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.92.orig/kernel/fork.c
342-+++ linux-4.4.92/kernel/fork.c
341+--- linux-4.4.94.orig/kernel/fork.c
342++++ linux-4.4.94/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.92.orig/kernel/kexec.c
370-+++ linux-4.4.92/kernel/kexec.c
369+--- linux-4.4.94.orig/kernel/kexec.c
370++++ linux-4.4.94/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.92.orig/kernel/module.c
390-+++ linux-4.4.92/kernel/module.c
389+--- linux-4.4.94.orig/kernel/module.c
390++++ linux-4.4.94/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.92.orig/kernel/ptrace.c
418-+++ linux-4.4.92/kernel/ptrace.c
417+--- linux-4.4.94.orig/kernel/ptrace.c
418++++ linux-4.4.94/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.92.orig/kernel/reboot.c
444-+++ linux-4.4.92/kernel/reboot.c
443+--- linux-4.4.94.orig/kernel/reboot.c
444++++ linux-4.4.94/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.92.orig/kernel/sched/core.c
463-+++ linux-4.4.92/kernel/sched/core.c
462+--- linux-4.4.94.orig/kernel/sched/core.c
463++++ linux-4.4.94/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.92.orig/kernel/signal.c
474-+++ linux-4.4.92/kernel/signal.c
473+--- linux-4.4.94.orig/kernel/signal.c
474++++ linux-4.4.94/kernel/signal.c
475475 @@ -2855,6 +2855,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.92.orig/kernel/sys.c
521-+++ linux-4.4.92/kernel/sys.c
520+--- linux-4.4.94.orig/kernel/sys.c
521++++ linux-4.4.94/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.92.orig/kernel/time/ntp.c
552-+++ linux-4.4.92/kernel/time/ntp.c
551+--- linux-4.4.94.orig/kernel/time/ntp.c
552++++ linux-4.4.94/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.92.orig/net/ipv4/raw.c
587-+++ linux-4.4.92/net/ipv4/raw.c
586+--- linux-4.4.94.orig/net/ipv4/raw.c
587++++ linux-4.4.94/net/ipv4/raw.c
588588 @@ -742,6 +742,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.92.orig/net/ipv4/udp.c
600-+++ linux-4.4.92/net/ipv4/udp.c
599+--- linux-4.4.94.orig/net/ipv4/udp.c
600++++ linux-4.4.94/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.92.orig/net/ipv6/raw.c
613-+++ linux-4.4.92/net/ipv6/raw.c
612+--- linux-4.4.94.orig/net/ipv6/raw.c
613++++ linux-4.4.94/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.92.orig/net/ipv6/udp.c
626-+++ linux-4.4.92/net/ipv6/udp.c
625+--- linux-4.4.94.orig/net/ipv6/udp.c
626++++ linux-4.4.94/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.92.orig/net/socket.c
639-+++ linux-4.4.92/net/socket.c
638+--- linux-4.4.94.orig/net/socket.c
639++++ linux-4.4.94/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.92.orig/net/unix/af_unix.c
652-+++ linux-4.4.92/net/unix/af_unix.c
651+--- linux-4.4.94.orig/net/unix/af_unix.c
652++++ linux-4.4.94/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.92.orig/security/Kconfig
665-+++ linux-4.4.92/security/Kconfig
664+--- linux-4.4.94.orig/security/Kconfig
665++++ linux-4.4.94/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.92.orig/security/Makefile
675-+++ linux-4.4.92/security/Makefile
674+--- linux-4.4.94.orig/security/Makefile
675++++ linux-4.4.94/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 6608)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.9.diff (revision 6609)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.9.56.
1+This is TOMOYO Linux patch for kernel 4.9.58.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.56.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.58.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.56.orig/fs/exec.c
32-+++ linux-4.9.56/fs/exec.c
31+--- linux-4.9.58.orig/fs/exec.c
32++++ linux-4.9.58/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.56.orig/fs/open.c
43-+++ linux-4.9.56/fs/open.c
42+--- linux-4.9.58.orig/fs/open.c
43++++ linux-4.9.58/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.56.orig/fs/proc/version.c
54-+++ linux-4.9.56/fs/proc/version.c
53+--- linux-4.9.58.orig/fs/proc/version.c
54++++ linux-4.9.58/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.56 2017/10/16\n");
62++ printk(KERN_INFO "Hook version: 4.9.58 2017/10/23\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.9.56.orig/include/linux/init_task.h
67-+++ linux-4.9.56/include/linux/init_task.h
66+--- linux-4.9.58.orig/include/linux/init_task.h
67++++ linux-4.9.58/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.56.orig/include/linux/sched.h
92-+++ linux-4.9.56/include/linux/sched.h
91+--- linux-4.9.58.orig/include/linux/sched.h
92++++ linux-4.9.58/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.56.orig/include/linux/security.h
114-+++ linux-4.9.56/include/linux/security.h
113+--- linux-4.9.58.orig/include/linux/security.h
114++++ linux-4.9.58/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.56.orig/include/net/ip.h
322-+++ linux-4.9.56/include/net/ip.h
321+--- linux-4.9.58.orig/include/net/ip.h
322++++ linux-4.9.58/include/net/ip.h
323323 @@ -252,6 +252,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.56.orig/kernel/fork.c
342-+++ linux-4.9.56/kernel/fork.c
341+--- linux-4.9.58.orig/kernel/fork.c
342++++ linux-4.9.58/kernel/fork.c
343343 @@ -390,6 +390,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.56.orig/kernel/kexec.c
370-+++ linux-4.9.56/kernel/kexec.c
369+--- linux-4.9.58.orig/kernel/kexec.c
370++++ linux-4.9.58/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.56.orig/kernel/module.c
390-+++ linux-4.9.56/kernel/module.c
389+--- linux-4.9.58.orig/kernel/module.c
390++++ linux-4.9.58/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.56.orig/kernel/ptrace.c
418-+++ linux-4.9.56/kernel/ptrace.c
417+--- linux-4.9.58.orig/kernel/ptrace.c
418++++ linux-4.9.58/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.56.orig/kernel/reboot.c
444-+++ linux-4.9.56/kernel/reboot.c
443+--- linux-4.9.58.orig/kernel/reboot.c
444++++ linux-4.9.58/kernel/reboot.c
445445 @@ -16,6 +16,7 @@
446446 #include <linux/syscalls.h>
447447 #include <linux/syscore_ops.h>
@@ -459,9 +459,9 @@
459459
460460 /*
461461 * If pid namespaces are enabled and the current task is in a child
462---- linux-4.9.56.orig/kernel/sched/core.c
463-+++ linux-4.9.56/kernel/sched/core.c
464-@@ -3811,6 +3811,8 @@ int can_nice(const struct task_struct *p
462+--- linux-4.9.58.orig/kernel/sched/core.c
463++++ linux-4.9.58/kernel/sched/core.c
464+@@ -3812,6 +3812,8 @@ int can_nice(const struct task_struct *p
465465 SYSCALL_DEFINE1(nice, int, increment)
466466 {
467467 long nice, retval;
@@ -470,8 +470,8 @@
470470
471471 /*
472472 * Setpriority might change our priority at the same moment.
473---- linux-4.9.56.orig/kernel/signal.c
474-+++ linux-4.9.56/kernel/signal.c
473+--- linux-4.9.58.orig/kernel/signal.c
474++++ linux-4.9.58/kernel/signal.c
475475 @@ -2855,6 +2855,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.56.orig/kernel/sys.c
521-+++ linux-4.9.56/kernel/sys.c
520+--- linux-4.9.58.orig/kernel/sys.c
521++++ linux-4.9.58/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.56.orig/kernel/time/ntp.c
552-+++ linux-4.9.56/kernel/time/ntp.c
551+--- linux-4.9.58.orig/kernel/time/ntp.c
552++++ linux-4.9.58/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.56.orig/net/ipv4/raw.c
587-+++ linux-4.9.56/net/ipv4/raw.c
586+--- linux-4.9.58.orig/net/ipv4/raw.c
587++++ linux-4.9.58/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.9.56.orig/net/ipv4/udp.c
600-+++ linux-4.9.56/net/ipv4/udp.c
599+--- linux-4.9.58.orig/net/ipv4/udp.c
600++++ linux-4.9.58/net/ipv4/udp.c
601601 @@ -1267,6 +1267,8 @@ try_again:
602602 &peeked, &off, &err);
603603 if (!skb)
@@ -607,8 +607,8 @@
607607
608608 ulen = skb->len;
609609 copied = len;
610---- linux-4.9.56.orig/net/ipv6/raw.c
611-+++ linux-4.9.56/net/ipv6/raw.c
610+--- linux-4.9.58.orig/net/ipv6/raw.c
611++++ linux-4.9.58/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.56.orig/net/ipv6/udp.c
624-+++ linux-4.9.56/net/ipv6/udp.c
623+--- linux-4.9.58.orig/net/ipv6/udp.c
624++++ linux-4.9.58/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.56.orig/net/socket.c
635-+++ linux-4.9.56/net/socket.c
634+--- linux-4.9.58.orig/net/socket.c
635++++ linux-4.9.58/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.56.orig/net/unix/af_unix.c
648-+++ linux-4.9.56/net/unix/af_unix.c
647+--- linux-4.9.58.orig/net/unix/af_unix.c
648++++ linux-4.9.58/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.56.orig/security/Kconfig
669-+++ linux-4.9.56/security/Kconfig
668+--- linux-4.9.58.orig/security/Kconfig
669++++ linux-4.9.58/security/Kconfig
670670 @@ -204,5 +204,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.56.orig/security/Makefile
679-+++ linux-4.9.56/security/Makefile
678+--- linux-4.9.58.orig/security/Makefile
679++++ linux-4.9.58/security/Makefile
680680 @@ -29,3 +29,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
681681 # Object integrity file lists
682682 subdir-$(CONFIG_INTEGRITY) += integrity
旧リポジトリブラウザで表示