• R/O
  • SSH
  • HTTPS

tomoyo: コミット


コミットメタ情報

リビジョン6582 (tree)
日時2017-06-20 20:23:46
作者kumaneko

ログメッセージ

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

変更サマリ

差分

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-3.10.diff (revision 6581)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-3.10.diff (revision 6582)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 3.10.105.
1+This is TOMOYO Linux patch for kernel 3.10.106.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.10.105.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.10.106.tar.xz
44 ---
55 fs/exec.c | 2
66 fs/open.c | 2
@@ -28,9 +28,9 @@
2828 security/security.c | 107 ++++++++++++++++++++++++++++++++++++++++------
2929 24 files changed, 235 insertions(+), 37 deletions(-)
3030
31---- linux-3.10.105.orig/fs/exec.c
32-+++ linux-3.10.105/fs/exec.c
33-@@ -1560,7 +1560,7 @@ static int do_execve_common(const char *
31+--- linux-3.10.106.orig/fs/exec.c
32++++ linux-3.10.106/fs/exec.c
33+@@ -1566,7 +1566,7 @@ static int do_execve_common(const char *
3434 if (retval < 0)
3535 goto out;
3636
@@ -39,8 +39,8 @@
3939 if (retval < 0)
4040 goto out;
4141
42---- linux-3.10.105.orig/fs/open.c
43-+++ linux-3.10.105/fs/open.c
42+--- linux-3.10.106.orig/fs/open.c
43++++ linux-3.10.106/fs/open.c
4444 @@ -1021,6 +1021,8 @@ EXPORT_SYMBOL(sys_close);
4545 */
4646 SYSCALL_DEFINE0(vhangup)
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-3.10.105.orig/fs/proc/version.c
54-+++ linux-3.10.105/fs/proc/version.c
53+--- linux-3.10.106.orig/fs/proc/version.c
54++++ linux-3.10.106/fs/proc/version.c
5555 @@ -32,3 +32,10 @@ static int __init proc_version_init(void
5656 return 0;
5757 }
@@ -59,12 +59,12 @@
5959 +
6060 +static int __init ccs_show_version(void)
6161 +{
62-+ printk(KERN_INFO "Hook version: 3.10.105 2017/02/10\n");
62++ printk(KERN_INFO "Hook version: 3.10.106 2017/06/20\n");
6363 + return 0;
6464 +}
6565 +module_init(ccs_show_version);
66---- linux-3.10.105.orig/include/linux/init_task.h
67-+++ linux-3.10.105/include/linux/init_task.h
66+--- linux-3.10.106.orig/include/linux/init_task.h
67++++ linux-3.10.106/include/linux/init_task.h
6868 @@ -155,6 +155,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.10.105.orig/include/linux/sched.h
92-+++ linux-3.10.105/include/linux/sched.h
91+--- linux-3.10.106.orig/include/linux/sched.h
92++++ linux-3.10.106/include/linux/sched.h
9393 @@ -4,6 +4,8 @@
9494 #include <uapi/linux/sched.h>
9595
@@ -110,8 +110,8 @@
110110 };
111111
112112 /* Future-safe accessor for struct task_struct's cpus_allowed. */
113---- linux-3.10.105.orig/include/linux/security.h
114-+++ linux-3.10.105/include/linux/security.h
113+--- linux-3.10.106.orig/include/linux/security.h
114++++ linux-3.10.106/include/linux/security.h
115115 @@ -52,6 +52,7 @@ struct msg_queue;
116116 struct xattr;
117117 struct xfrm_sec_ctx;
@@ -313,8 +313,8 @@
313313 }
314314 #endif /* CONFIG_SECURITY_PATH */
315315
316---- linux-3.10.105.orig/include/net/ip.h
317-+++ linux-3.10.105/include/net/ip.h
316+--- linux-3.10.106.orig/include/net/ip.h
317++++ linux-3.10.106/include/net/ip.h
318318 @@ -207,6 +207,8 @@ extern void inet_get_local_port_range(in
319319 extern unsigned long *sysctl_local_reserved_ports;
320320 static inline int inet_is_reserved_local_port(int port)
@@ -324,8 +324,8 @@
324324 return test_bit(port, sysctl_local_reserved_ports);
325325 }
326326
327---- linux-3.10.105.orig/kernel/fork.c
328-+++ linux-3.10.105/kernel/fork.c
327+--- linux-3.10.106.orig/kernel/fork.c
328++++ linux-3.10.106/kernel/fork.c
329329 @@ -242,6 +242,7 @@ void __put_task_struct(struct task_struc
330330 delayacct_tsk_free(tsk);
331331 put_signal_struct(tsk->signal);
@@ -352,8 +352,8 @@
352352 bad_fork_cleanup_perf:
353353 perf_event_free_task(p);
354354 bad_fork_cleanup_policy:
355---- linux-3.10.105.orig/kernel/kexec.c
356-+++ linux-3.10.105/kernel/kexec.c
355+--- linux-3.10.106.orig/kernel/kexec.c
356++++ linux-3.10.106/kernel/kexec.c
357357 @@ -37,6 +37,7 @@
358358 #include <asm/uaccess.h>
359359 #include <asm/io.h>
@@ -371,8 +371,8 @@
371371
372372 /*
373373 * Verify we have a legal set of flags
374---- linux-3.10.105.orig/kernel/module.c
375-+++ linux-3.10.105/kernel/module.c
374+--- linux-3.10.106.orig/kernel/module.c
375++++ linux-3.10.106/kernel/module.c
376376 @@ -63,6 +63,7 @@
377377 #include <linux/fips.h>
378378 #include <uapi/linux/module.h>
@@ -399,9 +399,9 @@
399399
400400 return 0;
401401 }
402---- linux-3.10.105.orig/kernel/ptrace.c
403-+++ linux-3.10.105/kernel/ptrace.c
404-@@ -1041,6 +1041,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
402+--- linux-3.10.106.orig/kernel/ptrace.c
403++++ linux-3.10.106/kernel/ptrace.c
404+@@ -1047,6 +1047,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
405405 {
406406 struct task_struct *child;
407407 long ret;
@@ -413,7 +413,7 @@
413413
414414 if (request == PTRACE_TRACEME) {
415415 ret = ptrace_traceme();
416-@@ -1188,6 +1193,11 @@ asmlinkage long compat_sys_ptrace(compat
416+@@ -1194,6 +1199,11 @@ asmlinkage long compat_sys_ptrace(compat
417417 {
418418 struct task_struct *child;
419419 long ret;
@@ -425,9 +425,9 @@
425425
426426 if (request == PTRACE_TRACEME) {
427427 ret = ptrace_traceme();
428---- linux-3.10.105.orig/kernel/sched/core.c
429-+++ linux-3.10.105/kernel/sched/core.c
430-@@ -3772,6 +3772,8 @@ int can_nice(const struct task_struct *p
428+--- linux-3.10.106.orig/kernel/sched/core.c
429++++ linux-3.10.106/kernel/sched/core.c
430+@@ -3770,6 +3770,8 @@ int can_nice(const struct task_struct *p
431431 SYSCALL_DEFINE1(nice, int, increment)
432432 {
433433 long nice, retval;
@@ -436,8 +436,8 @@
436436
437437 /*
438438 * Setpriority might change our priority at the same moment.
439---- linux-3.10.105.orig/kernel/signal.c
440-+++ linux-3.10.105/kernel/signal.c
439+--- linux-3.10.106.orig/kernel/signal.c
440++++ linux-3.10.106/kernel/signal.c
441441 @@ -2910,6 +2910,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
442442 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
443443 {
@@ -483,8 +483,8 @@
483483
484484 return do_send_specific(tgid, pid, sig, info);
485485 }
486---- linux-3.10.105.orig/kernel/sys.c
487-+++ linux-3.10.105/kernel/sys.c
486+--- linux-3.10.106.orig/kernel/sys.c
487++++ linux-3.10.106/kernel/sys.c
488488 @@ -186,6 +186,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
489489
490490 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -523,8 +523,8 @@
523523
524524 down_write(&uts_sem);
525525 errno = -EFAULT;
526---- linux-3.10.105.orig/kernel/time/ntp.c
527-+++ linux-3.10.105/kernel/time/ntp.c
526+--- linux-3.10.106.orig/kernel/time/ntp.c
527++++ linux-3.10.106/kernel/time/ntp.c
528528 @@ -16,6 +16,7 @@
529529 #include <linux/mm.h>
530530 #include <linux/module.h>
@@ -558,8 +558,8 @@
558558
559559 /*
560560 * Check for potential multiplication overflows that can
561---- linux-3.10.105.orig/net/ipv4/raw.c
562-+++ linux-3.10.105/net/ipv4/raw.c
561+--- linux-3.10.106.orig/net/ipv4/raw.c
562++++ linux-3.10.106/net/ipv4/raw.c
563563 @@ -700,6 +700,10 @@ static int raw_recvmsg(struct kiocb *ioc
564564 skb = skb_recv_datagram(sk, flags, noblock, &err);
565565 if (!skb)
@@ -571,8 +571,8 @@
571571
572572 copied = skb->len;
573573 if (len < copied) {
574---- linux-3.10.105.orig/net/ipv4/udp.c
575-+++ linux-3.10.105/net/ipv4/udp.c
574+--- linux-3.10.106.orig/net/ipv4/udp.c
575++++ linux-3.10.106/net/ipv4/udp.c
576576 @@ -1219,6 +1219,10 @@ try_again:
577577 &peeked, &off, &err);
578578 if (!skb)
@@ -584,8 +584,8 @@
584584
585585 ulen = skb->len - sizeof(struct udphdr);
586586 copied = len;
587---- linux-3.10.105.orig/net/ipv6/raw.c
588-+++ linux-3.10.105/net/ipv6/raw.c
587+--- linux-3.10.106.orig/net/ipv6/raw.c
588++++ linux-3.10.106/net/ipv6/raw.c
589589 @@ -468,6 +468,10 @@ static int rawv6_recvmsg(struct kiocb *i
590590 skb = skb_recv_datagram(sk, flags, noblock, &err);
591591 if (!skb)
@@ -597,8 +597,8 @@
597597
598598 copied = skb->len;
599599 if (copied > len) {
600---- linux-3.10.105.orig/net/ipv6/udp.c
601-+++ linux-3.10.105/net/ipv6/udp.c
600+--- linux-3.10.106.orig/net/ipv6/udp.c
601++++ linux-3.10.106/net/ipv6/udp.c
602602 @@ -385,6 +385,10 @@ try_again:
603603 &peeked, &off, &err);
604604 if (!skb)
@@ -610,8 +610,8 @@
610610
611611 ulen = skb->len - sizeof(struct udphdr);
612612 copied = len;
613---- linux-3.10.105.orig/net/socket.c
614-+++ linux-3.10.105/net/socket.c
613+--- linux-3.10.106.orig/net/socket.c
614++++ linux-3.10.106/net/socket.c
615615 @@ -1611,6 +1611,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
616616 if (err < 0)
617617 goto out_fd;
@@ -623,8 +623,8 @@
623623 if (upeer_sockaddr) {
624624 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
625625 &len, 2) < 0) {
626---- linux-3.10.105.orig/net/unix/af_unix.c
627-+++ linux-3.10.105/net/unix/af_unix.c
626+--- linux-3.10.106.orig/net/unix/af_unix.c
627++++ linux-3.10.106/net/unix/af_unix.c
628628 @@ -1975,6 +1975,10 @@ static int unix_dgram_recvmsg(struct kio
629629 wake_up_interruptible_sync_poll(&u->peer_wait,
630630 POLLOUT | POLLWRNORM | POLLWRBAND);
@@ -636,8 +636,8 @@
636636 if (msg->msg_name)
637637 unix_copy_addr(msg, skb->sk);
638638
639---- linux-3.10.105.orig/security/Kconfig
640-+++ linux-3.10.105/security/Kconfig
639+--- linux-3.10.106.orig/security/Kconfig
640++++ linux-3.10.106/security/Kconfig
641641 @@ -167,5 +167,7 @@ config DEFAULT_SECURITY
642642 default "yama" if DEFAULT_SECURITY_YAMA
643643 default "" if DEFAULT_SECURITY_DAC
@@ -646,8 +646,8 @@
646646 +
647647 endmenu
648648
649---- linux-3.10.105.orig/security/Makefile
650-+++ linux-3.10.105/security/Makefile
649+--- linux-3.10.106.orig/security/Makefile
650++++ linux-3.10.106/security/Makefile
651651 @@ -28,3 +28,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
652652 # Object integrity file lists
653653 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -655,8 +655,8 @@
655655 +
656656 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
657657 +obj-$(CONFIG_CCSECURITY) += ccsecurity/built-in.o
658---- linux-3.10.105.orig/security/security.c
659-+++ linux-3.10.105/security/security.c
658+--- linux-3.10.106.orig/security/security.c
659++++ linux-3.10.106/security/security.c
660660 @@ -202,7 +202,10 @@ int security_syslog(int type)
661661
662662 int security_settime(const struct timespec *ts, const struct timezone *tz)
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-3.13-ubuntu-14.04.diff (revision 6581)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-3.13-ubuntu-14.04.diff (revision 6582)
@@ -29,9 +29,9 @@
2929 security/security.c | 107 ++++++++++++++++++++++++++++++++++++++++------
3030 25 files changed, 236 insertions(+), 37 deletions(-)
3131
32---- linux-3.13.0-119.166.orig/fs/exec.c
33-+++ linux-3.13.0-119.166/fs/exec.c
34-@@ -1456,7 +1456,7 @@ static int exec_binprm(struct linux_binp
32+--- linux-3.13.0-121.170.orig/fs/exec.c
33++++ linux-3.13.0-121.170/fs/exec.c
34+@@ -1462,7 +1462,7 @@ static int exec_binprm(struct linux_binp
3535 old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
3636 rcu_read_unlock();
3737
@@ -40,8 +40,8 @@
4040 if (ret >= 0) {
4141 audit_bprm(bprm);
4242 trace_sched_process_exec(current, old_pid, bprm);
43---- linux-3.13.0-119.166.orig/fs/open.c
44-+++ linux-3.13.0-119.166/fs/open.c
43+--- linux-3.13.0-121.170.orig/fs/open.c
44++++ linux-3.13.0-121.170/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-119.166.orig/fs/proc/version.c
55-+++ linux-3.13.0-119.166/fs/proc/version.c
54+--- linux-3.13.0-121.170.orig/fs/proc/version.c
55++++ linux-3.13.0-121.170/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-119.166 2017/05/26\n");
63++ printk(KERN_INFO "Hook version: 3.13.0-121.170 2017/06/20\n");
6464 + return 0;
6565 +}
6666 +module_init(ccs_show_version);
67---- linux-3.13.0-119.166.orig/include/linux/init_task.h
68-+++ linux-3.13.0-119.166/include/linux/init_task.h
67+--- linux-3.13.0-121.170.orig/include/linux/init_task.h
68++++ linux-3.13.0-121.170/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-119.166.orig/include/linux/sched.h
93-+++ linux-3.13.0-119.166/include/linux/sched.h
92+--- linux-3.13.0-121.170.orig/include/linux/sched.h
93++++ linux-3.13.0-121.170/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-119.166.orig/include/linux/security.h
115-+++ linux-3.13.0-119.166/include/linux/security.h
114+--- linux-3.13.0-121.170.orig/include/linux/security.h
115++++ linux-3.13.0-121.170/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-119.166.orig/include/net/ip.h
318-+++ linux-3.13.0-119.166/include/net/ip.h
317+--- linux-3.13.0-121.170.orig/include/net/ip.h
318++++ linux-3.13.0-121.170/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-119.166.orig/kernel/fork.c
329-+++ linux-3.13.0-119.166/kernel/fork.c
328+--- linux-3.13.0-121.170.orig/kernel/fork.c
329++++ linux-3.13.0-121.170/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-119.166.orig/kernel/kexec.c
357-+++ linux-3.13.0-119.166/kernel/kexec.c
356+--- linux-3.13.0-121.170.orig/kernel/kexec.c
357++++ linux-3.13.0-121.170/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-119.166.orig/kernel/module.c
376-+++ linux-3.13.0-119.166/kernel/module.c
375+--- linux-3.13.0-121.170.orig/kernel/module.c
376++++ linux-3.13.0-121.170/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-119.166.orig/kernel/ptrace.c
404-+++ linux-3.13.0-119.166/kernel/ptrace.c
403+--- linux-3.13.0-121.170.orig/kernel/ptrace.c
404++++ linux-3.13.0-121.170/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-119.166.orig/kernel/reboot.c
430-+++ linux-3.13.0-119.166/kernel/reboot.c
429+--- linux-3.13.0-121.170.orig/kernel/reboot.c
430++++ linux-3.13.0-121.170/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-119.166.orig/kernel/sched/core.c
449-+++ linux-3.13.0-119.166/kernel/sched/core.c
448+--- linux-3.13.0-121.170.orig/kernel/sched/core.c
449++++ linux-3.13.0-121.170/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-119.166.orig/kernel/signal.c
460-+++ linux-3.13.0-119.166/kernel/signal.c
459+--- linux-3.13.0-121.170.orig/kernel/signal.c
460++++ linux-3.13.0-121.170/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-119.166.orig/kernel/sys.c
507-+++ linux-3.13.0-119.166/kernel/sys.c
506+--- linux-3.13.0-121.170.orig/kernel/sys.c
507++++ linux-3.13.0-121.170/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-119.166.orig/kernel/time/ntp.c
538-+++ linux-3.13.0-119.166/kernel/time/ntp.c
537+--- linux-3.13.0-121.170.orig/kernel/time/ntp.c
538++++ linux-3.13.0-121.170/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-119.166.orig/net/ipv4/raw.c
573-+++ linux-3.13.0-119.166/net/ipv4/raw.c
572+--- linux-3.13.0-121.170.orig/net/ipv4/raw.c
573++++ linux-3.13.0-121.170/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-119.166.orig/net/ipv4/udp.c
586-+++ linux-3.13.0-119.166/net/ipv4/udp.c
585+--- linux-3.13.0-121.170.orig/net/ipv4/udp.c
586++++ linux-3.13.0-121.170/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-119.166.orig/net/ipv6/raw.c
599-+++ linux-3.13.0-119.166/net/ipv6/raw.c
598+--- linux-3.13.0-121.170.orig/net/ipv6/raw.c
599++++ linux-3.13.0-121.170/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-119.166.orig/net/ipv6/udp.c
612-+++ linux-3.13.0-119.166/net/ipv6/udp.c
611+--- linux-3.13.0-121.170.orig/net/ipv6/udp.c
612++++ linux-3.13.0-121.170/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-119.166.orig/net/socket.c
625-+++ linux-3.13.0-119.166/net/socket.c
624+--- linux-3.13.0-121.170.orig/net/socket.c
625++++ linux-3.13.0-121.170/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-119.166.orig/net/unix/af_unix.c
638-+++ linux-3.13.0-119.166/net/unix/af_unix.c
637+--- linux-3.13.0-121.170.orig/net/unix/af_unix.c
638++++ linux-3.13.0-121.170/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-119.166.orig/security/Kconfig
651-+++ linux-3.13.0-119.166/security/Kconfig
650+--- linux-3.13.0-121.170.orig/security/Kconfig
651++++ linux-3.13.0-121.170/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-119.166.orig/security/Makefile
661-+++ linux-3.13.0-119.166/security/Makefile
660+--- linux-3.13.0-121.170.orig/security/Makefile
661++++ linux-3.13.0-121.170/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-119.166.orig/security/security.c
670-+++ linux-3.13.0-119.166/security/security.c
669+--- linux-3.13.0-121.170.orig/security/security.c
670++++ linux-3.13.0-121.170/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 6581)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-3.18.diff (revision 6582)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 3.18.56.
1+This is TOMOYO Linux patch for kernel 3.18.57.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.56.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.57.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.56.orig/fs/exec.c
33-+++ linux-3.18.56/fs/exec.c
32+--- linux-3.18.57.orig/fs/exec.c
33++++ linux-3.18.57/fs/exec.c
3434 @@ -1442,7 +1442,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.56.orig/fs/open.c
44-+++ linux-3.18.56/fs/open.c
43+--- linux-3.18.57.orig/fs/open.c
44++++ linux-3.18.57/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.56.orig/fs/proc/version.c
55-+++ linux-3.18.56/fs/proc/version.c
54+--- linux-3.18.57.orig/fs/proc/version.c
55++++ linux-3.18.57/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.56 2017/06/12\n");
63++ printk(KERN_INFO "Hook version: 3.18.57 2017/06/20\n");
6464 + return 0;
6565 +}
6666 +fs_initcall(ccs_show_version);
67---- linux-3.18.56.orig/include/linux/init_task.h
68-+++ linux-3.18.56/include/linux/init_task.h
67+--- linux-3.18.57.orig/include/linux/init_task.h
68++++ linux-3.18.57/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.56.orig/include/linux/sched.h
93-+++ linux-3.18.56/include/linux/sched.h
92+--- linux-3.18.57.orig/include/linux/sched.h
93++++ linux-3.18.57/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.56.orig/include/linux/security.h
115-+++ linux-3.18.56/include/linux/security.h
114+--- linux-3.18.57.orig/include/linux/security.h
115++++ linux-3.18.57/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.56.orig/include/net/ip.h
328-+++ linux-3.18.56/include/net/ip.h
327+--- linux-3.18.57.orig/include/net/ip.h
328++++ linux-3.18.57/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.56.orig/kernel/fork.c
348-+++ linux-3.18.56/kernel/fork.c
347+--- linux-3.18.57.orig/kernel/fork.c
348++++ linux-3.18.57/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.56.orig/kernel/kexec.c
376-+++ linux-3.18.56/kernel/kexec.c
375+--- linux-3.18.57.orig/kernel/kexec.c
376++++ linux-3.18.57/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.56.orig/kernel/module.c
395-+++ linux-3.18.56/kernel/module.c
394+--- linux-3.18.57.orig/kernel/module.c
395++++ linux-3.18.57/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.56.orig/kernel/ptrace.c
423-+++ linux-3.18.56/kernel/ptrace.c
422+--- linux-3.18.57.orig/kernel/ptrace.c
423++++ linux-3.18.57/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.56.orig/kernel/reboot.c
449-+++ linux-3.18.56/kernel/reboot.c
448+--- linux-3.18.57.orig/kernel/reboot.c
449++++ linux-3.18.57/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.56.orig/kernel/sched/core.c
468-+++ linux-3.18.56/kernel/sched/core.c
467+--- linux-3.18.57.orig/kernel/sched/core.c
468++++ linux-3.18.57/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.56.orig/kernel/signal.c
479-+++ linux-3.18.56/kernel/signal.c
478+--- linux-3.18.57.orig/kernel/signal.c
479++++ linux-3.18.57/kernel/signal.c
480480 @@ -2887,6 +2887,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
481481 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
482482 {
@@ -522,8 +522,8 @@
522522
523523 return do_send_specific(tgid, pid, sig, info);
524524 }
525---- linux-3.18.56.orig/kernel/sys.c
526-+++ linux-3.18.56/kernel/sys.c
525+--- linux-3.18.57.orig/kernel/sys.c
526++++ linux-3.18.57/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.56.orig/kernel/time/ntp.c
557-+++ linux-3.18.56/kernel/time/ntp.c
556+--- linux-3.18.57.orig/kernel/time/ntp.c
557++++ linux-3.18.57/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.56.orig/net/ipv4/raw.c
592-+++ linux-3.18.56/net/ipv4/raw.c
591+--- linux-3.18.57.orig/net/ipv4/raw.c
592++++ linux-3.18.57/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.56.orig/net/ipv4/udp.c
605-+++ linux-3.18.56/net/ipv4/udp.c
604+--- linux-3.18.57.orig/net/ipv4/udp.c
605++++ linux-3.18.57/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.56.orig/net/ipv6/raw.c
618-+++ linux-3.18.56/net/ipv6/raw.c
617+--- linux-3.18.57.orig/net/ipv6/raw.c
618++++ linux-3.18.57/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.56.orig/net/ipv6/udp.c
631-+++ linux-3.18.56/net/ipv6/udp.c
630+--- linux-3.18.57.orig/net/ipv6/udp.c
631++++ linux-3.18.57/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.56.orig/net/socket.c
644-+++ linux-3.18.56/net/socket.c
643+--- linux-3.18.57.orig/net/socket.c
644++++ linux-3.18.57/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.56.orig/net/unix/af_unix.c
657-+++ linux-3.18.56/net/unix/af_unix.c
656+--- linux-3.18.57.orig/net/unix/af_unix.c
657++++ linux-3.18.57/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.56.orig/security/Kconfig
670-+++ linux-3.18.56/security/Kconfig
669+--- linux-3.18.57.orig/security/Kconfig
670++++ linux-3.18.57/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.56.orig/security/Makefile
680-+++ linux-3.18.56/security/Makefile
679+--- linux-3.18.57.orig/security/Makefile
680++++ linux-3.18.57/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.56.orig/security/security.c
689-+++ linux-3.18.56/security/security.c
688+--- linux-3.18.57.orig/security/security.c
689++++ linux-3.18.57/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 6581)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.1.diff (revision 6582)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.1.40.
1+This is TOMOYO Linux patch for kernel 4.1.41.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.40.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.41.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.40.orig/fs/exec.c
33-+++ linux-4.1.40/fs/exec.c
32+--- linux-4.1.41.orig/fs/exec.c
33++++ linux-4.1.41/fs/exec.c
3434 @@ -1467,7 +1467,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.40.orig/fs/open.c
44-+++ linux-4.1.40/fs/open.c
43+--- linux-4.1.41.orig/fs/open.c
44++++ linux-4.1.41/fs/open.c
4545 @@ -1107,6 +1107,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.40.orig/fs/proc/version.c
55-+++ linux-4.1.40/fs/proc/version.c
54+--- linux-4.1.41.orig/fs/proc/version.c
55++++ linux-4.1.41/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.40 2017/06/04\n");
63++ printk(KERN_INFO "Hook version: 4.1.41 2017/06/20\n");
6464 + return 0;
6565 +}
6666 +fs_initcall(ccs_show_version);
67---- linux-4.1.40.orig/include/linux/init_task.h
68-+++ linux-4.1.40/include/linux/init_task.h
67+--- linux-4.1.41.orig/include/linux/init_task.h
68++++ linux-4.1.41/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.40.orig/include/linux/sched.h
93-+++ linux-4.1.40/include/linux/sched.h
92+--- linux-4.1.41.orig/include/linux/sched.h
93++++ linux-4.1.41/include/linux/sched.h
9494 @@ -6,6 +6,8 @@
9595 #include <linux/sched/prio.h>
9696
@@ -100,7 +100,7 @@
100100 struct sched_param {
101101 int sched_priority;
102102 };
103-@@ -1727,6 +1729,10 @@ struct task_struct {
103+@@ -1728,6 +1730,10 @@ struct task_struct {
104104 #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
105105 unsigned long task_state_change;
106106 #endif
@@ -111,8 +111,8 @@
111111 };
112112
113113 /* Future-safe accessor for struct task_struct's cpus_allowed. */
114---- linux-4.1.40.orig/include/linux/security.h
115-+++ linux-4.1.40/include/linux/security.h
114+--- linux-4.1.41.orig/include/linux/security.h
115++++ linux-4.1.41/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.40.orig/include/net/ip.h
323-+++ linux-4.1.40/include/net/ip.h
322+--- linux-4.1.41.orig/include/net/ip.h
323++++ linux-4.1.41/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.40.orig/kernel/fork.c
343-+++ linux-4.1.40/kernel/fork.c
342+--- linux-4.1.41.orig/kernel/fork.c
343++++ linux-4.1.41/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.40.orig/kernel/kexec.c
371-+++ linux-4.1.40/kernel/kexec.c
370+--- linux-4.1.41.orig/kernel/kexec.c
371++++ linux-4.1.41/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.40.orig/kernel/module.c
390-+++ linux-4.1.40/kernel/module.c
389+--- linux-4.1.41.orig/kernel/module.c
390++++ linux-4.1.41/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.40.orig/kernel/ptrace.c
418-+++ linux-4.1.40/kernel/ptrace.c
417+--- linux-4.1.41.orig/kernel/ptrace.c
418++++ linux-4.1.41/kernel/ptrace.c
419419 @@ -1089,6 +1089,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.40.orig/kernel/reboot.c
444-+++ linux-4.1.40/kernel/reboot.c
443+--- linux-4.1.41.orig/kernel/reboot.c
444++++ linux-4.1.41/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.40.orig/kernel/sched/core.c
463-+++ linux-4.1.40/kernel/sched/core.c
462+--- linux-4.1.41.orig/kernel/sched/core.c
463++++ linux-4.1.41/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.40.orig/kernel/signal.c
474-+++ linux-4.1.40/kernel/signal.c
473+--- linux-4.1.41.orig/kernel/signal.c
474++++ linux-4.1.41/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.40.orig/kernel/sys.c
521-+++ linux-4.1.40/kernel/sys.c
520+--- linux-4.1.41.orig/kernel/sys.c
521++++ linux-4.1.41/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.40.orig/kernel/time/ntp.c
552-+++ linux-4.1.40/kernel/time/ntp.c
551+--- linux-4.1.41.orig/kernel/time/ntp.c
552++++ linux-4.1.41/kernel/time/ntp.c
553553 @@ -16,6 +16,7 @@
554554 #include <linux/mm.h>
555555 #include <linux/module.h>
@@ -583,9 +583,9 @@
583583
584584 /*
585585 * Check for potential multiplication overflows that can
586---- linux-4.1.40.orig/net/ipv4/raw.c
587-+++ linux-4.1.40/net/ipv4/raw.c
588-@@ -729,6 +729,10 @@ static int raw_recvmsg(struct sock *sk,
586+--- linux-4.1.41.orig/net/ipv4/raw.c
587++++ linux-4.1.41/net/ipv4/raw.c
588+@@ -732,6 +732,10 @@ static int raw_recvmsg(struct sock *sk,
589589 skb = skb_recv_datagram(sk, flags, noblock, &err);
590590 if (!skb)
591591 goto out;
@@ -596,8 +596,8 @@
596596
597597 copied = skb->len;
598598 if (len < copied) {
599---- linux-4.1.40.orig/net/ipv4/udp.c
600-+++ linux-4.1.40/net/ipv4/udp.c
599+--- linux-4.1.41.orig/net/ipv4/udp.c
600++++ linux-4.1.41/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.40.orig/net/ipv6/raw.c
613-+++ linux-4.1.40/net/ipv6/raw.c
612+--- linux-4.1.41.orig/net/ipv6/raw.c
613++++ linux-4.1.41/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.40.orig/net/ipv6/udp.c
626-+++ linux-4.1.40/net/ipv6/udp.c
625+--- linux-4.1.41.orig/net/ipv6/udp.c
626++++ linux-4.1.41/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.40.orig/net/socket.c
639-+++ linux-4.1.40/net/socket.c
638+--- linux-4.1.41.orig/net/socket.c
639++++ linux-4.1.41/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.40.orig/net/unix/af_unix.c
652-+++ linux-4.1.40/net/unix/af_unix.c
651+--- linux-4.1.41.orig/net/unix/af_unix.c
652++++ linux-4.1.41/net/unix/af_unix.c
653653 @@ -1978,6 +1978,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.40.orig/security/Kconfig
665-+++ linux-4.1.40/security/Kconfig
664+--- linux-4.1.41.orig/security/Kconfig
665++++ linux-4.1.41/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.40.orig/security/Makefile
675-+++ linux-4.1.40/security/Makefile
674+--- linux-4.1.41.orig/security/Makefile
675++++ linux-4.1.41/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.40.orig/security/security.c
684-+++ linux-4.1.40/security/security.c
683+--- linux-4.1.41.orig/security/security.c
684++++ linux-4.1.41/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.11.diff (revision 6581)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.11.diff (revision 6582)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.11.4.
1+This is TOMOYO Linux patch for kernel 4.11.6.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.11.4.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.11.6.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, 146 insertions(+), 26 deletions(-)
3030
31---- linux-4.11.4.orig/fs/exec.c
32-+++ linux-4.11.4/fs/exec.c
31+--- linux-4.11.6.orig/fs/exec.c
32++++ linux-4.11.6/fs/exec.c
3333 @@ -1643,7 +1643,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.11.4.orig/fs/open.c
43-+++ linux-4.11.4/fs/open.c
42+--- linux-4.11.6.orig/fs/open.c
43++++ linux-4.11.6/fs/open.c
4444 @@ -1143,6 +1143,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.11.4.orig/fs/proc/version.c
54-+++ linux-4.11.4/fs/proc/version.c
53+--- linux-4.11.6.orig/fs/proc/version.c
54++++ linux-4.11.6/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.11.4 2017/06/12\n");
62++ printk(KERN_INFO "Hook version: 4.11.6 2017/06/20\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.11.4.orig/include/linux/init_task.h
67-+++ linux-4.11.4/include/linux/init_task.h
66+--- linux-4.11.6.orig/include/linux/init_task.h
67++++ linux-4.11.6/include/linux/init_task.h
6868 @@ -210,6 +210,14 @@ extern struct cred init_cred;
6969 # define INIT_TASK_TI(tsk)
7070 #endif
@@ -88,8 +88,8 @@
8888 }
8989
9090
91---- linux-4.11.4.orig/include/linux/sched.h
92-+++ linux-4.11.4/include/linux/sched.h
91+--- linux-4.11.6.orig/include/linux/sched.h
92++++ linux-4.11.6/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 /* CPU-specific state of this task: */
110110 struct thread_struct thread;
111111
112---- linux-4.11.4.orig/include/linux/security.h
113-+++ linux-4.11.4/include/linux/security.h
112+--- linux-4.11.6.orig/include/linux/security.h
113++++ linux-4.11.6/include/linux/security.h
114114 @@ -55,6 +55,7 @@ struct msg_queue;
115115 struct xattr;
116116 struct xfrm_sec_ctx;
@@ -317,8 +317,8 @@
317317 }
318318 #endif /* CONFIG_SECURITY_PATH */
319319
320---- linux-4.11.4.orig/include/net/ip.h
321-+++ linux-4.11.4/include/net/ip.h
320+--- linux-4.11.6.orig/include/net/ip.h
321++++ linux-4.11.6/include/net/ip.h
322322 @@ -253,6 +253,8 @@ void inet_get_local_port_range(struct ne
323323 #ifdef CONFIG_SYSCTL
324324 static inline int inet_is_local_reserved_port(struct net *net, int port)
@@ -337,8 +337,8 @@
337337 return 0;
338338 }
339339
340---- linux-4.11.4.orig/kernel/fork.c
341-+++ linux-4.11.4/kernel/fork.c
340+--- linux-4.11.6.orig/kernel/fork.c
341++++ linux-4.11.6/kernel/fork.c
342342 @@ -403,6 +403,7 @@ void __put_task_struct(struct task_struc
343343 delayacct_tsk_free(tsk);
344344 put_signal_struct(tsk->signal);
@@ -347,7 +347,7 @@
347347 if (!profile_handoff_task(tsk))
348348 free_task(tsk);
349349 }
350-@@ -1679,6 +1680,9 @@ static __latent_entropy struct task_stru
350+@@ -1691,6 +1692,9 @@ static __latent_entropy struct task_stru
351351 goto bad_fork_cleanup_perf;
352352 /* copy all the process information */
353353 shm_init_task(p);
@@ -357,7 +357,7 @@
357357 retval = copy_semundo(clone_flags, p);
358358 if (retval)
359359 goto bad_fork_cleanup_audit;
360-@@ -1909,6 +1913,7 @@ bad_fork_cleanup_semundo:
360+@@ -1916,6 +1920,7 @@ bad_fork_cleanup_semundo:
361361 exit_sem(p);
362362 bad_fork_cleanup_audit:
363363 audit_free(p);
@@ -365,8 +365,8 @@
365365 bad_fork_cleanup_perf:
366366 perf_event_free_task(p);
367367 bad_fork_cleanup_policy:
368---- linux-4.11.4.orig/kernel/kexec.c
369-+++ linux-4.11.4/kernel/kexec.c
368+--- linux-4.11.6.orig/kernel/kexec.c
369++++ linux-4.11.6/kernel/kexec.c
370370 @@ -17,7 +17,7 @@
371371 #include <linux/syscalls.h>
372372 #include <linux/vmalloc.h>
@@ -385,8 +385,8 @@
385385
386386 /*
387387 * Verify we have a legal set of flags
388---- linux-4.11.4.orig/kernel/module.c
389-+++ linux-4.11.4/kernel/module.c
388+--- linux-4.11.6.orig/kernel/module.c
389++++ linux-4.11.6/kernel/module.c
390390 @@ -65,6 +65,7 @@
391391 #include <linux/audit.h>
392392 #include <uapi/linux/module.h>
@@ -413,9 +413,9 @@
413413
414414 return 0;
415415 }
416---- linux-4.11.4.orig/kernel/ptrace.c
417-+++ linux-4.11.4/kernel/ptrace.c
418-@@ -1119,6 +1119,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
416+--- linux-4.11.6.orig/kernel/ptrace.c
417++++ linux-4.11.6/kernel/ptrace.c
418+@@ -1125,6 +1125,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
419419 {
420420 struct task_struct *child;
421421 long ret;
@@ -427,7 +427,7 @@
427427
428428 if (request == PTRACE_TRACEME) {
429429 ret = ptrace_traceme();
430-@@ -1268,6 +1273,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
430+@@ -1274,6 +1279,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
431431 {
432432 struct task_struct *child;
433433 long ret;
@@ -439,8 +439,8 @@
439439
440440 if (request == PTRACE_TRACEME) {
441441 ret = ptrace_traceme();
442---- linux-4.11.4.orig/kernel/reboot.c
443-+++ linux-4.11.4/kernel/reboot.c
442+--- linux-4.11.6.orig/kernel/reboot.c
443++++ linux-4.11.6/kernel/reboot.c
444444 @@ -16,6 +16,7 @@
445445 #include <linux/syscalls.h>
446446 #include <linux/syscore_ops.h>
@@ -458,8 +458,8 @@
458458
459459 /*
460460 * If pid namespaces are enabled and the current task is in a child
461---- linux-4.11.4.orig/kernel/sched/core.c
462-+++ linux-4.11.4/kernel/sched/core.c
461+--- linux-4.11.6.orig/kernel/sched/core.c
462++++ linux-4.11.6/kernel/sched/core.c
463463 @@ -3857,6 +3857,8 @@ int can_nice(const struct task_struct *p
464464 SYSCALL_DEFINE1(nice, int, increment)
465465 {
@@ -469,8 +469,8 @@
469469
470470 /*
471471 * Setpriority might change our priority at the same moment.
472---- linux-4.11.4.orig/kernel/signal.c
473-+++ linux-4.11.4/kernel/signal.c
472+--- linux-4.11.6.orig/kernel/signal.c
473++++ linux-4.11.6/kernel/signal.c
474474 @@ -2865,6 +2865,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
475475 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
476476 {
@@ -516,8 +516,8 @@
516516
517517 return do_send_specific(tgid, pid, sig, info);
518518 }
519---- linux-4.11.4.orig/kernel/sys.c
520-+++ linux-4.11.4/kernel/sys.c
519+--- linux-4.11.6.orig/kernel/sys.c
520++++ linux-4.11.6/kernel/sys.c
521521 @@ -190,6 +190,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
522522
523523 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -547,8 +547,8 @@
547547
548548 down_write(&uts_sem);
549549 errno = -EFAULT;
550---- linux-4.11.4.orig/kernel/time/ntp.c
551-+++ linux-4.11.4/kernel/time/ntp.c
550+--- linux-4.11.6.orig/kernel/time/ntp.c
551++++ linux-4.11.6/kernel/time/ntp.c
552552 @@ -17,6 +17,7 @@
553553 #include <linux/module.h>
554554 #include <linux/rtc.h>
@@ -582,8 +582,8 @@
582582
583583 if (txc->modes & ADJ_NANO) {
584584 struct timespec ts;
585---- linux-4.11.4.orig/net/ipv4/raw.c
586-+++ linux-4.11.4/net/ipv4/raw.c
585+--- linux-4.11.6.orig/net/ipv4/raw.c
586++++ linux-4.11.6/net/ipv4/raw.c
587587 @@ -755,6 +755,10 @@ static int raw_recvmsg(struct sock *sk,
588588 skb = skb_recv_datagram(sk, flags, noblock, &err);
589589 if (!skb)
@@ -595,8 +595,8 @@
595595
596596 copied = skb->len;
597597 if (len < copied) {
598---- linux-4.11.4.orig/net/ipv4/udp.c
599-+++ linux-4.11.4/net/ipv4/udp.c
598+--- linux-4.11.6.orig/net/ipv4/udp.c
599++++ linux-4.11.6/net/ipv4/udp.c
600600 @@ -1425,6 +1425,8 @@ try_again:
601601 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
602602 if (!skb)
@@ -606,8 +606,8 @@
606606
607607 ulen = skb->len;
608608 copied = len;
609---- linux-4.11.4.orig/net/ipv6/raw.c
610-+++ linux-4.11.4/net/ipv6/raw.c
609+--- linux-4.11.6.orig/net/ipv6/raw.c
610++++ linux-4.11.6/net/ipv6/raw.c
611611 @@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk
612612 skb = skb_recv_datagram(sk, flags, noblock, &err);
613613 if (!skb)
@@ -619,8 +619,8 @@
619619
620620 copied = skb->len;
621621 if (copied > len) {
622---- linux-4.11.4.orig/net/ipv6/udp.c
623-+++ linux-4.11.4/net/ipv6/udp.c
622+--- linux-4.11.6.orig/net/ipv6/udp.c
623++++ linux-4.11.6/net/ipv6/udp.c
624624 @@ -360,6 +360,8 @@ try_again:
625625 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
626626 if (!skb)
@@ -630,8 +630,8 @@
630630
631631 ulen = skb->len;
632632 copied = len;
633---- linux-4.11.4.orig/net/socket.c
634-+++ linux-4.11.4/net/socket.c
633+--- linux-4.11.6.orig/net/socket.c
634++++ linux-4.11.6/net/socket.c
635635 @@ -1521,6 +1521,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
636636 if (err < 0)
637637 goto out_fd;
@@ -643,8 +643,8 @@
643643 if (upeer_sockaddr) {
644644 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
645645 &len, 2) < 0) {
646---- linux-4.11.4.orig/net/unix/af_unix.c
647-+++ linux-4.11.4/net/unix/af_unix.c
646+--- linux-4.11.6.orig/net/unix/af_unix.c
647++++ linux-4.11.6/net/unix/af_unix.c
648648 @@ -2147,6 +2147,10 @@ static int unix_dgram_recvmsg(struct soc
649649 POLLOUT | POLLWRNORM |
650650 POLLWRBAND);
@@ -664,8 +664,8 @@
664664 mutex_unlock(&u->iolock);
665665 out:
666666 return err;
667---- linux-4.11.4.orig/security/Kconfig
668-+++ linux-4.11.4/security/Kconfig
667+--- linux-4.11.6.orig/security/Kconfig
668++++ linux-4.11.6/security/Kconfig
669669 @@ -239,5 +239,7 @@ config DEFAULT_SECURITY
670670 default "apparmor" if DEFAULT_SECURITY_APPARMOR
671671 default "" if DEFAULT_SECURITY_DAC
@@ -674,8 +674,8 @@
674674 +
675675 endmenu
676676
677---- linux-4.11.4.orig/security/Makefile
678-+++ linux-4.11.4/security/Makefile
677+--- linux-4.11.6.orig/security/Makefile
678++++ linux-4.11.6/security/Makefile
679679 @@ -29,3 +29,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
680680 # Object integrity file lists
681681 subdir-$(CONFIG_INTEGRITY) += integrity
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.12.diff (revision 6581)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.12.diff (revision 6582)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.12-rc5.
1+This is TOMOYO Linux patch for kernel 4.12-rc6.
22
3-Source code for this patch is https://git.kernel.org/torvalds/t/linux-4.12-rc5.tar.gz
3+Source code for this patch is https://git.kernel.org/torvalds/t/linux-4.12-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.12-rc5.orig/fs/exec.c
32-+++ linux-4.12-rc5/fs/exec.c
31+--- linux-4.12-rc6.orig/fs/exec.c
32++++ linux-4.12-rc6/fs/exec.c
3333 @@ -1644,7 +1644,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.12-rc5.orig/fs/open.c
43-+++ linux-4.12-rc5/fs/open.c
42+--- linux-4.12-rc6.orig/fs/open.c
43++++ linux-4.12-rc6/fs/open.c
4444 @@ -1167,6 +1167,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.12-rc5.orig/fs/proc/version.c
54-+++ linux-4.12-rc5/fs/proc/version.c
53+--- linux-4.12-rc6.orig/fs/proc/version.c
54++++ linux-4.12-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.12-rc5 2017/06/12\n");
62++ printk(KERN_INFO "Hook version: 4.12-rc6 2017/06/20\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.12-rc5.orig/include/linux/init_task.h
67-+++ linux-4.12-rc5/include/linux/init_task.h
66+--- linux-4.12-rc6.orig/include/linux/init_task.h
67++++ linux-4.12-rc6/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.12-rc5.orig/include/linux/sched.h
92-+++ linux-4.12-rc5/include/linux/sched.h
91+--- linux-4.12-rc6.orig/include/linux/sched.h
92++++ linux-4.12-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 /* CPU-specific state of this task: */
110110 struct thread_struct thread;
111111
112---- linux-4.12-rc5.orig/include/linux/security.h
113-+++ linux-4.12-rc5/include/linux/security.h
112+--- linux-4.12-rc6.orig/include/linux/security.h
113++++ linux-4.12-rc6/include/linux/security.h
114114 @@ -55,6 +55,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.12-rc5.orig/include/net/ip.h
337-+++ linux-4.12-rc5/include/net/ip.h
336+--- linux-4.12-rc6.orig/include/net/ip.h
337++++ linux-4.12-rc6/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.12-rc5.orig/kernel/kexec.c
357-+++ linux-4.12-rc5/kernel/kexec.c
356+--- linux-4.12-rc6.orig/kernel/kexec.c
357++++ linux-4.12-rc6/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.12-rc5.orig/kernel/module.c
377-+++ linux-4.12-rc5/kernel/module.c
376+--- linux-4.12-rc6.orig/kernel/module.c
377++++ linux-4.12-rc6/kernel/module.c
378378 @@ -68,6 +68,7 @@
379379 #include <linux/audit.h>
380380 #include <uapi/linux/module.h>
@@ -401,8 +401,8 @@
401401
402402 return 0;
403403 }
404---- linux-4.12-rc5.orig/kernel/ptrace.c
405-+++ linux-4.12-rc5/kernel/ptrace.c
404+--- linux-4.12-rc6.orig/kernel/ptrace.c
405++++ linux-4.12-rc6/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.12-rc5.orig/kernel/reboot.c
431-+++ linux-4.12-rc5/kernel/reboot.c
430+--- linux-4.12-rc6.orig/kernel/reboot.c
431++++ linux-4.12-rc6/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.12-rc5.orig/kernel/sched/core.c
450-+++ linux-4.12-rc5/kernel/sched/core.c
449+--- linux-4.12-rc6.orig/kernel/sched/core.c
450++++ linux-4.12-rc6/kernel/sched/core.c
451451 @@ -3926,6 +3926,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.12-rc5.orig/kernel/signal.c
461-+++ linux-4.12-rc5/kernel/signal.c
460+--- linux-4.12-rc6.orig/kernel/signal.c
461++++ linux-4.12-rc6/kernel/signal.c
462462 @@ -2865,6 +2865,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
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.12-rc5.orig/kernel/sys.c
508-+++ linux-4.12-rc5/kernel/sys.c
507+--- linux-4.12-rc6.orig/kernel/sys.c
508++++ linux-4.12-rc6/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.12-rc5.orig/kernel/time/ntp.c
539-+++ linux-4.12-rc5/kernel/time/ntp.c
538+--- linux-4.12-rc6.orig/kernel/time/ntp.c
539++++ linux-4.12-rc6/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.12-rc5.orig/net/ipv4/raw.c
574-+++ linux-4.12-rc5/net/ipv4/raw.c
573+--- linux-4.12-rc6.orig/net/ipv4/raw.c
574++++ linux-4.12-rc6/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.12-rc5.orig/net/ipv4/udp.c
587-+++ linux-4.12-rc5/net/ipv4/udp.c
586+--- linux-4.12-rc6.orig/net/ipv4/udp.c
587++++ linux-4.12-rc6/net/ipv4/udp.c
588588 @@ -1425,6 +1425,8 @@ try_again:
589589 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
590590 if (!skb)
@@ -594,8 +594,8 @@
594594
595595 ulen = skb->len;
596596 copied = len;
597---- linux-4.12-rc5.orig/net/ipv6/raw.c
598-+++ linux-4.12-rc5/net/ipv6/raw.c
597+--- linux-4.12-rc6.orig/net/ipv6/raw.c
598++++ linux-4.12-rc6/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.12-rc5.orig/net/ipv6/udp.c
611-+++ linux-4.12-rc5/net/ipv6/udp.c
610+--- linux-4.12-rc6.orig/net/ipv6/udp.c
611++++ linux-4.12-rc6/net/ipv6/udp.c
612612 @@ -361,6 +361,8 @@ try_again:
613613 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
614614 if (!skb)
@@ -618,8 +618,8 @@
618618
619619 ulen = skb->len;
620620 copied = len;
621---- linux-4.12-rc5.orig/net/socket.c
622-+++ linux-4.12-rc5/net/socket.c
621+--- linux-4.12-rc6.orig/net/socket.c
622++++ linux-4.12-rc6/net/socket.c
623623 @@ -1521,6 +1521,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
624624 if (err < 0)
625625 goto out_fd;
@@ -631,9 +631,9 @@
631631 if (upeer_sockaddr) {
632632 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
633633 &len, 2) < 0) {
634---- linux-4.12-rc5.orig/net/unix/af_unix.c
635-+++ linux-4.12-rc5/net/unix/af_unix.c
636-@@ -2147,6 +2147,10 @@ static int unix_dgram_recvmsg(struct soc
634+--- linux-4.12-rc6.orig/net/unix/af_unix.c
635++++ linux-4.12-rc6/net/unix/af_unix.c
636+@@ -2152,6 +2152,10 @@ static int unix_dgram_recvmsg(struct soc
637637 POLLOUT | POLLWRNORM |
638638 POLLWRBAND);
639639
@@ -644,7 +644,7 @@
644644 if (msg->msg_name)
645645 unix_copy_addr(msg, skb->sk);
646646
647-@@ -2197,6 +2201,7 @@ static int unix_dgram_recvmsg(struct soc
647+@@ -2202,6 +2206,7 @@ static int unix_dgram_recvmsg(struct soc
648648
649649 out_free:
650650 skb_free_datagram(sk, skb);
@@ -652,8 +652,8 @@
652652 mutex_unlock(&u->iolock);
653653 out:
654654 return err;
655---- linux-4.12-rc5.orig/security/Kconfig
656-+++ linux-4.12-rc5/security/Kconfig
655+--- linux-4.12-rc6.orig/security/Kconfig
656++++ linux-4.12-rc6/security/Kconfig
657657 @@ -235,5 +235,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.12-rc5.orig/security/Makefile
666-+++ linux-4.12-rc5/security/Makefile
665+--- linux-4.12-rc6.orig/security/Makefile
666++++ linux-4.12-rc6/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.12-rc5.orig/security/security.c
675-+++ linux-4.12-rc5/security/security.c
674+--- linux-4.12-rc6.orig/security/security.c
675++++ linux-4.12-rc6/security/security.c
676676 @@ -943,12 +943,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.4.diff (revision 6581)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.4.diff (revision 6582)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.4.71.
1+This is TOMOYO Linux patch for kernel 4.4.73.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.71.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.73.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.71.orig/fs/exec.c
32-+++ linux-4.4.71/fs/exec.c
31+--- linux-4.4.73.orig/fs/exec.c
32++++ linux-4.4.73/fs/exec.c
3333 @@ -1487,7 +1487,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.71.orig/fs/open.c
43-+++ linux-4.4.71/fs/open.c
42+--- linux-4.4.73.orig/fs/open.c
43++++ linux-4.4.73/fs/open.c
4444 @@ -1111,6 +1111,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.71.orig/fs/proc/version.c
54-+++ linux-4.4.71/fs/proc/version.c
53+--- linux-4.4.73.orig/fs/proc/version.c
54++++ linux-4.4.73/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.71 2017/06/12\n");
62++ printk(KERN_INFO "Hook version: 4.4.73 2017/06/20\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.4.71.orig/include/linux/init_task.h
67-+++ linux-4.4.71/include/linux/init_task.h
66+--- linux-4.4.73.orig/include/linux/init_task.h
67++++ linux-4.4.73/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.71.orig/include/linux/sched.h
92-+++ linux-4.4.71/include/linux/sched.h
91+--- linux-4.4.73.orig/include/linux/sched.h
92++++ linux-4.4.73/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.71.orig/include/linux/security.h
114-+++ linux-4.4.71/include/linux/security.h
113+--- linux-4.4.73.orig/include/linux/security.h
114++++ linux-4.4.73/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.71.orig/include/net/ip.h
322-+++ linux-4.4.71/include/net/ip.h
321+--- linux-4.4.73.orig/include/net/ip.h
322++++ linux-4.4.73/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.71.orig/kernel/fork.c
342-+++ linux-4.4.71/kernel/fork.c
341+--- linux-4.4.73.orig/kernel/fork.c
342++++ linux-4.4.73/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.71.orig/kernel/kexec.c
370-+++ linux-4.4.71/kernel/kexec.c
369+--- linux-4.4.73.orig/kernel/kexec.c
370++++ linux-4.4.73/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.71.orig/kernel/module.c
390-+++ linux-4.4.71/kernel/module.c
389+--- linux-4.4.73.orig/kernel/module.c
390++++ linux-4.4.73/kernel/module.c
391391 @@ -61,6 +61,7 @@
392392 #include <linux/bsearch.h>
393393 #include <uapi/linux/module.h>
@@ -414,9 +414,9 @@
414414
415415 return 0;
416416 }
417---- linux-4.4.71.orig/kernel/ptrace.c
418-+++ linux-4.4.71/kernel/ptrace.c
419-@@ -1079,6 +1079,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
417+--- linux-4.4.73.orig/kernel/ptrace.c
418++++ linux-4.4.73/kernel/ptrace.c
419+@@ -1085,6 +1085,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
420420 {
421421 struct task_struct *child;
422422 long ret;
@@ -428,7 +428,7 @@
428428
429429 if (request == PTRACE_TRACEME) {
430430 ret = ptrace_traceme();
431-@@ -1225,6 +1230,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
431+@@ -1231,6 +1236,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
432432 {
433433 struct task_struct *child;
434434 long ret;
@@ -440,8 +440,8 @@
440440
441441 if (request == PTRACE_TRACEME) {
442442 ret = ptrace_traceme();
443---- linux-4.4.71.orig/kernel/reboot.c
444-+++ linux-4.4.71/kernel/reboot.c
443+--- linux-4.4.73.orig/kernel/reboot.c
444++++ linux-4.4.73/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.71.orig/kernel/sched/core.c
463-+++ linux-4.4.71/kernel/sched/core.c
462+--- linux-4.4.73.orig/kernel/sched/core.c
463++++ linux-4.4.73/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.71.orig/kernel/signal.c
474-+++ linux-4.4.71/kernel/signal.c
473+--- linux-4.4.73.orig/kernel/signal.c
474++++ linux-4.4.73/kernel/signal.c
475475 @@ -2847,6 +2847,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
476476 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
477477 {
@@ -517,8 +517,8 @@
517517
518518 return do_send_specific(tgid, pid, sig, info);
519519 }
520---- linux-4.4.71.orig/kernel/sys.c
521-+++ linux-4.4.71/kernel/sys.c
520+--- linux-4.4.73.orig/kernel/sys.c
521++++ linux-4.4.73/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.71.orig/kernel/time/ntp.c
552-+++ linux-4.4.71/kernel/time/ntp.c
551+--- linux-4.4.73.orig/kernel/time/ntp.c
552++++ linux-4.4.73/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.71.orig/net/ipv4/raw.c
587-+++ linux-4.4.71/net/ipv4/raw.c
586+--- linux-4.4.73.orig/net/ipv4/raw.c
587++++ linux-4.4.73/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.71.orig/net/ipv4/udp.c
600-+++ linux-4.4.71/net/ipv4/udp.c
599+--- linux-4.4.73.orig/net/ipv4/udp.c
600++++ linux-4.4.73/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.71.orig/net/ipv6/raw.c
613-+++ linux-4.4.71/net/ipv6/raw.c
612+--- linux-4.4.73.orig/net/ipv6/raw.c
613++++ linux-4.4.73/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.71.orig/net/ipv6/udp.c
626-+++ linux-4.4.71/net/ipv6/udp.c
625+--- linux-4.4.73.orig/net/ipv6/udp.c
626++++ linux-4.4.73/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.71.orig/net/socket.c
639-+++ linux-4.4.71/net/socket.c
638+--- linux-4.4.73.orig/net/socket.c
639++++ linux-4.4.73/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.71.orig/net/unix/af_unix.c
652-+++ linux-4.4.71/net/unix/af_unix.c
651+--- linux-4.4.73.orig/net/unix/af_unix.c
652++++ linux-4.4.73/net/unix/af_unix.c
653653 @@ -2139,6 +2139,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.71.orig/security/Kconfig
665-+++ linux-4.4.71/security/Kconfig
664+--- linux-4.4.73.orig/security/Kconfig
665++++ linux-4.4.73/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.71.orig/security/Makefile
675-+++ linux-4.4.71/security/Makefile
674+--- linux-4.4.73.orig/security/Makefile
675++++ linux-4.4.73/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 6581)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.9.diff (revision 6582)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.9.31.
1+This is TOMOYO Linux patch for kernel 4.9.33.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.31.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.33.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.31.orig/fs/exec.c
32-+++ linux-4.9.31/fs/exec.c
31+--- linux-4.9.33.orig/fs/exec.c
32++++ linux-4.9.33/fs/exec.c
3333 @@ -1640,7 +1640,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.31.orig/fs/open.c
43-+++ linux-4.9.31/fs/open.c
42+--- linux-4.9.33.orig/fs/open.c
43++++ linux-4.9.33/fs/open.c
4444 @@ -1145,6 +1145,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.31.orig/fs/proc/version.c
54-+++ linux-4.9.31/fs/proc/version.c
53+--- linux-4.9.33.orig/fs/proc/version.c
54++++ linux-4.9.33/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.31 2017/06/12\n");
62++ printk(KERN_INFO "Hook version: 4.9.33 2017/06/20\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.9.31.orig/include/linux/init_task.h
67-+++ linux-4.9.31/include/linux/init_task.h
66+--- linux-4.9.33.orig/include/linux/init_task.h
67++++ linux-4.9.33/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.31.orig/include/linux/sched.h
92-+++ linux-4.9.31/include/linux/sched.h
91+--- linux-4.9.33.orig/include/linux/sched.h
92++++ linux-4.9.33/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.31.orig/include/linux/security.h
114-+++ linux-4.9.31/include/linux/security.h
113+--- linux-4.9.33.orig/include/linux/security.h
114++++ linux-4.9.33/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.31.orig/include/net/ip.h
322-+++ linux-4.9.31/include/net/ip.h
321+--- linux-4.9.33.orig/include/net/ip.h
322++++ linux-4.9.33/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.31.orig/kernel/fork.c
342-+++ linux-4.9.31/kernel/fork.c
341+--- linux-4.9.33.orig/kernel/fork.c
342++++ linux-4.9.33/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.31.orig/kernel/kexec.c
370-+++ linux-4.9.31/kernel/kexec.c
369+--- linux-4.9.33.orig/kernel/kexec.c
370++++ linux-4.9.33/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.31.orig/kernel/module.c
390-+++ linux-4.9.31/kernel/module.c
389+--- linux-4.9.33.orig/kernel/module.c
390++++ linux-4.9.33/kernel/module.c
391391 @@ -63,6 +63,7 @@
392392 #include <linux/dynamic_debug.h>
393393 #include <uapi/linux/module.h>
@@ -414,9 +414,9 @@
414414
415415 return 0;
416416 }
417---- linux-4.9.31.orig/kernel/ptrace.c
418-+++ linux-4.9.31/kernel/ptrace.c
419-@@ -1116,6 +1116,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
417+--- linux-4.9.33.orig/kernel/ptrace.c
418++++ linux-4.9.33/kernel/ptrace.c
419+@@ -1122,6 +1122,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
420420 {
421421 struct task_struct *child;
422422 long ret;
@@ -428,7 +428,7 @@
428428
429429 if (request == PTRACE_TRACEME) {
430430 ret = ptrace_traceme();
431-@@ -1265,6 +1270,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
431+@@ -1271,6 +1276,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
432432 {
433433 struct task_struct *child;
434434 long ret;
@@ -440,8 +440,8 @@
440440
441441 if (request == PTRACE_TRACEME) {
442442 ret = ptrace_traceme();
443---- linux-4.9.31.orig/kernel/reboot.c
444-+++ linux-4.9.31/kernel/reboot.c
443+--- linux-4.9.33.orig/kernel/reboot.c
444++++ linux-4.9.33/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.31.orig/kernel/sched/core.c
463-+++ linux-4.9.31/kernel/sched/core.c
462+--- linux-4.9.33.orig/kernel/sched/core.c
463++++ linux-4.9.33/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.31.orig/kernel/signal.c
474-+++ linux-4.9.31/kernel/signal.c
473+--- linux-4.9.33.orig/kernel/signal.c
474++++ linux-4.9.33/kernel/signal.c
475475 @@ -2847,6 +2847,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
476476 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
477477 {
@@ -517,8 +517,8 @@
517517
518518 return do_send_specific(tgid, pid, sig, info);
519519 }
520---- linux-4.9.31.orig/kernel/sys.c
521-+++ linux-4.9.31/kernel/sys.c
520+--- linux-4.9.33.orig/kernel/sys.c
521++++ linux-4.9.33/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.31.orig/kernel/time/ntp.c
552-+++ linux-4.9.31/kernel/time/ntp.c
551+--- linux-4.9.33.orig/kernel/time/ntp.c
552++++ linux-4.9.33/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.31.orig/net/ipv4/raw.c
587-+++ linux-4.9.31/net/ipv4/raw.c
586+--- linux-4.9.33.orig/net/ipv4/raw.c
587++++ linux-4.9.33/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.31.orig/net/ipv4/udp.c
600-+++ linux-4.9.31/net/ipv4/udp.c
599+--- linux-4.9.33.orig/net/ipv4/udp.c
600++++ linux-4.9.33/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.31.orig/net/ipv6/raw.c
611-+++ linux-4.9.31/net/ipv6/raw.c
610+--- linux-4.9.33.orig/net/ipv6/raw.c
611++++ linux-4.9.33/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.31.orig/net/ipv6/udp.c
624-+++ linux-4.9.31/net/ipv6/udp.c
623+--- linux-4.9.33.orig/net/ipv6/udp.c
624++++ linux-4.9.33/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.31.orig/net/socket.c
635-+++ linux-4.9.31/net/socket.c
634+--- linux-4.9.33.orig/net/socket.c
635++++ linux-4.9.33/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.31.orig/net/unix/af_unix.c
648-+++ linux-4.9.31/net/unix/af_unix.c
647+--- linux-4.9.33.orig/net/unix/af_unix.c
648++++ linux-4.9.33/net/unix/af_unix.c
649649 @@ -2145,6 +2145,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.31.orig/security/Kconfig
669-+++ linux-4.9.31/security/Kconfig
668+--- linux-4.9.33.orig/security/Kconfig
669++++ linux-4.9.33/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.31.orig/security/Makefile
679-+++ linux-4.9.31/security/Makefile
678+--- linux-4.9.33.orig/security/Makefile
679++++ linux-4.9.33/security/Makefile
680680 @@ -29,3 +29,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
681681 # Object integrity file lists
682682 subdir-$(CONFIG_INTEGRITY) += integrity
旧リポジトリブラウザで表示