OSDN > 浏览软件 > System > Operating System Kernels > Linux > TOMOYO > SCM > SVN > 提交

TOMOYO
Fork

R/O
SSH
HTTPS

tomoyo: 提交

Commit MetaInfo

修订版	6659 (tree)
时间	2018-07-23 22:23:58
作者	kumaneko

Log Message

(empty log message)

更改概述

modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-3.10-centos-7.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-3.18.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-4.14.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-4.17.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-4.18.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-4.4.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-4.9.diff (diff)
modified: trunk/1.8.x/ccs-patch/specs/build-c7-3.10.sh (diff)

差异

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-3.10-centos-7.diff (revision 6658)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-3.10-centos-7.diff (revision 6659)

		@@ -1,6 +1,6 @@
1	1	This is TOMOYO Linux patch for CentOS 7.
2	2
3		-Source code for this patch is http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-862.6.3.el7.src.rpm
	3	+Source code for this patch is http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-862.9.1.el7.src.rpm
4	4	---
5	5	fs/exec.c \| 2
6	6	fs/open.c \| 2

		@@ -28,8 +28,8 @@
28	28	security/security.c \| 111 +++++++++++++++++++++++++++++++++++++++++-----
29	29	24 files changed, 248 insertions(+), 37 deletions(-)
30	30
31		---- linux-3.10.0-862.6.3.el7.orig/fs/exec.c
32		-+++ linux-3.10.0-862.6.3.el7/fs/exec.c
	31	+--- linux-3.10.0-862.9.1.el7.orig/fs/exec.c
	32	++++ linux-3.10.0-862.9.1.el7/fs/exec.c
33	33	@@ -1592,7 +1592,7 @@ static int do_execve_common(struct filen
34	34	if (retval < 0)
35	35	goto out;

		@@ -39,8 +39,8 @@
39	39	if (retval < 0)
40	40	goto out;
41	41
42		---- linux-3.10.0-862.6.3.el7.orig/fs/open.c
43		-+++ linux-3.10.0-862.6.3.el7/fs/open.c
	42	+--- linux-3.10.0-862.9.1.el7.orig/fs/open.c
	43	++++ linux-3.10.0-862.9.1.el7/fs/open.c
44	44	@@ -1142,6 +1142,8 @@ EXPORT_SYMBOL(sys_close);
45	45	*/
46	46	SYSCALL_DEFINE0(vhangup)

		@@ -50,8 +50,8 @@
50	50	if (capable(CAP_SYS_TTY_CONFIG)) {
51	51	tty_vhangup_self();
52	52	return 0;
53		---- linux-3.10.0-862.6.3.el7.orig/fs/proc/version.c
54		-+++ linux-3.10.0-862.6.3.el7/fs/proc/version.c
	53	+--- linux-3.10.0-862.9.1.el7.orig/fs/proc/version.c
	54	++++ linux-3.10.0-862.9.1.el7/fs/proc/version.c
55	55	@@ -32,3 +32,10 @@ static int __init proc_version_init(void
56	56	return 0;
57	57	}

		@@ -59,12 +59,12 @@
59	59	+
60	60	+static int __init ccs_show_version(void)
61	61	+{
62		-+ printk(KERN_INFO "Hook version: 3.10.0-862.6.3.el7 2018/07/14\n");
	62	++ printk(KERN_INFO "Hook version: 3.10.0-862.9.1.el7 2018/07/23\n");
63	63	+ return 0;
64	64	+}
65	65	+module_init(ccs_show_version);
66		---- linux-3.10.0-862.6.3.el7.orig/include/linux/init_task.h
67		-+++ linux-3.10.0-862.6.3.el7/include/linux/init_task.h
	66	+--- linux-3.10.0-862.9.1.el7.orig/include/linux/init_task.h
	67	++++ linux-3.10.0-862.9.1.el7/include/linux/init_task.h
68	68	@@ -173,6 +173,14 @@ extern struct task_group root_task_group
69	69	# define INIT_RT_MUTEXES(tsk)
70	70	#endif

		@@ -88,8 +88,8 @@
88	88	}
89	89
90	90
91		---- linux-3.10.0-862.6.3.el7.orig/include/linux/sched.h
92		-+++ linux-3.10.0-862.6.3.el7/include/linux/sched.h
	91	+--- linux-3.10.0-862.9.1.el7.orig/include/linux/sched.h
	92	++++ linux-3.10.0-862.9.1.el7/include/linux/sched.h
93	93	@@ -4,6 +4,8 @@
94	94	#include <uapi/linux/sched.h>
95	95	#include <linux/rh_kabi.h>

		@@ -110,8 +110,8 @@
110	110	};
111	111
112	112	/* Future-safe accessor for struct task_struct's cpus_allowed. */
113		---- linux-3.10.0-862.6.3.el7.orig/include/linux/security.h
114		-+++ linux-3.10.0-862.6.3.el7/include/linux/security.h
	113	+--- linux-3.10.0-862.9.1.el7.orig/include/linux/security.h
	114	++++ linux-3.10.0-862.9.1.el7/include/linux/security.h
115	115	@@ -55,6 +55,7 @@ struct msg_queue;
116	116	struct xattr;
117	117	struct xfrm_sec_ctx;

		@@ -323,8 +323,8 @@
323	323	}
324	324	#endif /* CONFIG_SECURITY_PATH */
325	325
326		---- linux-3.10.0-862.6.3.el7.orig/include/net/ip.h
327		-+++ linux-3.10.0-862.6.3.el7/include/net/ip.h
	326	+--- linux-3.10.0-862.9.1.el7.orig/include/net/ip.h
	327	++++ linux-3.10.0-862.9.1.el7/include/net/ip.h
328	328	@@ -230,6 +230,8 @@ void inet_get_local_port_range(struct ne
329	329	extern unsigned long *sysctl_local_reserved_ports;
330	330	static inline int inet_is_reserved_local_port(int port)

		@@ -334,8 +334,8 @@
334	334	return test_bit(port, sysctl_local_reserved_ports);
335	335	}
336	336
337		---- linux-3.10.0-862.6.3.el7.orig/kernel/fork.c
338		-+++ linux-3.10.0-862.6.3.el7/kernel/fork.c
	337	+--- linux-3.10.0-862.9.1.el7.orig/kernel/fork.c
	338	++++ linux-3.10.0-862.9.1.el7/kernel/fork.c
339	339	@@ -278,6 +278,7 @@ void __put_task_struct(struct task_struc
340	340	delayacct_tsk_free(tsk);
341	341	put_signal_struct(tsk->signal);

		@@ -362,8 +362,8 @@
362	362	bad_fork_cleanup_perf:
363	363	perf_event_free_task(p);
364	364	bad_fork_cleanup_policy:
365		---- linux-3.10.0-862.6.3.el7.orig/kernel/kexec.c
366		-+++ linux-3.10.0-862.6.3.el7/kernel/kexec.c
	365	+--- linux-3.10.0-862.9.1.el7.orig/kernel/kexec.c
	366	++++ linux-3.10.0-862.9.1.el7/kernel/kexec.c
367	367	@@ -190,6 +190,8 @@ SYSCALL_DEFINE4(kexec_load, unsigned lon
368	368	/* We only trust the superuser with rebooting the system. */
369	369	if (!capable(CAP_SYS_BOOT) \|\| kexec_load_disabled)

		@@ -373,8 +373,8 @@
373	373
374	374	if (get_securelevel() > 0)
375	375	return -EPERM;
376		---- linux-3.10.0-862.6.3.el7.orig/kernel/module.c
377		-+++ linux-3.10.0-862.6.3.el7/kernel/module.c
	376	+--- linux-3.10.0-862.9.1.el7.orig/kernel/module.c
	377	++++ linux-3.10.0-862.9.1.el7/kernel/module.c
378	378	@@ -66,6 +66,7 @@
379	379	#endif /* __GENKSYMS__ */
380	380	#include <uapi/linux/module.h>

		@@ -401,8 +401,8 @@
401	401
402	402	return 0;
403	403	}
404		---- linux-3.10.0-862.6.3.el7.orig/kernel/ptrace.c
405		-+++ linux-3.10.0-862.6.3.el7/kernel/ptrace.c
	404	+--- linux-3.10.0-862.9.1.el7.orig/kernel/ptrace.c
	405	++++ linux-3.10.0-862.9.1.el7/kernel/ptrace.c
406	406	@@ -1082,6 +1082,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
407	407	{
408	408	struct task_struct *child;

		@@ -427,8 +427,8 @@
427	427
428	428	if (request == PTRACE_TRACEME) {
429	429	ret = ptrace_traceme();
430		---- linux-3.10.0-862.6.3.el7.orig/kernel/sched/core.c
431		-+++ linux-3.10.0-862.6.3.el7/kernel/sched/core.c
	430	+--- linux-3.10.0-862.9.1.el7.orig/kernel/sched/core.c
	431	++++ linux-3.10.0-862.9.1.el7/kernel/sched/core.c
432	432	@@ -4279,6 +4279,8 @@ int can_nice(const struct task_struct *p
433	433	SYSCALL_DEFINE1(nice, int, increment)
434	434	{

		@@ -438,8 +438,8 @@
438	438
439	439	/*
440	440	* Setpriority might change our priority at the same moment.
441		---- linux-3.10.0-862.6.3.el7.orig/kernel/signal.c
442		-+++ linux-3.10.0-862.6.3.el7/kernel/signal.c
	441	+--- linux-3.10.0-862.9.1.el7.orig/kernel/signal.c
	442	++++ linux-3.10.0-862.9.1.el7/kernel/signal.c
443	443	@@ -2946,6 +2946,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
444	444	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
445	445	{

		@@ -485,8 +485,8 @@
485	485
486	486	return do_send_specific(tgid, pid, sig, info);
487	487	}
488		---- linux-3.10.0-862.6.3.el7.orig/kernel/sys.c
489		-+++ linux-3.10.0-862.6.3.el7/kernel/sys.c
	488	+--- linux-3.10.0-862.9.1.el7.orig/kernel/sys.c
	489	++++ linux-3.10.0-862.9.1.el7/kernel/sys.c
490	490	@@ -194,6 +194,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
491	491
492	492	if (which > PRIO_USER \|\| which < PRIO_PROCESS)

		@@ -525,8 +525,8 @@
525	525
526	526	down_write(&uts_sem);
527	527	errno = -EFAULT;
528		---- linux-3.10.0-862.6.3.el7.orig/kernel/time/ntp.c
529		-+++ linux-3.10.0-862.6.3.el7/kernel/time/ntp.c
	528	+--- linux-3.10.0-862.9.1.el7.orig/kernel/time/ntp.c
	529	++++ linux-3.10.0-862.9.1.el7/kernel/time/ntp.c
530	530	@@ -16,6 +16,7 @@
531	531	#include <linux/mm.h>
532	532	#include <linux/module.h>

		@@ -560,8 +560,8 @@
560	560
561	561	return 0;
562	562	}
563		---- linux-3.10.0-862.6.3.el7.orig/net/ipv4/raw.c
564		-+++ linux-3.10.0-862.6.3.el7/net/ipv4/raw.c
	563	+--- linux-3.10.0-862.9.1.el7.orig/net/ipv4/raw.c
	564	++++ linux-3.10.0-862.9.1.el7/net/ipv4/raw.c
565	565	@@ -706,6 +706,10 @@ static int raw_recvmsg(struct kiocb *ioc
566	566	skb = skb_recv_datagram(sk, flags, noblock, &err);
567	567	if (!skb)

		@@ -573,8 +573,8 @@
573	573
574	574	copied = skb->len;
575	575	if (len < copied) {
576		---- linux-3.10.0-862.6.3.el7.orig/net/ipv4/udp.c
577		-+++ linux-3.10.0-862.6.3.el7/net/ipv4/udp.c
	576	+--- linux-3.10.0-862.9.1.el7.orig/net/ipv4/udp.c
	577	++++ linux-3.10.0-862.9.1.el7/net/ipv4/udp.c
578	578	@@ -1392,6 +1392,10 @@ try_again:
579	579	skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
580	580	if (!skb)

		@@ -586,8 +586,8 @@
586	586
587	587	ulen = skb->len - sizeof(struct udphdr);
588	588	copied = len;
589		---- linux-3.10.0-862.6.3.el7.orig/net/ipv6/raw.c
590		-+++ linux-3.10.0-862.6.3.el7/net/ipv6/raw.c
	589	+--- linux-3.10.0-862.9.1.el7.orig/net/ipv6/raw.c
	590	++++ linux-3.10.0-862.9.1.el7/net/ipv6/raw.c
591	591	@@ -468,6 +468,10 @@ static int rawv6_recvmsg(struct kiocb *i
592	592	skb = skb_recv_datagram(sk, flags, noblock, &err);
593	593	if (!skb)

		@@ -599,8 +599,8 @@
599	599
600	600	copied = skb->len;
601	601	if (copied > len) {
602		---- linux-3.10.0-862.6.3.el7.orig/net/ipv6/udp.c
603		-+++ linux-3.10.0-862.6.3.el7/net/ipv6/udp.c
	602	+--- linux-3.10.0-862.9.1.el7.orig/net/ipv6/udp.c
	603	++++ linux-3.10.0-862.9.1.el7/net/ipv6/udp.c
604	604	@@ -384,6 +384,10 @@ try_again:
605	605	skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
606	606	if (!skb)

		@@ -612,8 +612,8 @@
612	612
613	613	ulen = skb->len - sizeof(struct udphdr);
614	614	copied = len;
615		---- linux-3.10.0-862.6.3.el7.orig/net/socket.c
616		-+++ linux-3.10.0-862.6.3.el7/net/socket.c
	615	+--- linux-3.10.0-862.9.1.el7.orig/net/socket.c
	616	++++ linux-3.10.0-862.9.1.el7/net/socket.c
617	617	@@ -1660,6 +1660,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
618	618	if (err < 0)
619	619	goto out_fd;

		@@ -625,8 +625,8 @@
625	625	if (upeer_sockaddr) {
626	626	if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
627	627	&len, 2) < 0) {
628		---- linux-3.10.0-862.6.3.el7.orig/net/unix/af_unix.c
629		-+++ linux-3.10.0-862.6.3.el7/net/unix/af_unix.c
	628	+--- linux-3.10.0-862.9.1.el7.orig/net/unix/af_unix.c
	629	++++ linux-3.10.0-862.9.1.el7/net/unix/af_unix.c
630	630	@@ -2137,6 +2137,10 @@ static int unix_dgram_recvmsg(struct kio
631	631	wake_up_interruptible_sync_poll(&u->peer_wait,
632	632	POLLOUT \| POLLWRNORM \| POLLWRBAND);

		@@ -638,8 +638,8 @@
638	638	if (msg->msg_name)
639	639	unix_copy_addr(msg, skb->sk);
640	640
641		---- linux-3.10.0-862.6.3.el7.orig/security/Kconfig
642		-+++ linux-3.10.0-862.6.3.el7/security/Kconfig
	641	+--- linux-3.10.0-862.9.1.el7.orig/security/Kconfig
	642	++++ linux-3.10.0-862.9.1.el7/security/Kconfig
643	643	@@ -194,5 +194,7 @@ config DEFAULT_SECURITY
644	644	default "yama" if DEFAULT_SECURITY_YAMA
645	645	default "" if DEFAULT_SECURITY_DAC

		@@ -648,8 +648,8 @@
648	648	+
649	649	endmenu
650	650
651		---- linux-3.10.0-862.6.3.el7.orig/security/Makefile
652		-+++ linux-3.10.0-862.6.3.el7/security/Makefile
	651	+--- linux-3.10.0-862.9.1.el7.orig/security/Makefile
	652	++++ linux-3.10.0-862.9.1.el7/security/Makefile
653	653	@@ -29,3 +29,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
654	654	# Object integrity file lists
655	655	subdir-$(CONFIG_INTEGRITY) += integrity

		@@ -657,8 +657,8 @@
657	657	+
658	658	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
659	659	+obj-$(CONFIG_CCSECURITY) += ccsecurity/built-in.o
660		---- linux-3.10.0-862.6.3.el7.orig/security/security.c
661		-+++ linux-3.10.0-862.6.3.el7/security/security.c
	660	+--- linux-3.10.0-862.9.1.el7.orig/security/security.c
	661	++++ linux-3.10.0-862.9.1.el7/security/security.c
662	662	@@ -224,7 +224,10 @@ int security_syslog(int type)
663	663
664	664	int security_settime(const struct timespec ts, const struct timezone tz)

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-3.18.diff (revision 6658)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-3.18.diff (revision 6659)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 3.18.115.
	1	+This is TOMOYO Linux patch for kernel 3.18.116.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.115.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.116.tar.xz
4	4	---
5	5	fs/exec.c \| 2
6	6	fs/open.c \| 2

		@@ -29,8 +29,8 @@
29	29	security/security.c \| 111 +++++++++++++++++++++++++++++++++++++++++-----
30	30	25 files changed, 252 insertions(+), 37 deletions(-)
31	31
32		---- linux-3.18.115.orig/fs/exec.c
33		-+++ linux-3.18.115/fs/exec.c
	32	+--- linux-3.18.116.orig/fs/exec.c
	33	++++ linux-3.18.116/fs/exec.c
34	34	@@ -1463,7 +1463,7 @@ static int exec_binprm(struct linux_binp
35	35	old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
36	36	rcu_read_unlock();

		@@ -40,8 +40,8 @@
40	40	if (ret >= 0) {
41	41	audit_bprm(bprm);
42	42	trace_sched_process_exec(current, old_pid, bprm);
43		---- linux-3.18.115.orig/fs/open.c
44		-+++ linux-3.18.115/fs/open.c
	43	+--- linux-3.18.116.orig/fs/open.c
	44	++++ linux-3.18.116/fs/open.c
45	45	@@ -1091,6 +1091,8 @@ EXPORT_SYMBOL(sys_close);
46	46	*/
47	47	SYSCALL_DEFINE0(vhangup)

		@@ -51,8 +51,8 @@
51	51	if (capable(CAP_SYS_TTY_CONFIG)) {
52	52	tty_vhangup_self();
53	53	return 0;
54		---- linux-3.18.115.orig/fs/proc/version.c
55		-+++ linux-3.18.115/fs/proc/version.c
	54	+--- linux-3.18.116.orig/fs/proc/version.c
	55	++++ linux-3.18.116/fs/proc/version.c
56	56	@@ -32,3 +32,10 @@ static int __init proc_version_init(void
57	57	return 0;
58	58	}

		@@ -60,12 +60,12 @@
60	60	+
61	61	+static int __init ccs_show_version(void)
62	62	+{
63		-+ printk(KERN_INFO "Hook version: 3.18.115 2018/07/12\n");
	63	++ printk(KERN_INFO "Hook version: 3.18.116 2018/07/23\n");
64	64	+ return 0;
65	65	+}
66	66	+fs_initcall(ccs_show_version);
67		---- linux-3.18.115.orig/include/linux/init_task.h
68		-+++ linux-3.18.115/include/linux/init_task.h
	67	+--- linux-3.18.116.orig/include/linux/init_task.h
	68	++++ linux-3.18.116/include/linux/init_task.h
69	69	@@ -166,6 +166,14 @@ extern struct task_group root_task_group
70	70	# define INIT_RT_MUTEXES(tsk)
71	71	#endif

		@@ -89,8 +89,8 @@
89	89	}
90	90
91	91
92		---- linux-3.18.115.orig/include/linux/sched.h
93		-+++ linux-3.18.115/include/linux/sched.h
	92	+--- linux-3.18.116.orig/include/linux/sched.h
	93	++++ linux-3.18.116/include/linux/sched.h
94	94	@@ -6,6 +6,8 @@
95	95	#include <linux/sched/prio.h>
96	96

		@@ -111,8 +111,8 @@
111	111	};
112	112
113	113	/* Future-safe accessor for struct task_struct's cpus_allowed. */
114		---- linux-3.18.115.orig/include/linux/security.h
115		-+++ linux-3.18.115/include/linux/security.h
	114	+--- linux-3.18.116.orig/include/linux/security.h
	115	++++ linux-3.18.116/include/linux/security.h
116	116	@@ -53,6 +53,7 @@ struct msg_queue;
117	117	struct xattr;
118	118	struct xfrm_sec_ctx;

		@@ -324,8 +324,8 @@
324	324	}
325	325	#endif /* CONFIG_SECURITY_PATH */
326	326
327		---- linux-3.18.115.orig/include/net/ip.h
328		-+++ linux-3.18.115/include/net/ip.h
	327	+--- linux-3.18.116.orig/include/net/ip.h
	328	++++ linux-3.18.116/include/net/ip.h
329	329	@@ -218,6 +218,8 @@ void inet_get_local_port_range(struct ne
330	330	#ifdef CONFIG_SYSCTL
331	331	static inline int inet_is_local_reserved_port(struct net *net, int port)

		@@ -344,8 +344,8 @@
344	344	return 0;
345	345	}
346	346	#endif
347		---- linux-3.18.115.orig/kernel/fork.c
348		-+++ linux-3.18.115/kernel/fork.c
	347	+--- linux-3.18.116.orig/kernel/fork.c
	348	++++ linux-3.18.116/kernel/fork.c
349	349	@@ -246,6 +246,7 @@ void __put_task_struct(struct task_struc
350	350	delayacct_tsk_free(tsk);
351	351	put_signal_struct(tsk->signal);

		@@ -372,8 +372,8 @@
372	372	bad_fork_cleanup_perf:
373	373	perf_event_free_task(p);
374	374	bad_fork_cleanup_policy:
375		---- linux-3.18.115.orig/kernel/kexec.c
376		-+++ linux-3.18.115/kernel/kexec.c
	375	+--- linux-3.18.116.orig/kernel/kexec.c
	376	++++ linux-3.18.116/kernel/kexec.c
377	377	@@ -41,6 +41,7 @@
378	378	#include <asm/uaccess.h>
379	379	#include <asm/io.h>

		@@ -391,8 +391,8 @@
391	391
392	392	/*
393	393	* Verify we have a legal set of flags
394		---- linux-3.18.115.orig/kernel/module.c
395		-+++ linux-3.18.115/kernel/module.c
	394	+--- linux-3.18.116.orig/kernel/module.c
	395	++++ linux-3.18.116/kernel/module.c
396	396	@@ -62,6 +62,7 @@
397	397	#include <linux/bsearch.h>
398	398	#include <uapi/linux/module.h>

		@@ -419,8 +419,8 @@
419	419
420	420	return 0;
421	421	}
422		---- linux-3.18.115.orig/kernel/ptrace.c
423		-+++ linux-3.18.115/kernel/ptrace.c
	422	+--- linux-3.18.116.orig/kernel/ptrace.c
	423	++++ linux-3.18.116/kernel/ptrace.c
424	424	@@ -1081,6 +1081,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
425	425	{
426	426	struct task_struct *child;

		@@ -445,8 +445,8 @@
445	445
446	446	if (request == PTRACE_TRACEME) {
447	447	ret = ptrace_traceme();
448		---- linux-3.18.115.orig/kernel/reboot.c
449		-+++ linux-3.18.115/kernel/reboot.c
	448	+--- linux-3.18.116.orig/kernel/reboot.c
	449	++++ linux-3.18.116/kernel/reboot.c
450	450	@@ -16,6 +16,7 @@
451	451	#include <linux/syscalls.h>
452	452	#include <linux/syscore_ops.h>

		@@ -464,8 +464,8 @@
464	464
465	465	/*
466	466	* If pid namespaces are enabled and the current task is in a child
467		---- linux-3.18.115.orig/kernel/sched/core.c
468		-+++ linux-3.18.115/kernel/sched/core.c
	467	+--- linux-3.18.116.orig/kernel/sched/core.c
	468	++++ linux-3.18.116/kernel/sched/core.c
469	469	@@ -3218,6 +3218,8 @@ int can_nice(const struct task_struct *p
470	470	SYSCALL_DEFINE1(nice, int, increment)
471	471	{

		@@ -475,8 +475,8 @@
475	475
476	476	/*
477	477	* Setpriority might change our priority at the same moment.
478		---- linux-3.18.115.orig/kernel/signal.c
479		-+++ linux-3.18.115/kernel/signal.c
	478	+--- linux-3.18.116.orig/kernel/signal.c
	479	++++ linux-3.18.116/kernel/signal.c
480	480	@@ -2901,6 +2901,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
481	481	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
482	482	{

		@@ -522,8 +522,8 @@
522	522
523	523	return do_send_specific(tgid, pid, sig, info);
524	524	}
525		---- linux-3.18.115.orig/kernel/sys.c
526		-+++ linux-3.18.115/kernel/sys.c
	525	+--- linux-3.18.116.orig/kernel/sys.c
	526	++++ linux-3.18.116/kernel/sys.c
527	527	@@ -171,6 +171,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
528	528
529	529	if (which > PRIO_USER \|\| which < PRIO_PROCESS)

		@@ -553,8 +553,8 @@
553	553
554	554	down_write(&uts_sem);
555	555	errno = -EFAULT;
556		---- linux-3.18.115.orig/kernel/time/ntp.c
557		-+++ linux-3.18.115/kernel/time/ntp.c
	556	+--- linux-3.18.116.orig/kernel/time/ntp.c
	557	++++ linux-3.18.116/kernel/time/ntp.c
558	558	@@ -16,6 +16,7 @@
559	559	#include <linux/mm.h>
560	560	#include <linux/module.h>

		@@ -588,8 +588,8 @@
588	588
589	589	/*
590	590	* Check for potential multiplication overflows that can
591		---- linux-3.18.115.orig/net/ipv4/raw.c
592		-+++ linux-3.18.115/net/ipv4/raw.c
	591	+--- linux-3.18.116.orig/net/ipv4/raw.c
	592	++++ linux-3.18.116/net/ipv4/raw.c
593	593	@@ -719,6 +719,10 @@ static int raw_recvmsg(struct kiocb *ioc
594	594	skb = skb_recv_datagram(sk, flags, noblock, &err);
595	595	if (!skb)

		@@ -601,8 +601,8 @@
601	601
602	602	copied = skb->len;
603	603	if (len < copied) {
604		---- linux-3.18.115.orig/net/ipv4/udp.c
605		-+++ linux-3.18.115/net/ipv4/udp.c
	604	+--- linux-3.18.116.orig/net/ipv4/udp.c
	605	++++ linux-3.18.116/net/ipv4/udp.c
606	606	@@ -1266,6 +1266,10 @@ try_again:
607	607	&peeked, &off, &err);
608	608	if (!skb)

		@@ -614,8 +614,8 @@
614	614
615	615	ulen = skb->len - sizeof(struct udphdr);
616	616	copied = len;
617		---- linux-3.18.115.orig/net/ipv6/raw.c
618		-+++ linux-3.18.115/net/ipv6/raw.c
	617	+--- linux-3.18.116.orig/net/ipv6/raw.c
	618	++++ linux-3.18.116/net/ipv6/raw.c
619	619	@@ -478,6 +478,10 @@ static int rawv6_recvmsg(struct kiocb *i
620	620	skb = skb_recv_datagram(sk, flags, noblock, &err);
621	621	if (!skb)

		@@ -627,8 +627,8 @@
627	627
628	628	copied = skb->len;
629	629	if (copied > len) {
630		---- linux-3.18.115.orig/net/ipv6/udp.c
631		-+++ linux-3.18.115/net/ipv6/udp.c
	630	+--- linux-3.18.116.orig/net/ipv6/udp.c
	631	++++ linux-3.18.116/net/ipv6/udp.c
632	632	@@ -403,6 +403,10 @@ try_again:
633	633	&peeked, &off, &err);
634	634	if (!skb)

		@@ -640,8 +640,8 @@
640	640
641	641	ulen = skb->len - sizeof(struct udphdr);
642	642	copied = len;
643		---- linux-3.18.115.orig/net/socket.c
644		-+++ linux-3.18.115/net/socket.c
	643	+--- linux-3.18.116.orig/net/socket.c
	644	++++ linux-3.18.116/net/socket.c
645	645	@@ -1637,6 +1637,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
646	646	if (err < 0)
647	647	goto out_fd;

		@@ -653,8 +653,8 @@
653	653	if (upeer_sockaddr) {
654	654	if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
655	655	&len, 2) < 0) {
656		---- linux-3.18.115.orig/net/unix/af_unix.c
657		-+++ linux-3.18.115/net/unix/af_unix.c
	656	+--- linux-3.18.116.orig/net/unix/af_unix.c
	657	++++ linux-3.18.116/net/unix/af_unix.c
658	658	@@ -1981,6 +1981,10 @@ static int unix_dgram_recvmsg(struct kio
659	659	wake_up_interruptible_sync_poll(&u->peer_wait,
660	660	POLLOUT \| POLLWRNORM \| POLLWRBAND);

		@@ -666,8 +666,8 @@
666	666	if (msg->msg_name)
667	667	unix_copy_addr(msg, skb->sk);
668	668
669		---- linux-3.18.115.orig/security/Kconfig
670		-+++ linux-3.18.115/security/Kconfig
	669	+--- linux-3.18.116.orig/security/Kconfig
	670	++++ linux-3.18.116/security/Kconfig
671	671	@@ -167,5 +167,7 @@ config DEFAULT_SECURITY
672	672	default "yama" if DEFAULT_SECURITY_YAMA
673	673	default "" if DEFAULT_SECURITY_DAC

		@@ -676,8 +676,8 @@
676	676	+
677	677	endmenu
678	678
679		---- linux-3.18.115.orig/security/Makefile
680		-+++ linux-3.18.115/security/Makefile
	679	+--- linux-3.18.116.orig/security/Makefile
	680	++++ linux-3.18.116/security/Makefile
681	681	@@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
682	682	# Object integrity file lists
683	683	subdir-$(CONFIG_INTEGRITY) += integrity

		@@ -685,8 +685,8 @@
685	685	+
686	686	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
687	687	+obj-$(CONFIG_CCSECURITY) += ccsecurity/
688		---- linux-3.18.115.orig/security/security.c
689		-+++ linux-3.18.115/security/security.c
	688	+--- linux-3.18.116.orig/security/security.c
	689	++++ linux-3.18.116/security/security.c
690	690	@@ -203,7 +203,10 @@ int security_syslog(int type)
691	691
692	692	int security_settime(const struct timespec ts, const struct timezone tz)

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.14.diff (revision 6658)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.14.diff (revision 6659)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 4.14.55.
	1	+This is TOMOYO Linux patch for kernel 4.14.57.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.55.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.57.tar.xz
4	4	---
5	5	fs/exec.c \| 2 -
6	6	fs/open.c \| 2 +

		@@ -28,8 +28,8 @@
28	28	security/security.c \| 9 +++++-
29	29	24 files changed, 153 insertions(+), 29 deletions(-)
30	30
31		---- linux-4.14.55.orig/fs/exec.c
32		-+++ linux-4.14.55/fs/exec.c
	31	+--- linux-4.14.57.orig/fs/exec.c
	32	++++ linux-4.14.57/fs/exec.c
33	33	@@ -1677,7 +1677,7 @@ static int exec_binprm(struct linux_binp
34	34	old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
35	35	rcu_read_unlock();

		@@ -39,8 +39,8 @@
39	39	if (ret >= 0) {
40	40	audit_bprm(bprm);
41	41	trace_sched_process_exec(current, old_pid, bprm);
42		---- linux-4.14.55.orig/fs/open.c
43		-+++ linux-4.14.55/fs/open.c
	42	+--- linux-4.14.57.orig/fs/open.c
	43	++++ linux-4.14.57/fs/open.c
44	44	@@ -1171,6 +1171,8 @@ EXPORT_SYMBOL(sys_close);
45	45	*/
46	46	SYSCALL_DEFINE0(vhangup)

		@@ -50,8 +50,8 @@
50	50	if (capable(CAP_SYS_TTY_CONFIG)) {
51	51	tty_vhangup_self();
52	52	return 0;
53		---- linux-4.14.55.orig/fs/proc/version.c
54		-+++ linux-4.14.55/fs/proc/version.c
	53	+--- linux-4.14.57.orig/fs/proc/version.c
	54	++++ linux-4.14.57/fs/proc/version.c
55	55	@@ -33,3 +33,10 @@ static int __init proc_version_init(void
56	56	return 0;
57	57	}

		@@ -59,12 +59,12 @@
59	59	+
60	60	+static int __init ccs_show_version(void)
61	61	+{
62		-+ printk(KERN_INFO "Hook version: 4.14.55 2018/07/12\n");
	62	++ printk(KERN_INFO "Hook version: 4.14.57 2018/07/23\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-4.14.55.orig/include/linux/init_task.h
67		-+++ linux-4.14.55/include/linux/init_task.h
	66	+--- linux-4.14.57.orig/include/linux/init_task.h
	67	++++ linux-4.14.57/include/linux/init_task.h
68	68	@@ -219,6 +219,14 @@ extern struct cred init_cred;
69	69	#define INIT_TASK_SECURITY
70	70	#endif

		@@ -88,8 +88,8 @@
88	88	}
89	89
90	90
91		---- linux-4.14.55.orig/include/linux/sched.h
92		-+++ linux-4.14.55/include/linux/sched.h
	91	+--- linux-4.14.57.orig/include/linux/sched.h
	92	++++ linux-4.14.57/include/linux/sched.h
93	93	@@ -33,6 +33,7 @@ struct audit_context;
94	94	struct backing_dev_info;
95	95	struct bio_list;

		@@ -109,8 +109,8 @@
109	109
110	110	/*
111	111	* New fields for task_struct should be added above here, so that
112		---- linux-4.14.55.orig/include/linux/security.h
113		-+++ linux-4.14.55/include/linux/security.h
	112	+--- linux-4.14.57.orig/include/linux/security.h
	113	++++ linux-4.14.57/include/linux/security.h
114	114	@@ -56,6 +56,7 @@ struct msg_queue;
115	115	struct xattr;
116	116	struct xfrm_sec_ctx;

		@@ -331,8 +331,8 @@
331	331	}
332	332	#endif /* CONFIG_SECURITY_PATH */
333	333
334		---- linux-4.14.55.orig/include/net/ip.h
335		-+++ linux-4.14.55/include/net/ip.h
	334	+--- linux-4.14.57.orig/include/net/ip.h
	335	++++ linux-4.14.57/include/net/ip.h
336	336	@@ -266,6 +266,8 @@ void inet_get_local_port_range(struct ne
337	337	#ifdef CONFIG_SYSCTL
338	338	static inline int inet_is_local_reserved_port(struct net *net, int port)

		@@ -351,8 +351,8 @@
351	351	return 0;
352	352	}
353	353
354		---- linux-4.14.55.orig/kernel/kexec.c
355		-+++ linux-4.14.55/kernel/kexec.c
	354	+--- linux-4.14.57.orig/kernel/kexec.c
	355	++++ linux-4.14.57/kernel/kexec.c
356	356	@@ -17,7 +17,7 @@
357	357	#include <linux/syscalls.h>
358	358	#include <linux/vmalloc.h>

		@@ -371,8 +371,8 @@
371	371
372	372	/*
373	373	* Verify we have a legal set of flags
374		---- linux-4.14.55.orig/kernel/module.c
375		-+++ linux-4.14.55/kernel/module.c
	374	+--- linux-4.14.57.orig/kernel/module.c
	375	++++ linux-4.14.57/kernel/module.c
376	376	@@ -66,6 +66,7 @@
377	377	#include <linux/audit.h>
378	378	#include <uapi/linux/module.h>

		@@ -399,8 +399,8 @@
399	399
400	400	return 0;
401	401	}
402		---- linux-4.14.55.orig/kernel/ptrace.c
403		-+++ linux-4.14.55/kernel/ptrace.c
	402	+--- linux-4.14.57.orig/kernel/ptrace.c
	403	++++ linux-4.14.57/kernel/ptrace.c
404	404	@@ -1123,6 +1123,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
405	405	{
406	406	struct task_struct *child;

		@@ -425,8 +425,8 @@
425	425
426	426	if (request == PTRACE_TRACEME) {
427	427	ret = ptrace_traceme();
428		---- linux-4.14.55.orig/kernel/reboot.c
429		-+++ linux-4.14.55/kernel/reboot.c
	428	+--- linux-4.14.57.orig/kernel/reboot.c
	429	++++ linux-4.14.57/kernel/reboot.c
430	430	@@ -16,6 +16,7 @@
431	431	#include <linux/syscalls.h>
432	432	#include <linux/syscore_ops.h>

		@@ -444,8 +444,8 @@
444	444
445	445	/*
446	446	* If pid namespaces are enabled and the current task is in a child
447		---- linux-4.14.55.orig/kernel/sched/core.c
448		-+++ linux-4.14.55/kernel/sched/core.c
	447	+--- linux-4.14.57.orig/kernel/sched/core.c
	448	++++ linux-4.14.57/kernel/sched/core.c
449	449	@@ -3854,6 +3854,8 @@ int can_nice(const struct task_struct *p
450	450	SYSCALL_DEFINE1(nice, int, increment)
451	451	{

		@@ -455,8 +455,8 @@
455	455
456	456	/*
457	457	* Setpriority might change our priority at the same moment.
458		---- linux-4.14.55.orig/kernel/signal.c
459		-+++ linux-4.14.55/kernel/signal.c
	458	+--- linux-4.14.57.orig/kernel/signal.c
	459	++++ linux-4.14.57/kernel/signal.c
460	460	@@ -2967,6 +2967,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait,
461	461	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
462	462	{

		@@ -502,8 +502,8 @@
502	502
503	503	return do_send_specific(tgid, pid, sig, info);
504	504	}
505		---- linux-4.14.55.orig/kernel/sys.c
506		-+++ linux-4.14.55/kernel/sys.c
	505	+--- linux-4.14.57.orig/kernel/sys.c
	506	++++ linux-4.14.57/kernel/sys.c
507	507	@@ -193,6 +193,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
508	508
509	509	if (which > PRIO_USER \|\| which < PRIO_PROCESS)

		@@ -533,8 +533,8 @@
533	533
534	534	down_write(&uts_sem);
535	535	errno = -EFAULT;
536		---- linux-4.14.55.orig/kernel/time/ntp.c
537		-+++ linux-4.14.55/kernel/time/ntp.c
	536	+--- linux-4.14.57.orig/kernel/time/ntp.c
	537	++++ linux-4.14.57/kernel/time/ntp.c
538	538	@@ -18,6 +18,7 @@
539	539	#include <linux/module.h>
540	540	#include <linux/rtc.h>

		@@ -568,8 +568,8 @@
568	568
569	569	if (txc->modes & ADJ_NANO) {
570	570	struct timespec ts;
571		---- linux-4.14.55.orig/net/ipv4/raw.c
572		-+++ linux-4.14.55/net/ipv4/raw.c
	571	+--- linux-4.14.57.orig/net/ipv4/raw.c
	572	++++ linux-4.14.57/net/ipv4/raw.c
573	573	@@ -766,6 +766,10 @@ static int raw_recvmsg(struct sock *sk,
574	574	skb = skb_recv_datagram(sk, flags, noblock, &err);
575	575	if (!skb)

		@@ -581,8 +581,8 @@
581	581
582	582	copied = skb->len;
583	583	if (len < copied) {
584		---- linux-4.14.55.orig/net/ipv4/udp.c
585		-+++ linux-4.14.55/net/ipv4/udp.c
	584	+--- linux-4.14.57.orig/net/ipv4/udp.c
	585	++++ linux-4.14.57/net/ipv4/udp.c
586	586	@@ -1593,6 +1593,8 @@ try_again:
587	587	skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
588	588	if (!skb)

		@@ -592,8 +592,8 @@
592	592
593	593	ulen = udp_skb_len(skb);
594	594	copied = len;
595		---- linux-4.14.55.orig/net/ipv6/raw.c
596		-+++ linux-4.14.55/net/ipv6/raw.c
	595	+--- linux-4.14.57.orig/net/ipv6/raw.c
	596	++++ linux-4.14.57/net/ipv6/raw.c
597	597	@@ -483,6 +483,10 @@ static int rawv6_recvmsg(struct sock *sk
598	598	skb = skb_recv_datagram(sk, flags, noblock, &err);
599	599	if (!skb)

		@@ -605,8 +605,8 @@
605	605
606	606	copied = skb->len;
607	607	if (copied > len) {
608		---- linux-4.14.55.orig/net/ipv6/udp.c
609		-+++ linux-4.14.55/net/ipv6/udp.c
	608	+--- linux-4.14.57.orig/net/ipv6/udp.c
	609	++++ linux-4.14.57/net/ipv6/udp.c
610	610	@@ -371,6 +371,8 @@ try_again:
611	611	skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
612	612	if (!skb)

		@@ -616,8 +616,8 @@
616	616
617	617	ulen = udp6_skb_len(skb);
618	618	copied = len;
619		---- linux-4.14.55.orig/net/socket.c
620		-+++ linux-4.14.55/net/socket.c
	619	+--- linux-4.14.57.orig/net/socket.c
	620	++++ linux-4.14.57/net/socket.c
621	621	@@ -1586,6 +1586,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
622	622	if (err < 0)
623	623	goto out_fd;

		@@ -629,8 +629,8 @@
629	629	if (upeer_sockaddr) {
630	630	if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
631	631	&len, 2) < 0) {
632		---- linux-4.14.55.orig/net/unix/af_unix.c
633		-+++ linux-4.14.55/net/unix/af_unix.c
	632	+--- linux-4.14.57.orig/net/unix/af_unix.c
	633	++++ linux-4.14.57/net/unix/af_unix.c
634	634	@@ -2131,6 +2131,10 @@ static int unix_dgram_recvmsg(struct soc
635	635	POLLOUT \| POLLWRNORM \|
636	636	POLLWRBAND);

		@@ -650,8 +650,8 @@
650	650	mutex_unlock(&u->iolock);
651	651	out:
652	652	return err;
653		---- linux-4.14.55.orig/security/Kconfig
654		-+++ linux-4.14.55/security/Kconfig
	653	+--- linux-4.14.57.orig/security/Kconfig
	654	++++ linux-4.14.57/security/Kconfig
655	655	@@ -263,5 +263,7 @@ config DEFAULT_SECURITY
656	656	default "apparmor" if DEFAULT_SECURITY_APPARMOR
657	657	default "" if DEFAULT_SECURITY_DAC

		@@ -660,8 +660,8 @@
660	660	+
661	661	endmenu
662	662
663		---- linux-4.14.55.orig/security/Makefile
664		-+++ linux-4.14.55/security/Makefile
	663	+--- linux-4.14.57.orig/security/Makefile
	664	++++ linux-4.14.57/security/Makefile
665	665	@@ -30,3 +30,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
666	666	# Object integrity file lists
667	667	subdir-$(CONFIG_INTEGRITY) += integrity

		@@ -669,8 +669,8 @@
669	669	+
670	670	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
671	671	+obj-$(CONFIG_CCSECURITY) += ccsecurity/
672		---- linux-4.14.55.orig/security/security.c
673		-+++ linux-4.14.55/security/security.c
	672	+--- linux-4.14.57.orig/security/security.c
	673	++++ linux-4.14.57/security/security.c
674	674	@@ -976,12 +976,19 @@ int security_file_open(struct file *file
675	675
676	676	int security_task_alloc(struct task_struct *task, unsigned long clone_flags)

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.17.diff (revision 6658)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.17.diff (revision 6659)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 4.17.6.
	1	+This is TOMOYO Linux patch for kernel 4.17.9.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.17.6.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.17.9.tar.xz
4	4	---
5	5	fs/exec.c \| 2 -
6	6	fs/open.c \| 2 +

		@@ -28,8 +28,8 @@
28	28	security/security.c \| 9 +++++-
29	29	24 files changed, 148 insertions(+), 29 deletions(-)
30	30
31		---- linux-4.17.6.orig/fs/exec.c
32		-+++ linux-4.17.6/fs/exec.c
	31	+--- linux-4.17.9.orig/fs/exec.c
	32	++++ linux-4.17.9/fs/exec.c
33	33	@@ -1692,7 +1692,7 @@ static int exec_binprm(struct linux_binp
34	34	old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
35	35	rcu_read_unlock();

		@@ -39,8 +39,8 @@
39	39	if (ret >= 0) {
40	40	audit_bprm(bprm);
41	41	trace_sched_process_exec(current, old_pid, bprm);
42		---- linux-4.17.6.orig/fs/open.c
43		-+++ linux-4.17.6/fs/open.c
	42	+--- linux-4.17.9.orig/fs/open.c
	43	++++ linux-4.17.9/fs/open.c
44	44	@@ -1212,6 +1212,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd)
45	45	*/
46	46	SYSCALL_DEFINE0(vhangup)

		@@ -50,8 +50,8 @@
50	50	if (capable(CAP_SYS_TTY_CONFIG)) {
51	51	tty_vhangup_self();
52	52	return 0;
53		---- linux-4.17.6.orig/fs/proc/version.c
54		-+++ linux-4.17.6/fs/proc/version.c
	53	+--- linux-4.17.9.orig/fs/proc/version.c
	54	++++ linux-4.17.9/fs/proc/version.c
55	55	@@ -33,3 +33,10 @@ static int __init proc_version_init(void
56	56	return 0;
57	57	}

		@@ -59,12 +59,12 @@
59	59	+
60	60	+static int __init ccs_show_version(void)
61	61	+{
62		-+ printk(KERN_INFO "Hook version: 4.17.6 2018/07/12\n");
	62	++ printk(KERN_INFO "Hook version: 4.17.9 2018/07/23\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-4.17.6.orig/include/linux/sched.h
67		-+++ linux-4.17.6/include/linux/sched.h
	66	+--- linux-4.17.9.orig/include/linux/sched.h
	67	++++ linux-4.17.9/include/linux/sched.h
68	68	@@ -33,6 +33,7 @@ struct audit_context;
69	69	struct backing_dev_info;
70	70	struct bio_list;

		@@ -84,8 +84,8 @@
84	84
85	85	/*
86	86	* New fields for task_struct should be added above here, so that
87		---- linux-4.17.6.orig/include/linux/security.h
88		-+++ linux-4.17.6/include/linux/security.h
	87	+--- linux-4.17.9.orig/include/linux/security.h
	88	++++ linux-4.17.9/include/linux/security.h
89	89	@@ -53,6 +53,7 @@ struct msg_msg;
90	90	struct xattr;
91	91	struct xfrm_sec_ctx;

		@@ -306,8 +306,8 @@
306	306	}
307	307	#endif /* CONFIG_SECURITY_PATH */
308	308
309		---- linux-4.17.6.orig/include/net/ip.h
310		-+++ linux-4.17.6/include/net/ip.h
	309	+--- linux-4.17.9.orig/include/net/ip.h
	310	++++ linux-4.17.9/include/net/ip.h
311	311	@@ -277,6 +277,8 @@ void inet_get_local_port_range(struct ne
312	312	#ifdef CONFIG_SYSCTL
313	313	static inline int inet_is_local_reserved_port(struct net *net, int port)

		@@ -326,8 +326,8 @@
326	326	return 0;
327	327	}
328	328
329		---- linux-4.17.6.orig/init/init_task.c
330		-+++ linux-4.17.6/init/init_task.c
	329	+--- linux-4.17.9.orig/init/init_task.c
	330	++++ linux-4.17.9/init/init_task.c
331	331	@@ -175,6 +175,10 @@ struct task_struct init_task
332	332	#ifdef CONFIG_SECURITY
333	333	.security = NULL,

		@@ -339,8 +339,8 @@
339	339	};
340	340	EXPORT_SYMBOL(init_task);
341	341
342		---- linux-4.17.6.orig/kernel/kexec.c
343		-+++ linux-4.17.6/kernel/kexec.c
	342	+--- linux-4.17.9.orig/kernel/kexec.c
	343	++++ linux-4.17.9/kernel/kexec.c
344	344	@@ -17,7 +17,7 @@
345	345	#include <linux/syscalls.h>
346	346	#include <linux/vmalloc.h>

		@@ -359,8 +359,8 @@
359	359
360	360	/*
361	361	* Verify we have a legal set of flags
362		---- linux-4.17.6.orig/kernel/module.c
363		-+++ linux-4.17.6/kernel/module.c
	362	+--- linux-4.17.9.orig/kernel/module.c
	363	++++ linux-4.17.9/kernel/module.c
364	364	@@ -66,6 +66,7 @@
365	365	#include <linux/audit.h>
366	366	#include <uapi/linux/module.h>

		@@ -387,8 +387,8 @@
387	387
388	388	return 0;
389	389	}
390		---- linux-4.17.6.orig/kernel/ptrace.c
391		-+++ linux-4.17.6/kernel/ptrace.c
	390	+--- linux-4.17.9.orig/kernel/ptrace.c
	391	++++ linux-4.17.9/kernel/ptrace.c
392	392	@@ -1112,6 +1112,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
393	393	{
394	394	struct task_struct *child;

		@@ -413,8 +413,8 @@
413	413
414	414	if (request == PTRACE_TRACEME) {
415	415	ret = ptrace_traceme();
416		---- linux-4.17.6.orig/kernel/reboot.c
417		-+++ linux-4.17.6/kernel/reboot.c
	416	+--- linux-4.17.9.orig/kernel/reboot.c
	417	++++ linux-4.17.9/kernel/reboot.c
418	418	@@ -16,6 +16,7 @@
419	419	#include <linux/syscalls.h>
420	420	#include <linux/syscore_ops.h>

		@@ -432,8 +432,8 @@
432	432
433	433	/*
434	434	* If pid namespaces are enabled and the current task is in a child
435		---- linux-4.17.6.orig/kernel/sched/core.c
436		-+++ linux-4.17.6/kernel/sched/core.c
	435	+--- linux-4.17.9.orig/kernel/sched/core.c
	436	++++ linux-4.17.9/kernel/sched/core.c
437	437	@@ -3989,6 +3989,8 @@ int can_nice(const struct task_struct *p
438	438	SYSCALL_DEFINE1(nice, int, increment)
439	439	{

		@@ -443,8 +443,8 @@
443	443
444	444	/*
445	445	* Setpriority might change our priority at the same moment.
446		---- linux-4.17.6.orig/kernel/signal.c
447		-+++ linux-4.17.6/kernel/signal.c
	446	+--- linux-4.17.9.orig/kernel/signal.c
	447	++++ linux-4.17.9/kernel/signal.c
448	448	@@ -3254,6 +3254,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait,
449	449	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
450	450	{

		@@ -490,8 +490,8 @@
490	490
491	491	return do_send_specific(tgid, pid, sig, info);
492	492	}
493		---- linux-4.17.6.orig/kernel/sys.c
494		-+++ linux-4.17.6/kernel/sys.c
	493	+--- linux-4.17.9.orig/kernel/sys.c
	494	++++ linux-4.17.9/kernel/sys.c
495	495	@@ -204,6 +204,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
496	496
497	497	if (which > PRIO_USER \|\| which < PRIO_PROCESS)

		@@ -521,8 +521,8 @@
521	521
522	522	down_write(&uts_sem);
523	523	errno = -EFAULT;
524		---- linux-4.17.6.orig/kernel/time/timekeeping.c
525		-+++ linux-4.17.6/kernel/time/timekeeping.c
	524	+--- linux-4.17.9.orig/kernel/time/timekeeping.c
	525	++++ linux-4.17.9/kernel/time/timekeeping.c
526	526	@@ -25,6 +25,7 @@
527	527	#include <linux/stop_machine.h>
528	528	#include <linux/pvclock_gtod.h>

		@@ -556,8 +556,8 @@
556	556
557	557	/*
558	558	* Validate if a timespec/timeval used to inject a time
559		---- linux-4.17.6.orig/net/ipv4/raw.c
560		-+++ linux-4.17.6/net/ipv4/raw.c
	559	+--- linux-4.17.9.orig/net/ipv4/raw.c
	560	++++ linux-4.17.9/net/ipv4/raw.c
561	561	@@ -779,6 +779,10 @@ static int raw_recvmsg(struct sock *sk,
562	562	skb = skb_recv_datagram(sk, flags, noblock, &err);
563	563	if (!skb)

		@@ -569,8 +569,8 @@
569	569
570	570	copied = skb->len;
571	571	if (len < copied) {
572		---- linux-4.17.6.orig/net/ipv4/udp.c
573		-+++ linux-4.17.6/net/ipv4/udp.c
	572	+--- linux-4.17.9.orig/net/ipv4/udp.c
	573	++++ linux-4.17.9/net/ipv4/udp.c
574	574	@@ -1579,6 +1579,8 @@ try_again:
575	575	skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
576	576	if (!skb)

		@@ -580,8 +580,8 @@
580	580
581	581	ulen = udp_skb_len(skb);
582	582	copied = len;
583		---- linux-4.17.6.orig/net/ipv6/raw.c
584		-+++ linux-4.17.6/net/ipv6/raw.c
	583	+--- linux-4.17.9.orig/net/ipv6/raw.c
	584	++++ linux-4.17.9/net/ipv6/raw.c
585	585	@@ -483,6 +483,10 @@ static int rawv6_recvmsg(struct sock *sk
586	586	skb = skb_recv_datagram(sk, flags, noblock, &err);
587	587	if (!skb)

		@@ -593,8 +593,8 @@
593	593
594	594	copied = skb->len;
595	595	if (copied > len) {
596		---- linux-4.17.6.orig/net/ipv6/udp.c
597		-+++ linux-4.17.6/net/ipv6/udp.c
	596	+--- linux-4.17.9.orig/net/ipv6/udp.c
	597	++++ linux-4.17.9/net/ipv6/udp.c
598	598	@@ -341,6 +341,8 @@ try_again:
599	599	skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
600	600	if (!skb)

		@@ -604,8 +604,8 @@
604	604
605	605	ulen = udp6_skb_len(skb);
606	606	copied = len;
607		---- linux-4.17.6.orig/net/socket.c
608		-+++ linux-4.17.6/net/socket.c
	607	+--- linux-4.17.9.orig/net/socket.c
	608	++++ linux-4.17.9/net/socket.c
609	609	@@ -1604,6 +1604,10 @@ int __sys_accept4(int fd, struct sockadd
610	610	if (err < 0)
611	611	goto out_fd;

		@@ -617,8 +617,8 @@
617	617	if (upeer_sockaddr) {
618	618	len = newsock->ops->getname(newsock,
619	619	(struct sockaddr *)&address, 2);
620		---- linux-4.17.6.orig/net/unix/af_unix.c
621		-+++ linux-4.17.6/net/unix/af_unix.c
	620	+--- linux-4.17.9.orig/net/unix/af_unix.c
	621	++++ linux-4.17.9/net/unix/af_unix.c
622	622	@@ -2122,6 +2122,10 @@ static int unix_dgram_recvmsg(struct soc
623	623	EPOLLOUT \| EPOLLWRNORM \|
624	624	EPOLLWRBAND);

		@@ -638,8 +638,8 @@
638	638	mutex_unlock(&u->iolock);
639	639	out:
640	640	return err;
641		---- linux-4.17.6.orig/security/Kconfig
642		-+++ linux-4.17.6/security/Kconfig
	641	+--- linux-4.17.9.orig/security/Kconfig
	642	++++ linux-4.17.9/security/Kconfig
643	643	@@ -277,5 +277,7 @@ config DEFAULT_SECURITY
644	644	default "apparmor" if DEFAULT_SECURITY_APPARMOR
645	645	default "" if DEFAULT_SECURITY_DAC

		@@ -648,8 +648,8 @@
648	648	+
649	649	endmenu
650	650
651		---- linux-4.17.6.orig/security/Makefile
652		-+++ linux-4.17.6/security/Makefile
	651	+--- linux-4.17.9.orig/security/Makefile
	652	++++ linux-4.17.9/security/Makefile
653	653	@@ -30,3 +30,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
654	654	# Object integrity file lists
655	655	subdir-$(CONFIG_INTEGRITY) += integrity

		@@ -657,8 +657,8 @@
657	657	+
658	658	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
659	659	+obj-$(CONFIG_CCSECURITY) += ccsecurity/
660		---- linux-4.17.6.orig/security/security.c
661		-+++ linux-4.17.6/security/security.c
	660	+--- linux-4.17.9.orig/security/security.c
	661	++++ linux-4.17.9/security/security.c
662	662	@@ -983,12 +983,19 @@ int security_file_open(struct file *file
663	663
664	664	int security_task_alloc(struct task_struct *task, unsigned long clone_flags)

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.18.diff (revision 6658)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.18.diff (revision 6659)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 4.18-rc5.
	1	+This is TOMOYO Linux patch for kernel 4.18-rc6.
2	2
3		-Source code for this patch is https://git.kernel.org/torvalds/t/linux-4.18-rc5.tar.gz
	3	+Source code for this patch is https://git.kernel.org/torvalds/t/linux-4.18-rc6.tar.gz
4	4	---
5	5	fs/exec.c \| 2 -
6	6	fs/open.c \| 2 +

		@@ -28,9 +28,9 @@
28	28	security/security.c \| 9 +++++-
29	29	24 files changed, 148 insertions(+), 29 deletions(-)
30	30
31		---- linux-4.18-rc5.orig/fs/exec.c
32		-+++ linux-4.18-rc5/fs/exec.c
33		-@@ -1692,7 +1692,7 @@ static int exec_binprm(struct linux_binp
	31	+--- linux-4.18-rc6.orig/fs/exec.c
	32	++++ linux-4.18-rc6/fs/exec.c
	33	+@@ -1690,7 +1690,7 @@ static int exec_binprm(struct linux_binp
34	34	old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
35	35	rcu_read_unlock();
36	36

		@@ -39,8 +39,8 @@
39	39	if (ret >= 0) {
40	40	audit_bprm(bprm);
41	41	trace_sched_process_exec(current, old_pid, bprm);
42		---- linux-4.18-rc5.orig/fs/open.c
43		-+++ linux-4.18-rc5/fs/open.c
	42	+--- linux-4.18-rc6.orig/fs/open.c
	43	++++ linux-4.18-rc6/fs/open.c
44	44	@@ -1212,6 +1212,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd)
45	45	*/
46	46	SYSCALL_DEFINE0(vhangup)

		@@ -50,8 +50,8 @@
50	50	if (capable(CAP_SYS_TTY_CONFIG)) {
51	51	tty_vhangup_self();
52	52	return 0;
53		---- linux-4.18-rc5.orig/fs/proc/version.c
54		-+++ linux-4.18-rc5/fs/proc/version.c
	53	+--- linux-4.18-rc6.orig/fs/proc/version.c
	54	++++ linux-4.18-rc6/fs/proc/version.c
55	55	@@ -21,3 +21,10 @@ static int __init proc_version_init(void
56	56	return 0;
57	57	}

		@@ -59,12 +59,12 @@
59	59	+
60	60	+static int __init ccs_show_version(void)
61	61	+{
62		-+ printk(KERN_INFO "Hook version: 4.18-rc5 2018/07/16\n");
	62	++ printk(KERN_INFO "Hook version: 4.18-rc6 2018/07/23\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-4.18-rc5.orig/include/linux/sched.h
67		-+++ linux-4.18-rc5/include/linux/sched.h
	66	+--- linux-4.18-rc6.orig/include/linux/sched.h
	67	++++ linux-4.18-rc6/include/linux/sched.h
68	68	@@ -34,6 +34,7 @@ struct audit_context;
69	69	struct backing_dev_info;
70	70	struct bio_list;

		@@ -84,8 +84,8 @@
84	84
85	85	/*
86	86	* New fields for task_struct should be added above here, so that
87		---- linux-4.18-rc5.orig/include/linux/security.h
88		-+++ linux-4.18-rc5/include/linux/security.h
	87	+--- linux-4.18-rc6.orig/include/linux/security.h
	88	++++ linux-4.18-rc6/include/linux/security.h
89	89	@@ -53,6 +53,7 @@ struct msg_msg;
90	90	struct xattr;
91	91	struct xfrm_sec_ctx;

		@@ -306,8 +306,8 @@
306	306	}
307	307	#endif /* CONFIG_SECURITY_PATH */
308	308
309		---- linux-4.18-rc5.orig/include/net/ip.h
310		-+++ linux-4.18-rc5/include/net/ip.h
	309	+--- linux-4.18-rc6.orig/include/net/ip.h
	310	++++ linux-4.18-rc6/include/net/ip.h
311	311	@@ -278,6 +278,8 @@ void inet_get_local_port_range(struct ne
312	312	#ifdef CONFIG_SYSCTL
313	313	static inline int inet_is_local_reserved_port(struct net *net, int port)

		@@ -326,8 +326,8 @@
326	326	return 0;
327	327	}
328	328
329		---- linux-4.18-rc5.orig/init/init_task.c
330		-+++ linux-4.18-rc5/init/init_task.c
	329	+--- linux-4.18-rc6.orig/init/init_task.c
	330	++++ linux-4.18-rc6/init/init_task.c
331	331	@@ -176,6 +176,10 @@ struct task_struct init_task
332	332	#ifdef CONFIG_SECURITY
333	333	.security = NULL,

		@@ -339,8 +339,8 @@
339	339	};
340	340	EXPORT_SYMBOL(init_task);
341	341
342		---- linux-4.18-rc5.orig/kernel/kexec.c
343		-+++ linux-4.18-rc5/kernel/kexec.c
	342	+--- linux-4.18-rc6.orig/kernel/kexec.c
	343	++++ linux-4.18-rc6/kernel/kexec.c
344	344	@@ -17,7 +17,7 @@
345	345	#include <linux/syscalls.h>
346	346	#include <linux/vmalloc.h>

		@@ -359,8 +359,8 @@
359	359
360	360	/*
361	361	* Verify we have a legal set of flags
362		---- linux-4.18-rc5.orig/kernel/module.c
363		-+++ linux-4.18-rc5/kernel/module.c
	362	+--- linux-4.18-rc6.orig/kernel/module.c
	363	++++ linux-4.18-rc6/kernel/module.c
364	364	@@ -66,6 +66,7 @@
365	365	#include <linux/audit.h>
366	366	#include <uapi/linux/module.h>

		@@ -387,8 +387,8 @@
387	387
388	388	return 0;
389	389	}
390		---- linux-4.18-rc5.orig/kernel/ptrace.c
391		-+++ linux-4.18-rc5/kernel/ptrace.c
	390	+--- linux-4.18-rc6.orig/kernel/ptrace.c
	391	++++ linux-4.18-rc6/kernel/ptrace.c
392	392	@@ -1112,6 +1112,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
393	393	{
394	394	struct task_struct *child;

		@@ -413,8 +413,8 @@
413	413
414	414	if (request == PTRACE_TRACEME) {
415	415	ret = ptrace_traceme();
416		---- linux-4.18-rc5.orig/kernel/reboot.c
417		-+++ linux-4.18-rc5/kernel/reboot.c
	416	+--- linux-4.18-rc6.orig/kernel/reboot.c
	417	++++ linux-4.18-rc6/kernel/reboot.c
418	418	@@ -16,6 +16,7 @@
419	419	#include <linux/syscalls.h>
420	420	#include <linux/syscore_ops.h>

		@@ -432,8 +432,8 @@
432	432
433	433	/*
434	434	* If pid namespaces are enabled and the current task is in a child
435		---- linux-4.18-rc5.orig/kernel/sched/core.c
436		-+++ linux-4.18-rc5/kernel/sched/core.c
	435	+--- linux-4.18-rc6.orig/kernel/sched/core.c
	436	++++ linux-4.18-rc6/kernel/sched/core.c
437	437	@@ -3972,6 +3972,8 @@ int can_nice(const struct task_struct *p
438	438	SYSCALL_DEFINE1(nice, int, increment)
439	439	{

		@@ -443,8 +443,8 @@
443	443
444	444	/*
445	445	* Setpriority might change our priority at the same moment.
446		---- linux-4.18-rc5.orig/kernel/signal.c
447		-+++ linux-4.18-rc5/kernel/signal.c
	446	+--- linux-4.18-rc6.orig/kernel/signal.c
	447	++++ linux-4.18-rc6/kernel/signal.c
448	448	@@ -3167,6 +3167,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait,
449	449	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
450	450	{

		@@ -490,8 +490,8 @@
490	490
491	491	return do_send_specific(tgid, pid, sig, info);
492	492	}
493		---- linux-4.18-rc5.orig/kernel/sys.c
494		-+++ linux-4.18-rc5/kernel/sys.c
	493	+--- linux-4.18-rc6.orig/kernel/sys.c
	494	++++ linux-4.18-rc6/kernel/sys.c
495	495	@@ -204,6 +204,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
496	496
497	497	if (which > PRIO_USER \|\| which < PRIO_PROCESS)

		@@ -521,8 +521,8 @@
521	521
522	522	down_write(&uts_sem);
523	523	errno = -EFAULT;
524		---- linux-4.18-rc5.orig/kernel/time/timekeeping.c
525		-+++ linux-4.18-rc5/kernel/time/timekeeping.c
	524	+--- linux-4.18-rc6.orig/kernel/time/timekeeping.c
	525	++++ linux-4.18-rc6/kernel/time/timekeeping.c
526	526	@@ -25,6 +25,7 @@
527	527	#include <linux/stop_machine.h>
528	528	#include <linux/pvclock_gtod.h>

		@@ -556,8 +556,8 @@
556	556
557	557	/*
558	558	* Validate if a timespec/timeval used to inject a time
559		---- linux-4.18-rc5.orig/net/ipv4/raw.c
560		-+++ linux-4.18-rc5/net/ipv4/raw.c
	559	+--- linux-4.18-rc6.orig/net/ipv4/raw.c
	560	++++ linux-4.18-rc6/net/ipv4/raw.c
561	561	@@ -779,6 +779,10 @@ static int raw_recvmsg(struct sock *sk,
562	562	skb = skb_recv_datagram(sk, flags, noblock, &err);
563	563	if (!skb)

		@@ -569,8 +569,8 @@
569	569
570	570	copied = skb->len;
571	571	if (len < copied) {
572		---- linux-4.18-rc5.orig/net/ipv4/udp.c
573		-+++ linux-4.18-rc5/net/ipv4/udp.c
	572	+--- linux-4.18-rc6.orig/net/ipv4/udp.c
	573	++++ linux-4.18-rc6/net/ipv4/udp.c
574	574	@@ -1659,6 +1659,8 @@ try_again:
575	575	skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
576	576	if (!skb)

		@@ -580,8 +580,8 @@
580	580
581	581	ulen = udp_skb_len(skb);
582	582	copied = len;
583		---- linux-4.18-rc5.orig/net/ipv6/raw.c
584		-+++ linux-4.18-rc5/net/ipv6/raw.c
	583	+--- linux-4.18-rc6.orig/net/ipv6/raw.c
	584	++++ linux-4.18-rc6/net/ipv6/raw.c
585	585	@@ -483,6 +483,10 @@ static int rawv6_recvmsg(struct sock *sk
586	586	skb = skb_recv_datagram(sk, flags, noblock, &err);
587	587	if (!skb)

		@@ -593,8 +593,8 @@
593	593
594	594	copied = skb->len;
595	595	if (copied > len) {
596		---- linux-4.18-rc5.orig/net/ipv6/udp.c
597		-+++ linux-4.18-rc5/net/ipv6/udp.c
	596	+--- linux-4.18-rc6.orig/net/ipv6/udp.c
	597	++++ linux-4.18-rc6/net/ipv6/udp.c
598	598	@@ -339,6 +339,8 @@ try_again:
599	599	skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
600	600	if (!skb)

		@@ -604,8 +604,8 @@
604	604
605	605	ulen = udp6_skb_len(skb);
606	606	copied = len;
607		---- linux-4.18-rc5.orig/net/socket.c
608		-+++ linux-4.18-rc5/net/socket.c
	607	+--- linux-4.18-rc6.orig/net/socket.c
	608	++++ linux-4.18-rc6/net/socket.c
609	609	@@ -1600,6 +1600,10 @@ int __sys_accept4(int fd, struct sockadd
610	610	if (err < 0)
611	611	goto out_fd;

		@@ -617,8 +617,8 @@
617	617	if (upeer_sockaddr) {
618	618	len = newsock->ops->getname(newsock,
619	619	(struct sockaddr *)&address, 2);
620		---- linux-4.18-rc5.orig/net/unix/af_unix.c
621		-+++ linux-4.18-rc5/net/unix/af_unix.c
	620	+--- linux-4.18-rc6.orig/net/unix/af_unix.c
	621	++++ linux-4.18-rc6/net/unix/af_unix.c
622	622	@@ -2122,6 +2122,10 @@ static int unix_dgram_recvmsg(struct soc
623	623	EPOLLOUT \| EPOLLWRNORM \|
624	624	EPOLLWRBAND);

		@@ -638,8 +638,8 @@
638	638	mutex_unlock(&u->iolock);
639	639	out:
640	640	return err;
641		---- linux-4.18-rc5.orig/security/Kconfig
642		-+++ linux-4.18-rc5/security/Kconfig
	641	+--- linux-4.18-rc6.orig/security/Kconfig
	642	++++ linux-4.18-rc6/security/Kconfig
643	643	@@ -277,5 +277,7 @@ config DEFAULT_SECURITY
644	644	default "apparmor" if DEFAULT_SECURITY_APPARMOR
645	645	default "" if DEFAULT_SECURITY_DAC

		@@ -648,8 +648,8 @@
648	648	+
649	649	endmenu
650	650
651		---- linux-4.18-rc5.orig/security/Makefile
652		-+++ linux-4.18-rc5/security/Makefile
	651	+--- linux-4.18-rc6.orig/security/Makefile
	652	++++ linux-4.18-rc6/security/Makefile
653	653	@@ -30,3 +30,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
654	654	# Object integrity file lists
655	655	subdir-$(CONFIG_INTEGRITY) += integrity

		@@ -657,8 +657,8 @@
657	657	+
658	658	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
659	659	+obj-$(CONFIG_CCSECURITY) += ccsecurity/
660		---- linux-4.18-rc5.orig/security/security.c
661		-+++ linux-4.18-rc5/security/security.c
	660	+--- linux-4.18-rc6.orig/security/security.c
	661	++++ linux-4.18-rc6/security/security.c
662	662	@@ -983,12 +983,19 @@ int security_file_open(struct file *file
663	663
664	664	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 6658)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.4.diff (revision 6659)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 4.4.140.
	1	+This is TOMOYO Linux patch for kernel 4.4.143.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.140.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.143.tar.xz
4	4	---
5	5	fs/exec.c \| 2 -
6	6	fs/open.c \| 2 +

		@@ -28,8 +28,8 @@
28	28	security/Makefile \| 3 ++
29	29	24 files changed, 150 insertions(+), 26 deletions(-)
30	30
31		---- linux-4.4.140.orig/fs/exec.c
32		-+++ linux-4.4.140/fs/exec.c
	31	+--- linux-4.4.143.orig/fs/exec.c
	32	++++ linux-4.4.143/fs/exec.c
33	33	@@ -1508,7 +1508,7 @@ static int exec_binprm(struct linux_binp
34	34	old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
35	35	rcu_read_unlock();

		@@ -39,8 +39,8 @@
39	39	if (ret >= 0) {
40	40	audit_bprm(bprm);
41	41	trace_sched_process_exec(current, old_pid, bprm);
42		---- linux-4.4.140.orig/fs/open.c
43		-+++ linux-4.4.140/fs/open.c
	42	+--- linux-4.4.143.orig/fs/open.c
	43	++++ linux-4.4.143/fs/open.c
44	44	@@ -1117,6 +1117,8 @@ EXPORT_SYMBOL(sys_close);
45	45	*/
46	46	SYSCALL_DEFINE0(vhangup)

		@@ -50,8 +50,8 @@
50	50	if (capable(CAP_SYS_TTY_CONFIG)) {
51	51	tty_vhangup_self();
52	52	return 0;
53		---- linux-4.4.140.orig/fs/proc/version.c
54		-+++ linux-4.4.140/fs/proc/version.c
	53	+--- linux-4.4.143.orig/fs/proc/version.c
	54	++++ linux-4.4.143/fs/proc/version.c
55	55	@@ -32,3 +32,10 @@ static int __init proc_version_init(void
56	56	return 0;
57	57	}

		@@ -59,12 +59,12 @@
59	59	+
60	60	+static int __init ccs_show_version(void)
61	61	+{
62		-+ printk(KERN_INFO "Hook version: 4.4.140 2018/07/12\n");
	62	++ printk(KERN_INFO "Hook version: 4.4.143 2018/07/23\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-4.4.140.orig/include/linux/init_task.h
67		-+++ linux-4.4.140/include/linux/init_task.h
	66	+--- linux-4.4.143.orig/include/linux/init_task.h
	67	++++ linux-4.4.143/include/linux/init_task.h
68	68	@@ -183,6 +183,14 @@ extern struct task_group root_task_group
69	69	# define INIT_KASAN(tsk)
70	70	#endif

		@@ -88,8 +88,8 @@
88	88	}
89	89
90	90
91		---- linux-4.4.140.orig/include/linux/sched.h
92		-+++ linux-4.4.140/include/linux/sched.h
	91	+--- linux-4.4.143.orig/include/linux/sched.h
	92	++++ linux-4.4.143/include/linux/sched.h
93	93	@@ -6,6 +6,8 @@
94	94	#include <linux/sched/prio.h>
95	95

		@@ -110,8 +110,8 @@
110	110	/* CPU-specific state of this task */
111	111	struct thread_struct thread;
112	112	/*
113		---- linux-4.4.140.orig/include/linux/security.h
114		-+++ linux-4.4.140/include/linux/security.h
	113	+--- linux-4.4.143.orig/include/linux/security.h
	114	++++ linux-4.4.143/include/linux/security.h
115	115	@@ -53,6 +53,7 @@ struct msg_queue;
116	116	struct xattr;
117	117	struct xfrm_sec_ctx;

		@@ -318,8 +318,8 @@
318	318	}
319	319	#endif /* CONFIG_SECURITY_PATH */
320	320
321		---- linux-4.4.140.orig/include/net/ip.h
322		-+++ linux-4.4.140/include/net/ip.h
	321	+--- linux-4.4.143.orig/include/net/ip.h
	322	++++ linux-4.4.143/include/net/ip.h
323	323	@@ -225,6 +225,8 @@ void inet_get_local_port_range(struct ne
324	324	#ifdef CONFIG_SYSCTL
325	325	static inline int inet_is_local_reserved_port(struct net *net, int port)

		@@ -338,8 +338,8 @@
338	338	return 0;
339	339	}
340	340	#endif
341		---- linux-4.4.140.orig/kernel/fork.c
342		-+++ linux-4.4.140/kernel/fork.c
	341	+--- linux-4.4.143.orig/kernel/fork.c
	342	++++ linux-4.4.143/kernel/fork.c
343	343	@@ -260,6 +260,7 @@ void __put_task_struct(struct task_struc
344	344	delayacct_tsk_free(tsk);
345	345	put_signal_struct(tsk->signal);

		@@ -366,8 +366,8 @@
366	366	bad_fork_cleanup_perf:
367	367	perf_event_free_task(p);
368	368	bad_fork_cleanup_policy:
369		---- linux-4.4.140.orig/kernel/kexec.c
370		-+++ linux-4.4.140/kernel/kexec.c
	369	+--- linux-4.4.143.orig/kernel/kexec.c
	370	++++ linux-4.4.143/kernel/kexec.c
371	371	@@ -17,7 +17,7 @@
372	372	#include <linux/syscalls.h>
373	373	#include <linux/vmalloc.h>

		@@ -386,8 +386,8 @@
386	386
387	387	/*
388	388	* Verify we have a legal set of flags
389		---- linux-4.4.140.orig/kernel/module.c
390		-+++ linux-4.4.140/kernel/module.c
	389	+--- linux-4.4.143.orig/kernel/module.c
	390	++++ linux-4.4.143/kernel/module.c
391	391	@@ -61,6 +61,7 @@
392	392	#include <linux/bsearch.h>
393	393	#include <uapi/linux/module.h>

		@@ -414,8 +414,8 @@
414	414
415	415	return 0;
416	416	}
417		---- linux-4.4.140.orig/kernel/ptrace.c
418		-+++ linux-4.4.140/kernel/ptrace.c
	417	+--- linux-4.4.143.orig/kernel/ptrace.c
	418	++++ linux-4.4.143/kernel/ptrace.c
419	419	@@ -1085,6 +1085,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
420	420	{
421	421	struct task_struct *child;

		@@ -440,8 +440,8 @@
440	440
441	441	if (request == PTRACE_TRACEME) {
442	442	ret = ptrace_traceme();
443		---- linux-4.4.140.orig/kernel/reboot.c
444		-+++ linux-4.4.140/kernel/reboot.c
	443	+--- linux-4.4.143.orig/kernel/reboot.c
	444	++++ linux-4.4.143/kernel/reboot.c
445	445	@@ -16,6 +16,7 @@
446	446	#include <linux/syscalls.h>
447	447	#include <linux/syscore_ops.h>

		@@ -459,8 +459,8 @@
459	459
460	460	/*
461	461	* If pid namespaces are enabled and the current task is in a child
462		---- linux-4.4.140.orig/kernel/sched/core.c
463		-+++ linux-4.4.140/kernel/sched/core.c
	462	+--- linux-4.4.143.orig/kernel/sched/core.c
	463	++++ linux-4.4.143/kernel/sched/core.c
464	464	@@ -3549,6 +3549,8 @@ int can_nice(const struct task_struct *p
465	465	SYSCALL_DEFINE1(nice, int, increment)
466	466	{

		@@ -470,8 +470,8 @@
470	470
471	471	/*
472	472	* Setpriority might change our priority at the same moment.
473		---- linux-4.4.140.orig/kernel/signal.c
474		-+++ linux-4.4.140/kernel/signal.c
	473	+--- linux-4.4.143.orig/kernel/signal.c
	474	++++ linux-4.4.143/kernel/signal.c
475	475	@@ -2868,6 +2868,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
476	476	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
477	477	{

		@@ -517,8 +517,8 @@
517	517
518	518	return do_send_specific(tgid, pid, sig, info);
519	519	}
520		---- linux-4.4.140.orig/kernel/sys.c
521		-+++ linux-4.4.140/kernel/sys.c
	520	+--- linux-4.4.143.orig/kernel/sys.c
	521	++++ linux-4.4.143/kernel/sys.c
522	522	@@ -185,6 +185,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
523	523
524	524	if (which > PRIO_USER \|\| which < PRIO_PROCESS)

		@@ -548,8 +548,8 @@
548	548
549	549	down_write(&uts_sem);
550	550	errno = -EFAULT;
551		---- linux-4.4.140.orig/kernel/time/ntp.c
552		-+++ linux-4.4.140/kernel/time/ntp.c
	551	+--- linux-4.4.143.orig/kernel/time/ntp.c
	552	++++ linux-4.4.143/kernel/time/ntp.c
553	553	@@ -16,6 +16,7 @@
554	554	#include <linux/mm.h>
555	555	#include <linux/module.h>

		@@ -583,8 +583,8 @@
583	583
584	584	if (txc->modes & ADJ_NANO) {
585	585	struct timespec ts;
586		---- linux-4.4.140.orig/net/ipv4/raw.c
587		-+++ linux-4.4.140/net/ipv4/raw.c
	586	+--- linux-4.4.143.orig/net/ipv4/raw.c
	587	++++ linux-4.4.143/net/ipv4/raw.c
588	588	@@ -747,6 +747,10 @@ static int raw_recvmsg(struct sock *sk,
589	589	skb = skb_recv_datagram(sk, flags, noblock, &err);
590	590	if (!skb)

		@@ -596,8 +596,8 @@
596	596
597	597	copied = skb->len;
598	598	if (len < copied) {
599		---- linux-4.4.140.orig/net/ipv4/udp.c
600		-+++ linux-4.4.140/net/ipv4/udp.c
	599	+--- linux-4.4.143.orig/net/ipv4/udp.c
	600	++++ linux-4.4.143/net/ipv4/udp.c
601	601	@@ -1289,6 +1289,10 @@ try_again:
602	602	&peeked, &off, &err);
603	603	if (!skb)

		@@ -609,8 +609,8 @@
609	609
610	610	ulen = skb->len - sizeof(struct udphdr);
611	611	copied = len;
612		---- linux-4.4.140.orig/net/ipv6/raw.c
613		-+++ linux-4.4.140/net/ipv6/raw.c
	612	+--- linux-4.4.143.orig/net/ipv6/raw.c
	613	++++ linux-4.4.143/net/ipv6/raw.c
614	614	@@ -478,6 +478,10 @@ static int rawv6_recvmsg(struct sock *sk
615	615	skb = skb_recv_datagram(sk, flags, noblock, &err);
616	616	if (!skb)

		@@ -622,8 +622,8 @@
622	622
623	623	copied = skb->len;
624	624	if (copied > len) {
625		---- linux-4.4.140.orig/net/ipv6/udp.c
626		-+++ linux-4.4.140/net/ipv6/udp.c
	625	+--- linux-4.4.143.orig/net/ipv6/udp.c
	626	++++ linux-4.4.143/net/ipv6/udp.c
627	627	@@ -417,6 +417,10 @@ try_again:
628	628	&peeked, &off, &err);
629	629	if (!skb)

		@@ -635,8 +635,8 @@
635	635
636	636	ulen = skb->len - sizeof(struct udphdr);
637	637	copied = len;
638		---- linux-4.4.140.orig/net/socket.c
639		-+++ linux-4.4.140/net/socket.c
	638	+--- linux-4.4.143.orig/net/socket.c
	639	++++ linux-4.4.143/net/socket.c
640	640	@@ -1476,6 +1476,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
641	641	if (err < 0)
642	642	goto out_fd;

		@@ -648,8 +648,8 @@
648	648	if (upeer_sockaddr) {
649	649	if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
650	650	&len, 2) < 0) {
651		---- linux-4.4.140.orig/net/unix/af_unix.c
652		-+++ linux-4.4.140/net/unix/af_unix.c
	651	+--- linux-4.4.143.orig/net/unix/af_unix.c
	652	++++ linux-4.4.143/net/unix/af_unix.c
653	653	@@ -2144,6 +2144,10 @@ static int unix_dgram_recvmsg(struct soc
654	654	wake_up_interruptible_sync_poll(&u->peer_wait,
655	655	POLLOUT \| POLLWRNORM \| POLLWRBAND);

		@@ -661,8 +661,8 @@
661	661	if (msg->msg_name)
662	662	unix_copy_addr(msg, skb->sk);
663	663
664		---- linux-4.4.140.orig/security/Kconfig
665		-+++ linux-4.4.140/security/Kconfig
	664	+--- linux-4.4.143.orig/security/Kconfig
	665	++++ linux-4.4.143/security/Kconfig
666	666	@@ -173,5 +173,7 @@ config DEFAULT_SECURITY
667	667	default "apparmor" if DEFAULT_SECURITY_APPARMOR
668	668	default "" if DEFAULT_SECURITY_DAC

		@@ -671,8 +671,8 @@
671	671	+
672	672	endmenu
673	673
674		---- linux-4.4.140.orig/security/Makefile
675		-+++ linux-4.4.140/security/Makefile
	674	+--- linux-4.4.143.orig/security/Makefile
	675	++++ linux-4.4.143/security/Makefile
676	676	@@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
677	677	# Object integrity file lists
678	678	subdir-$(CONFIG_INTEGRITY) += integrity

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.9.diff (revision 6658)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.9.diff (revision 6659)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 4.9.112.
	1	+This is TOMOYO Linux patch for kernel 4.9.114.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.112.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.114.tar.xz
4	4	---
5	5	fs/exec.c \| 2 -
6	6	fs/open.c \| 2 +

		@@ -28,8 +28,8 @@
28	28	security/Makefile \| 3 ++
29	29	24 files changed, 147 insertions(+), 26 deletions(-)
30	30
31		---- linux-4.9.112.orig/fs/exec.c
32		-+++ linux-4.9.112/fs/exec.c
	31	+--- linux-4.9.114.orig/fs/exec.c
	32	++++ linux-4.9.114/fs/exec.c
33	33	@@ -1661,7 +1661,7 @@ static int exec_binprm(struct linux_binp
34	34	old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
35	35	rcu_read_unlock();

		@@ -39,8 +39,8 @@
39	39	if (ret >= 0) {
40	40	audit_bprm(bprm);
41	41	trace_sched_process_exec(current, old_pid, bprm);
42		---- linux-4.9.112.orig/fs/open.c
43		-+++ linux-4.9.112/fs/open.c
	42	+--- linux-4.9.114.orig/fs/open.c
	43	++++ linux-4.9.114/fs/open.c
44	44	@@ -1151,6 +1151,8 @@ EXPORT_SYMBOL(sys_close);
45	45	*/
46	46	SYSCALL_DEFINE0(vhangup)

		@@ -50,8 +50,8 @@
50	50	if (capable(CAP_SYS_TTY_CONFIG)) {
51	51	tty_vhangup_self();
52	52	return 0;
53		---- linux-4.9.112.orig/fs/proc/version.c
54		-+++ linux-4.9.112/fs/proc/version.c
	53	+--- linux-4.9.114.orig/fs/proc/version.c
	54	++++ linux-4.9.114/fs/proc/version.c
55	55	@@ -32,3 +32,10 @@ static int __init proc_version_init(void
56	56	return 0;
57	57	}

		@@ -59,12 +59,12 @@
59	59	+
60	60	+static int __init ccs_show_version(void)
61	61	+{
62		-+ printk(KERN_INFO "Hook version: 4.9.112 2018/07/12\n");
	62	++ printk(KERN_INFO "Hook version: 4.9.114 2018/07/23\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-4.9.112.orig/include/linux/init_task.h
67		-+++ linux-4.9.112/include/linux/init_task.h
	66	+--- linux-4.9.114.orig/include/linux/init_task.h
	67	++++ linux-4.9.114/include/linux/init_task.h
68	68	@@ -193,6 +193,14 @@ extern struct task_group root_task_group
69	69	# define INIT_TASK_TI(tsk)
70	70	#endif

		@@ -88,8 +88,8 @@
88	88	}
89	89
90	90
91		---- linux-4.9.112.orig/include/linux/sched.h
92		-+++ linux-4.9.112/include/linux/sched.h
	91	+--- linux-4.9.114.orig/include/linux/sched.h
	92	++++ linux-4.9.114/include/linux/sched.h
93	93	@@ -6,6 +6,8 @@
94	94	#include <linux/sched/prio.h>
95	95

		@@ -110,8 +110,8 @@
110	110	/* CPU-specific state of this task */
111	111	struct thread_struct thread;
112	112	/*
113		---- linux-4.9.112.orig/include/linux/security.h
114		-+++ linux-4.9.112/include/linux/security.h
	113	+--- linux-4.9.114.orig/include/linux/security.h
	114	++++ linux-4.9.114/include/linux/security.h
115	115	@@ -55,6 +55,7 @@ struct msg_queue;
116	116	struct xattr;
117	117	struct xfrm_sec_ctx;

		@@ -318,8 +318,8 @@
318	318	}
319	319	#endif /* CONFIG_SECURITY_PATH */
320	320
321		---- linux-4.9.112.orig/include/net/ip.h
322		-+++ linux-4.9.112/include/net/ip.h
	321	+--- linux-4.9.114.orig/include/net/ip.h
	322	++++ linux-4.9.114/include/net/ip.h
323	323	@@ -254,6 +254,8 @@ void inet_get_local_port_range(struct ne
324	324	#ifdef CONFIG_SYSCTL
325	325	static inline int inet_is_local_reserved_port(struct net *net, int port)

		@@ -338,8 +338,8 @@
338	338	return 0;
339	339	}
340	340	#endif
341		---- linux-4.9.112.orig/kernel/fork.c
342		-+++ linux-4.9.112/kernel/fork.c
	341	+--- linux-4.9.114.orig/kernel/fork.c
	342	++++ linux-4.9.114/kernel/fork.c
343	343	@@ -392,6 +392,7 @@ void __put_task_struct(struct task_struc
344	344	delayacct_tsk_free(tsk);
345	345	put_signal_struct(tsk->signal);

		@@ -366,8 +366,8 @@
366	366	bad_fork_cleanup_perf:
367	367	perf_event_free_task(p);
368	368	bad_fork_cleanup_policy:
369		---- linux-4.9.112.orig/kernel/kexec.c
370		-+++ linux-4.9.112/kernel/kexec.c
	369	+--- linux-4.9.114.orig/kernel/kexec.c
	370	++++ linux-4.9.114/kernel/kexec.c
371	371	@@ -17,7 +17,7 @@
372	372	#include <linux/syscalls.h>
373	373	#include <linux/vmalloc.h>

		@@ -386,8 +386,8 @@
386	386
387	387	/*
388	388	* Verify we have a legal set of flags
389		---- linux-4.9.112.orig/kernel/module.c
390		-+++ linux-4.9.112/kernel/module.c
	389	+--- linux-4.9.114.orig/kernel/module.c
	390	++++ linux-4.9.114/kernel/module.c
391	391	@@ -63,6 +63,7 @@
392	392	#include <linux/dynamic_debug.h>
393	393	#include <uapi/linux/module.h>

		@@ -414,8 +414,8 @@
414	414
415	415	return 0;
416	416	}
417		---- linux-4.9.112.orig/kernel/ptrace.c
418		-+++ linux-4.9.112/kernel/ptrace.c
	417	+--- linux-4.9.114.orig/kernel/ptrace.c
	418	++++ linux-4.9.114/kernel/ptrace.c
419	419	@@ -1122,6 +1122,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
420	420	{
421	421	struct task_struct *child;

		@@ -440,8 +440,8 @@
440	440
441	441	if (request == PTRACE_TRACEME) {
442	442	ret = ptrace_traceme();
443		---- linux-4.9.112.orig/kernel/reboot.c
444		-+++ linux-4.9.112/kernel/reboot.c
	443	+--- linux-4.9.114.orig/kernel/reboot.c
	444	++++ linux-4.9.114/kernel/reboot.c
445	445	@@ -16,6 +16,7 @@
446	446	#include <linux/syscalls.h>
447	447	#include <linux/syscore_ops.h>

		@@ -459,8 +459,8 @@
459	459
460	460	/*
461	461	* If pid namespaces are enabled and the current task is in a child
462		---- linux-4.9.112.orig/kernel/sched/core.c
463		-+++ linux-4.9.112/kernel/sched/core.c
	462	+--- linux-4.9.114.orig/kernel/sched/core.c
	463	++++ linux-4.9.114/kernel/sched/core.c
464	464	@@ -3813,6 +3813,8 @@ int can_nice(const struct task_struct *p
465	465	SYSCALL_DEFINE1(nice, int, increment)
466	466	{

		@@ -470,8 +470,8 @@
470	470
471	471	/*
472	472	* Setpriority might change our priority at the same moment.
473		---- linux-4.9.112.orig/kernel/signal.c
474		-+++ linux-4.9.112/kernel/signal.c
	473	+--- linux-4.9.114.orig/kernel/signal.c
	474	++++ linux-4.9.114/kernel/signal.c
475	475	@@ -2868,6 +2868,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
476	476	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
477	477	{

		@@ -517,8 +517,8 @@
517	517
518	518	return do_send_specific(tgid, pid, sig, info);
519	519	}
520		---- linux-4.9.112.orig/kernel/sys.c
521		-+++ linux-4.9.112/kernel/sys.c
	520	+--- linux-4.9.114.orig/kernel/sys.c
	521	++++ linux-4.9.114/kernel/sys.c
522	522	@@ -185,6 +185,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
523	523
524	524	if (which > PRIO_USER \|\| which < PRIO_PROCESS)

		@@ -548,8 +548,8 @@
548	548
549	549	down_write(&uts_sem);
550	550	errno = -EFAULT;
551		---- linux-4.9.112.orig/kernel/time/ntp.c
552		-+++ linux-4.9.112/kernel/time/ntp.c
	551	+--- linux-4.9.114.orig/kernel/time/ntp.c
	552	++++ linux-4.9.114/kernel/time/ntp.c
553	553	@@ -17,6 +17,7 @@
554	554	#include <linux/module.h>
555	555	#include <linux/rtc.h>

		@@ -583,8 +583,8 @@
583	583
584	584	if (txc->modes & ADJ_NANO) {
585	585	struct timespec ts;
586		---- linux-4.9.112.orig/net/ipv4/raw.c
587		-+++ linux-4.9.112/net/ipv4/raw.c
	586	+--- linux-4.9.114.orig/net/ipv4/raw.c
	587	++++ linux-4.9.114/net/ipv4/raw.c
588	588	@@ -744,6 +744,10 @@ static int raw_recvmsg(struct sock *sk,
589	589	skb = skb_recv_datagram(sk, flags, noblock, &err);
590	590	if (!skb)

		@@ -596,8 +596,8 @@
596	596
597	597	copied = skb->len;
598	598	if (len < copied) {
599		---- linux-4.9.112.orig/net/ipv4/udp.c
600		-+++ linux-4.9.112/net/ipv4/udp.c
	599	+--- linux-4.9.114.orig/net/ipv4/udp.c
	600	++++ linux-4.9.114/net/ipv4/udp.c
601	601	@@ -1267,6 +1267,8 @@ try_again:
602	602	&peeked, &off, &err);
603	603	if (!skb)

		@@ -607,8 +607,8 @@
607	607
608	608	ulen = skb->len;
609	609	copied = len;
610		---- linux-4.9.112.orig/net/ipv6/raw.c
611		-+++ linux-4.9.112/net/ipv6/raw.c
	610	+--- linux-4.9.114.orig/net/ipv6/raw.c
	611	++++ linux-4.9.114/net/ipv6/raw.c
612	612	@@ -478,6 +478,10 @@ static int rawv6_recvmsg(struct sock *sk
613	613	skb = skb_recv_datagram(sk, flags, noblock, &err);
614	614	if (!skb)

		@@ -620,8 +620,8 @@
620	620
621	621	copied = skb->len;
622	622	if (copied > len) {
623		---- linux-4.9.112.orig/net/ipv6/udp.c
624		-+++ linux-4.9.112/net/ipv6/udp.c
	623	+--- linux-4.9.114.orig/net/ipv6/udp.c
	624	++++ linux-4.9.114/net/ipv6/udp.c
625	625	@@ -348,6 +348,8 @@ try_again:
626	626	&peeked, &off, &err);
627	627	if (!skb)

		@@ -631,8 +631,8 @@
631	631
632	632	ulen = skb->len;
633	633	copied = len;
634		---- linux-4.9.112.orig/net/socket.c
635		-+++ linux-4.9.112/net/socket.c
	634	+--- linux-4.9.114.orig/net/socket.c
	635	++++ linux-4.9.114/net/socket.c
636	636	@@ -1481,6 +1481,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
637	637	if (err < 0)
638	638	goto out_fd;

		@@ -644,8 +644,8 @@
644	644	if (upeer_sockaddr) {
645	645	if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
646	646	&len, 2) < 0) {
647		---- linux-4.9.112.orig/net/unix/af_unix.c
648		-+++ linux-4.9.112/net/unix/af_unix.c
	647	+--- linux-4.9.114.orig/net/unix/af_unix.c
	648	++++ linux-4.9.114/net/unix/af_unix.c
649	649	@@ -2150,6 +2150,10 @@ static int unix_dgram_recvmsg(struct soc
650	650	POLLOUT \| POLLWRNORM \|
651	651	POLLWRBAND);

		@@ -665,8 +665,8 @@
665	665	mutex_unlock(&u->iolock);
666	666	out:
667	667	return err;
668		---- linux-4.9.112.orig/security/Kconfig
669		-+++ linux-4.9.112/security/Kconfig
	668	+--- linux-4.9.114.orig/security/Kconfig
	669	++++ linux-4.9.114/security/Kconfig
670	670	@@ -214,5 +214,7 @@ config DEFAULT_SECURITY
671	671	default "apparmor" if DEFAULT_SECURITY_APPARMOR
672	672	default "" if DEFAULT_SECURITY_DAC

		@@ -675,8 +675,8 @@
675	675	+
676	676	endmenu
677	677
678		---- linux-4.9.112.orig/security/Makefile
679		-+++ linux-4.9.112/security/Makefile
	678	+--- linux-4.9.114.orig/security/Makefile
	679	++++ linux-4.9.114/security/Makefile
680	680	@@ -29,3 +29,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
681	681	# Object integrity file lists
682	682	subdir-$(CONFIG_INTEGRITY) += integrity

--- trunk/1.8.x/ccs-patch/specs/build-c7-3.10.sh (revision 6658)

+++ trunk/1.8.x/ccs-patch/specs/build-c7-3.10.sh (revision 6659)

		@@ -10,12 +10,12 @@
10	10
11	11	cd /tmp/ \|\| die "Can't chdir to /tmp/ ."
12	12
13		-if [ ! -r kernel-3.10.0-862.6.3.el7.src.rpm ]
	13	+if [ ! -r kernel-3.10.0-862.9.1.el7.src.rpm ]
14	14	then
15		- wget http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-862.6.3.el7.src.rpm \|\| die "Can't download source package."
	15	+ wget http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-862.9.1.el7.src.rpm \|\| die "Can't download source package."
16	16	fi
17		-LANG=C rpm --checksig kernel-3.10.0-862.6.3.el7.src.rpm \| grep -F ': rsa sha1 (md5) pgp md5 OK' \|\| die "Can't verify signature."
18		-rpm -ivh kernel-3.10.0-862.6.3.el7.src.rpm \|\| die "Can't install source package."
	17	+LANG=C rpm --checksig kernel-3.10.0-862.9.1.el7.src.rpm \| grep -F ': rsa sha1 (md5) pgp md5 OK' \|\| die "Can't verify signature."
	18	+rpm -ivh kernel-3.10.0-862.9.1.el7.src.rpm \|\| die "Can't install source package."
19	19
20	20	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
21	21	if [ ! -r ccs-patch-1.8.5-20180714.tar.gz ]

Show on old repository browser

TOMOYO Fork

tomoyo: 提交

Commit MetaInfo

Log Message

更改概述

差异

TOMOYO
Fork