OSDN > ソフトウェアを探す > システム > オペレーティングシステムカーネル > Linux > TOMOYO > SCM > SVN > コミット

TOMOYO
Fork

R/O
SSH
HTTPS

tomoyo: コミット

コミットメタ情報

リビジョン	6578 (tree)
日時	2017-05-26 22:16:11
作者	kumaneko

ログメッセージ

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

変更サマリ

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.13-ubuntu-14.04.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.11.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 6577)

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

		@@ -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-514.16.1.el7.src.rpm
	3	+Source code for this patch is http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-514.21.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-514.16.1.el7.orig/fs/exec.c
32		-+++ linux-3.10.0-514.16.1.el7/fs/exec.c
	31	+--- linux-3.10.0-514.21.1.el7.orig/fs/exec.c
	32	++++ linux-3.10.0-514.21.1.el7/fs/exec.c
33	33	@@ -1580,7 +1580,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-514.16.1.el7.orig/fs/open.c
43		-+++ linux-3.10.0-514.16.1.el7/fs/open.c
	42	+--- linux-3.10.0-514.21.1.el7.orig/fs/open.c
	43	++++ linux-3.10.0-514.21.1.el7/fs/open.c
44	44	@@ -1120,6 +1120,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-514.16.1.el7.orig/fs/proc/version.c
54		-+++ linux-3.10.0-514.16.1.el7/fs/proc/version.c
	53	+--- linux-3.10.0-514.21.1.el7.orig/fs/proc/version.c
	54	++++ linux-3.10.0-514.21.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-514.16.1.el7 2017/04/17\n");
	62	++ printk(KERN_INFO "Hook version: 3.10.0-514.21.1.el7 2017/05/26\n");
63	63	+ return 0;
64	64	+}
65	65	+module_init(ccs_show_version);
66		---- linux-3.10.0-514.16.1.el7.orig/include/linux/init_task.h
67		-+++ linux-3.10.0-514.16.1.el7/include/linux/init_task.h
	66	+--- linux-3.10.0-514.21.1.el7.orig/include/linux/init_task.h
	67	++++ linux-3.10.0-514.21.1.el7/include/linux/init_task.h
68	68	@@ -164,6 +164,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-514.16.1.el7.orig/include/linux/sched.h
92		-+++ linux-3.10.0-514.16.1.el7/include/linux/sched.h
	91	+--- linux-3.10.0-514.21.1.el7.orig/include/linux/sched.h
	92	++++ linux-3.10.0-514.21.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-514.16.1.el7.orig/include/linux/security.h
114		-+++ linux-3.10.0-514.16.1.el7/include/linux/security.h
	113	+--- linux-3.10.0-514.21.1.el7.orig/include/linux/security.h
	114	++++ linux-3.10.0-514.21.1.el7/include/linux/security.h
115	115	@@ -54,6 +54,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-514.16.1.el7.orig/include/net/ip.h
327		-+++ linux-3.10.0-514.16.1.el7/include/net/ip.h
	326	+--- linux-3.10.0-514.21.1.el7.orig/include/net/ip.h
	327	++++ linux-3.10.0-514.21.1.el7/include/net/ip.h
328	328	@@ -228,6 +228,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-514.16.1.el7.orig/kernel/fork.c
338		-+++ linux-3.10.0-514.16.1.el7/kernel/fork.c
	337	+--- linux-3.10.0-514.21.1.el7.orig/kernel/fork.c
	338	++++ linux-3.10.0-514.21.1.el7/kernel/fork.c
339	339	@@ -270,6 +270,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-514.16.1.el7.orig/kernel/kexec.c
366		-+++ linux-3.10.0-514.16.1.el7/kernel/kexec.c
	365	+--- linux-3.10.0-514.21.1.el7.orig/kernel/kexec.c
	366	++++ linux-3.10.0-514.21.1.el7/kernel/kexec.c
367	367	@@ -1250,6 +1250,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-514.16.1.el7.orig/kernel/module.c
377		-+++ linux-3.10.0-514.16.1.el7/kernel/module.c
	376	+--- linux-3.10.0-514.21.1.el7.orig/kernel/module.c
	377	++++ linux-3.10.0-514.21.1.el7/kernel/module.c
378	378	@@ -62,6 +62,7 @@
379	379	#include <linux/bsearch.h>
380	380	#include <uapi/linux/module.h>

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

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

		@@ -438,8 +438,8 @@
438	438
439	439	/*
440	440	* Setpriority might change our priority at the same moment.
441		---- linux-3.10.0-514.16.1.el7.orig/kernel/signal.c
442		-+++ linux-3.10.0-514.16.1.el7/kernel/signal.c
	441	+--- linux-3.10.0-514.21.1.el7.orig/kernel/signal.c
	442	++++ linux-3.10.0-514.21.1.el7/kernel/signal.c
443	443	@@ -2914,6 +2914,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-514.16.1.el7.orig/kernel/sys.c
489		-+++ linux-3.10.0-514.16.1.el7/kernel/sys.c
	488	+--- linux-3.10.0-514.21.1.el7.orig/kernel/sys.c
	489	++++ linux-3.10.0-514.21.1.el7/kernel/sys.c
490	490	@@ -192,6 +192,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-514.16.1.el7.orig/kernel/time/ntp.c
529		-+++ linux-3.10.0-514.16.1.el7/kernel/time/ntp.c
	528	+--- linux-3.10.0-514.21.1.el7.orig/kernel/time/ntp.c
	529	++++ linux-3.10.0-514.21.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-514.16.1.el7.orig/net/ipv4/raw.c
564		-+++ linux-3.10.0-514.16.1.el7/net/ipv4/raw.c
	563	+--- linux-3.10.0-514.21.1.el7.orig/net/ipv4/raw.c
	564	++++ linux-3.10.0-514.21.1.el7/net/ipv4/raw.c
565	565	@@ -702,6 +702,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-514.16.1.el7.orig/net/ipv4/udp.c
577		-+++ linux-3.10.0-514.16.1.el7/net/ipv4/udp.c
	576	+--- linux-3.10.0-514.21.1.el7.orig/net/ipv4/udp.c
	577	++++ linux-3.10.0-514.21.1.el7/net/ipv4/udp.c
578	578	@@ -1268,6 +1268,10 @@ try_again:
579	579	&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-514.16.1.el7.orig/net/ipv6/raw.c
590		-+++ linux-3.10.0-514.16.1.el7/net/ipv6/raw.c
	589	+--- linux-3.10.0-514.21.1.el7.orig/net/ipv6/raw.c
	590	++++ linux-3.10.0-514.21.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-514.16.1.el7.orig/net/ipv6/udp.c
603		-+++ linux-3.10.0-514.16.1.el7/net/ipv6/udp.c
	602	+--- linux-3.10.0-514.21.1.el7.orig/net/ipv6/udp.c
	603	++++ linux-3.10.0-514.21.1.el7/net/ipv6/udp.c
604	604	@@ -416,6 +416,10 @@ try_again:
605	605	&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-514.16.1.el7.orig/net/socket.c
616		-+++ linux-3.10.0-514.16.1.el7/net/socket.c
	615	+--- linux-3.10.0-514.21.1.el7.orig/net/socket.c
	616	++++ linux-3.10.0-514.21.1.el7/net/socket.c
617	617	@@ -1608,6 +1608,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-514.16.1.el7.orig/net/unix/af_unix.c
629		-+++ linux-3.10.0-514.16.1.el7/net/unix/af_unix.c
	628	+--- linux-3.10.0-514.21.1.el7.orig/net/unix/af_unix.c
	629	++++ linux-3.10.0-514.21.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-514.16.1.el7.orig/security/Kconfig
642		-+++ linux-3.10.0-514.16.1.el7/security/Kconfig
	641	+--- linux-3.10.0-514.21.1.el7.orig/security/Kconfig
	642	++++ linux-3.10.0-514.21.1.el7/security/Kconfig
643	643	@@ -175,5 +175,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-514.16.1.el7.orig/security/Makefile
652		-+++ linux-3.10.0-514.16.1.el7/security/Makefile
	651	+--- linux-3.10.0-514.21.1.el7.orig/security/Makefile
	652	++++ linux-3.10.0-514.21.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-514.16.1.el7.orig/security/security.c
661		-+++ linux-3.10.0-514.16.1.el7/security/security.c
	660	+--- linux-3.10.0-514.21.1.el7.orig/security/security.c
	661	++++ linux-3.10.0-514.21.1.el7/security/security.c
662	662	@@ -203,7 +203,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.13-ubuntu-14.04.diff (revision 6577)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-3.13-ubuntu-14.04.diff (revision 6578)

		@@ -29,8 +29,8 @@
29	29	security/security.c \| 107 ++++++++++++++++++++++++++++++++++++++++------
30	30	25 files changed, 236 insertions(+), 37 deletions(-)
31	31
32		---- linux-3.13.0-117.164.orig/fs/exec.c
33		-+++ linux-3.13.0-117.164/fs/exec.c
	32	+--- linux-3.13.0-119.166.orig/fs/exec.c
	33	++++ linux-3.13.0-119.166/fs/exec.c
34	34	@@ -1456,7 +1456,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.13.0-117.164.orig/fs/open.c
44		-+++ linux-3.13.0-117.164/fs/open.c
	43	+--- linux-3.13.0-119.166.orig/fs/open.c
	44	++++ linux-3.13.0-119.166/fs/open.c
45	45	@@ -1088,6 +1088,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.13.0-117.164.orig/fs/proc/version.c
55		-+++ linux-3.13.0-117.164/fs/proc/version.c
	54	+--- linux-3.13.0-119.166.orig/fs/proc/version.c
	55	++++ linux-3.13.0-119.166/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.13.0-117.164 2017/05/01\n");
	63	++ printk(KERN_INFO "Hook version: 3.13.0-119.166 2017/05/26\n");
64	64	+ return 0;
65	65	+}
66	66	+module_init(ccs_show_version);
67		---- linux-3.13.0-117.164.orig/include/linux/init_task.h
68		-+++ linux-3.13.0-117.164/include/linux/init_task.h
	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
69	69	@@ -155,6 +155,14 @@ extern struct task_group root_task_group
70	70
71	71	#define INIT_TASK_COMM "swapper"

		@@ -89,8 +89,8 @@
89	89	}
90	90
91	91
92		---- linux-3.13.0-117.164.orig/include/linux/sched.h
93		-+++ linux-3.13.0-117.164/include/linux/sched.h
	92	+--- linux-3.13.0-119.166.orig/include/linux/sched.h
	93	++++ linux-3.13.0-119.166/include/linux/sched.h
94	94	@@ -4,6 +4,8 @@
95	95	#include <uapi/linux/sched.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.13.0-117.164.orig/include/linux/security.h
115		-+++ linux-3.13.0-117.164/include/linux/security.h
	114	+--- linux-3.13.0-119.166.orig/include/linux/security.h
	115	++++ linux-3.13.0-119.166/include/linux/security.h
116	116	@@ -53,6 +53,7 @@ struct msg_queue;
117	117	struct xattr;
118	118	struct xfrm_sec_ctx;

		@@ -314,8 +314,8 @@
314	314	}
315	315	#endif /* CONFIG_SECURITY_PATH */
316	316
317		---- linux-3.13.0-117.164.orig/include/net/ip.h
318		-+++ linux-3.13.0-117.164/include/net/ip.h
	317	+--- linux-3.13.0-119.166.orig/include/net/ip.h
	318	++++ linux-3.13.0-119.166/include/net/ip.h
319	319	@@ -225,6 +225,8 @@ void inet_get_local_port_range(struct ne
320	320	extern unsigned long *sysctl_local_reserved_ports;
321	321	static inline int inet_is_reserved_local_port(int port)

		@@ -325,8 +325,8 @@
325	325	return test_bit(port, sysctl_local_reserved_ports);
326	326	}
327	327
328		---- linux-3.13.0-117.164.orig/kernel/fork.c
329		-+++ linux-3.13.0-117.164/kernel/fork.c
	328	+--- linux-3.13.0-119.166.orig/kernel/fork.c
	329	++++ linux-3.13.0-119.166/kernel/fork.c
330	330	@@ -248,6 +248,7 @@ void __put_task_struct(struct task_struc
331	331	delayacct_tsk_free(tsk);
332	332	put_signal_struct(tsk->signal);

		@@ -353,8 +353,8 @@
353	353	bad_fork_cleanup_perf:
354	354	perf_event_free_task(p);
355	355	bad_fork_cleanup_policy:
356		---- linux-3.13.0-117.164.orig/kernel/kexec.c
357		-+++ linux-3.13.0-117.164/kernel/kexec.c
	356	+--- linux-3.13.0-119.166.orig/kernel/kexec.c
	357	++++ linux-3.13.0-119.166/kernel/kexec.c
358	358	@@ -38,6 +38,7 @@
359	359	#include <asm/uaccess.h>
360	360	#include <asm/io.h>

		@@ -372,8 +372,8 @@
372	372
373	373	/*
374	374	* Verify we have a legal set of flags
375		---- linux-3.13.0-117.164.orig/kernel/module.c
376		-+++ linux-3.13.0-117.164/kernel/module.c
	375	+--- linux-3.13.0-119.166.orig/kernel/module.c
	376	++++ linux-3.13.0-119.166/kernel/module.c
377	377	@@ -63,6 +63,7 @@
378	378	#include <linux/fips.h>
379	379	#include <uapi/linux/module.h>

		@@ -400,8 +400,8 @@
400	400
401	401	return 0;
402	402	}
403		---- linux-3.13.0-117.164.orig/kernel/ptrace.c
404		-+++ linux-3.13.0-117.164/kernel/ptrace.c
	403	+--- linux-3.13.0-119.166.orig/kernel/ptrace.c
	404	++++ linux-3.13.0-119.166/kernel/ptrace.c
405	405	@@ -1055,6 +1055,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
406	406	{
407	407	struct task_struct *child;

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

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

		@@ -456,8 +456,8 @@
456	456
457	457	/*
458	458	* Setpriority might change our priority at the same moment.
459		---- linux-3.13.0-117.164.orig/kernel/signal.c
460		-+++ linux-3.13.0-117.164/kernel/signal.c
	459	+--- linux-3.13.0-119.166.orig/kernel/signal.c
	460	++++ linux-3.13.0-119.166/kernel/signal.c
461	461	@@ -2909,6 +2909,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
462	462	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
463	463	{

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

		@@ -534,8 +534,8 @@
534	534
535	535	down_write(&uts_sem);
536	536	errno = -EFAULT;
537		---- linux-3.13.0-117.164.orig/kernel/time/ntp.c
538		-+++ linux-3.13.0-117.164/kernel/time/ntp.c
	537	+--- linux-3.13.0-119.166.orig/kernel/time/ntp.c
	538	++++ linux-3.13.0-119.166/kernel/time/ntp.c
539	539	@@ -16,6 +16,7 @@
540	540	#include <linux/mm.h>
541	541	#include <linux/module.h>

		@@ -569,8 +569,8 @@
569	569
570	570	/*
571	571	* Check for potential multiplication overflows that can
572		---- linux-3.13.0-117.164.orig/net/ipv4/raw.c
573		-+++ linux-3.13.0-117.164/net/ipv4/raw.c
	572	+--- linux-3.13.0-119.166.orig/net/ipv4/raw.c
	573	++++ linux-3.13.0-119.166/net/ipv4/raw.c
574	574	@@ -706,6 +706,10 @@ static int raw_recvmsg(struct kiocb *ioc
575	575	skb = skb_recv_datagram(sk, flags, noblock, &err);
576	576	if (!skb)

		@@ -582,8 +582,8 @@
582	582
583	583	copied = skb->len;
584	584	if (len < copied) {
585		---- linux-3.13.0-117.164.orig/net/ipv4/udp.c
586		-+++ linux-3.13.0-117.164/net/ipv4/udp.c
	585	+--- linux-3.13.0-119.166.orig/net/ipv4/udp.c
	586	++++ linux-3.13.0-119.166/net/ipv4/udp.c
587	587	@@ -1247,6 +1247,10 @@ try_again:
588	588	&peeked, &off, &err);
589	589	if (!skb)

		@@ -595,8 +595,8 @@
595	595
596	596	ulen = skb->len - sizeof(struct udphdr);
597	597	copied = len;
598		---- linux-3.13.0-117.164.orig/net/ipv6/raw.c
599		-+++ linux-3.13.0-117.164/net/ipv6/raw.c
	598	+--- linux-3.13.0-119.166.orig/net/ipv6/raw.c
	599	++++ linux-3.13.0-119.166/net/ipv6/raw.c
600	600	@@ -474,6 +474,10 @@ static int rawv6_recvmsg(struct kiocb *i
601	601	skb = skb_recv_datagram(sk, flags, noblock, &err);
602	602	if (!skb)

		@@ -608,8 +608,8 @@
608	608
609	609	copied = skb->len;
610	610	if (copied > len) {
611		---- linux-3.13.0-117.164.orig/net/ipv6/udp.c
612		-+++ linux-3.13.0-117.164/net/ipv6/udp.c
	611	+--- linux-3.13.0-119.166.orig/net/ipv6/udp.c
	612	++++ linux-3.13.0-119.166/net/ipv6/udp.c
613	613	@@ -404,6 +404,10 @@ try_again:
614	614	&peeked, &off, &err);
615	615	if (!skb)

		@@ -621,8 +621,8 @@
621	621
622	622	ulen = skb->len - sizeof(struct udphdr);
623	623	copied = len;
624		---- linux-3.13.0-117.164.orig/net/socket.c
625		-+++ linux-3.13.0-117.164/net/socket.c
	624	+--- linux-3.13.0-119.166.orig/net/socket.c
	625	++++ linux-3.13.0-119.166/net/socket.c
626	626	@@ -1616,6 +1616,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
627	627	if (err < 0)
628	628	goto out_fd;

		@@ -634,8 +634,8 @@
634	634	if (upeer_sockaddr) {
635	635	if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
636	636	&len, 2) < 0) {
637		---- linux-3.13.0-117.164.orig/net/unix/af_unix.c
638		-+++ linux-3.13.0-117.164/net/unix/af_unix.c
	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
639	639	@@ -1973,6 +1973,10 @@ static int unix_dgram_recvmsg(struct kio
640	640	wake_up_interruptible_sync_poll(&u->peer_wait,
641	641	POLLOUT \| POLLWRNORM \| POLLWRBAND);

		@@ -647,8 +647,8 @@
647	647	if (msg->msg_name)
648	648	unix_copy_addr(msg, skb->sk);
649	649
650		---- linux-3.13.0-117.164.orig/security/Kconfig
651		-+++ linux-3.13.0-117.164/security/Kconfig
	650	+--- linux-3.13.0-119.166.orig/security/Kconfig
	651	++++ linux-3.13.0-119.166/security/Kconfig
652	652	@@ -167,5 +167,7 @@ config DEFAULT_SECURITY
653	653	default "yama" if DEFAULT_SECURITY_YAMA
654	654	default "" if DEFAULT_SECURITY_DAC

		@@ -657,8 +657,8 @@
657	657	+
658	658	endmenu
659	659
660		---- linux-3.13.0-117.164.orig/security/Makefile
661		-+++ linux-3.13.0-117.164/security/Makefile
	660	+--- linux-3.13.0-119.166.orig/security/Makefile
	661	++++ linux-3.13.0-119.166/security/Makefile
662	662	@@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
663	663	# Object integrity file lists
664	664	subdir-$(CONFIG_INTEGRITY) += integrity

		@@ -666,8 +666,8 @@
666	666	+
667	667	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
668	668	+obj-$(CONFIG_CCSECURITY) += ccsecurity/built-in.o
669		---- linux-3.13.0-117.164.orig/security/security.c
670		-+++ linux-3.13.0-117.164/security/security.c
	669	+--- linux-3.13.0-119.166.orig/security/security.c
	670	++++ linux-3.13.0-119.166/security/security.c
671	671	@@ -203,7 +203,10 @@ int security_syslog(int type)
672	672
673	673	int security_settime(const struct timespec ts, const struct timezone tz)

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

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

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 3.18.54.
	1	+This is TOMOYO Linux patch for kernel 3.18.55.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.54.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.55.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.54.orig/fs/exec.c
33		-+++ linux-3.18.54/fs/exec.c
	32	+--- linux-3.18.55.orig/fs/exec.c
	33	++++ linux-3.18.55/fs/exec.c
34	34	@@ -1442,7 +1442,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.54.orig/fs/open.c
44		-+++ linux-3.18.54/fs/open.c
	43	+--- linux-3.18.55.orig/fs/open.c
	44	++++ linux-3.18.55/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.54.orig/fs/proc/version.c
55		-+++ linux-3.18.54/fs/proc/version.c
	54	+--- linux-3.18.55.orig/fs/proc/version.c
	55	++++ linux-3.18.55/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.54 2017/05/21\n");
	63	++ printk(KERN_INFO "Hook version: 3.18.55 2017/05/26\n");
64	64	+ return 0;
65	65	+}
66	66	+fs_initcall(ccs_show_version);
67		---- linux-3.18.54.orig/include/linux/init_task.h
68		-+++ linux-3.18.54/include/linux/init_task.h
	67	+--- linux-3.18.55.orig/include/linux/init_task.h
	68	++++ linux-3.18.55/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.54.orig/include/linux/sched.h
93		-+++ linux-3.18.54/include/linux/sched.h
	92	+--- linux-3.18.55.orig/include/linux/sched.h
	93	++++ linux-3.18.55/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.54.orig/include/linux/security.h
115		-+++ linux-3.18.54/include/linux/security.h
	114	+--- linux-3.18.55.orig/include/linux/security.h
	115	++++ linux-3.18.55/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.54.orig/include/net/ip.h
328		-+++ linux-3.18.54/include/net/ip.h
	327	+--- linux-3.18.55.orig/include/net/ip.h
	328	++++ linux-3.18.55/include/net/ip.h
329	329	@@ -216,6 +216,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.54.orig/kernel/fork.c
348		-+++ linux-3.18.54/kernel/fork.c
	347	+--- linux-3.18.55.orig/kernel/fork.c
	348	++++ linux-3.18.55/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.54.orig/kernel/kexec.c
376		-+++ linux-3.18.54/kernel/kexec.c
	375	+--- linux-3.18.55.orig/kernel/kexec.c
	376	++++ linux-3.18.55/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.54.orig/kernel/module.c
395		-+++ linux-3.18.54/kernel/module.c
	394	+--- linux-3.18.55.orig/kernel/module.c
	395	++++ linux-3.18.55/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.54.orig/kernel/ptrace.c
423		-+++ linux-3.18.54/kernel/ptrace.c
	422	+--- linux-3.18.55.orig/kernel/ptrace.c
	423	++++ linux-3.18.55/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.54.orig/kernel/reboot.c
449		-+++ linux-3.18.54/kernel/reboot.c
	448	+--- linux-3.18.55.orig/kernel/reboot.c
	449	++++ linux-3.18.55/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.54.orig/kernel/sched/core.c
468		-+++ linux-3.18.54/kernel/sched/core.c
	467	+--- linux-3.18.55.orig/kernel/sched/core.c
	468	++++ linux-3.18.55/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.54.orig/kernel/signal.c
479		-+++ linux-3.18.54/kernel/signal.c
	478	+--- linux-3.18.55.orig/kernel/signal.c
	479	++++ linux-3.18.55/kernel/signal.c
480	480	@@ -2887,6 +2887,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.54.orig/kernel/sys.c
526		-+++ linux-3.18.54/kernel/sys.c
	525	+--- linux-3.18.55.orig/kernel/sys.c
	526	++++ linux-3.18.55/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.54.orig/kernel/time/ntp.c
557		-+++ linux-3.18.54/kernel/time/ntp.c
	556	+--- linux-3.18.55.orig/kernel/time/ntp.c
	557	++++ linux-3.18.55/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.54.orig/net/ipv4/raw.c
592		-+++ linux-3.18.54/net/ipv4/raw.c
	591	+--- linux-3.18.55.orig/net/ipv4/raw.c
	592	++++ linux-3.18.55/net/ipv4/raw.c
593	593	@@ -714,6 +714,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.54.orig/net/ipv4/udp.c
605		-+++ linux-3.18.54/net/ipv4/udp.c
	604	+--- linux-3.18.55.orig/net/ipv4/udp.c
	605	++++ linux-3.18.55/net/ipv4/udp.c
606	606	@@ -1263,6 +1263,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.54.orig/net/ipv6/raw.c
618		-+++ linux-3.18.54/net/ipv6/raw.c
	617	+--- linux-3.18.55.orig/net/ipv6/raw.c
	618	++++ linux-3.18.55/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.54.orig/net/ipv6/udp.c
631		-+++ linux-3.18.54/net/ipv6/udp.c
	630	+--- linux-3.18.55.orig/net/ipv6/udp.c
	631	++++ linux-3.18.55/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.54.orig/net/socket.c
644		-+++ linux-3.18.54/net/socket.c
	643	+--- linux-3.18.55.orig/net/socket.c
	644	++++ linux-3.18.55/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.54.orig/net/unix/af_unix.c
657		-+++ linux-3.18.54/net/unix/af_unix.c
	656	+--- linux-3.18.55.orig/net/unix/af_unix.c
	657	++++ linux-3.18.55/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.54.orig/security/Kconfig
670		-+++ linux-3.18.54/security/Kconfig
	669	+--- linux-3.18.55.orig/security/Kconfig
	670	++++ linux-3.18.55/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.54.orig/security/Makefile
680		-+++ linux-3.18.54/security/Makefile
	679	+--- linux-3.18.55.orig/security/Makefile
	680	++++ linux-3.18.55/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.54.orig/security/security.c
689		-+++ linux-3.18.54/security/security.c
	688	+--- linux-3.18.55.orig/security/security.c
	689	++++ linux-3.18.55/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.11.diff (revision 6577)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.11.diff (revision 6578)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 4.11.2.
	1	+This is TOMOYO Linux patch for kernel 4.11.3.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.11.2.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.11.3.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, 146 insertions(+), 26 deletions(-)
30	30
31		---- linux-4.11.2.orig/fs/exec.c
32		-+++ linux-4.11.2/fs/exec.c
	31	+--- linux-4.11.3.orig/fs/exec.c
	32	++++ linux-4.11.3/fs/exec.c
33	33	@@ -1643,7 +1643,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.11.2.orig/fs/open.c
43		-+++ linux-4.11.2/fs/open.c
	42	+--- linux-4.11.3.orig/fs/open.c
	43	++++ linux-4.11.3/fs/open.c
44	44	@@ -1143,6 +1143,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.11.2.orig/fs/proc/version.c
54		-+++ linux-4.11.2/fs/proc/version.c
	53	+--- linux-4.11.3.orig/fs/proc/version.c
	54	++++ linux-4.11.3/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.11.2 2017/05/21\n");
	62	++ printk(KERN_INFO "Hook version: 4.11.3 2017/05/26\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-4.11.2.orig/include/linux/init_task.h
67		-+++ linux-4.11.2/include/linux/init_task.h
	66	+--- linux-4.11.3.orig/include/linux/init_task.h
	67	++++ linux-4.11.3/include/linux/init_task.h
68	68	@@ -210,6 +210,14 @@ extern struct cred init_cred;
69	69	# define INIT_TASK_TI(tsk)
70	70	#endif

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

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

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

		@@ -337,8 +337,8 @@
337	337	return 0;
338	338	}
339	339
340		---- linux-4.11.2.orig/kernel/fork.c
341		-+++ linux-4.11.2/kernel/fork.c
	340	+--- linux-4.11.3.orig/kernel/fork.c
	341	++++ linux-4.11.3/kernel/fork.c
342	342	@@ -403,6 +403,7 @@ void __put_task_struct(struct task_struc
343	343	delayacct_tsk_free(tsk);
344	344	put_signal_struct(tsk->signal);

		@@ -357,7 +357,7 @@
357	357	retval = copy_semundo(clone_flags, p);
358	358	if (retval)
359	359	goto bad_fork_cleanup_audit;
360		-@@ -1905,6 +1909,7 @@ bad_fork_cleanup_semundo:
	360	+@@ -1909,6 +1913,7 @@ bad_fork_cleanup_semundo:
361	361	exit_sem(p);
362	362	bad_fork_cleanup_audit:
363	363	audit_free(p);

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

		@@ -385,8 +385,8 @@
385	385
386	386	/*
387	387	* Verify we have a legal set of flags
388		---- linux-4.11.2.orig/kernel/module.c
389		-+++ linux-4.11.2/kernel/module.c
	388	+--- linux-4.11.3.orig/kernel/module.c
	389	++++ linux-4.11.3/kernel/module.c
390	390	@@ -65,6 +65,7 @@
391	391	#include <linux/audit.h>
392	392	#include <uapi/linux/module.h>

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

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

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

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

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

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

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

		@@ -595,8 +595,8 @@
595	595
596	596	copied = skb->len;
597	597	if (len < copied) {
598		---- linux-4.11.2.orig/net/ipv4/udp.c
599		-+++ linux-4.11.2/net/ipv4/udp.c
	598	+--- linux-4.11.3.orig/net/ipv4/udp.c
	599	++++ linux-4.11.3/net/ipv4/udp.c
600	600	@@ -1425,6 +1425,8 @@ try_again:
601	601	skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
602	602	if (!skb)

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

		@@ -619,8 +619,8 @@
619	619
620	620	copied = skb->len;
621	621	if (copied > len) {
622		---- linux-4.11.2.orig/net/ipv6/udp.c
623		-+++ linux-4.11.2/net/ipv6/udp.c
	622	+--- linux-4.11.3.orig/net/ipv6/udp.c
	623	++++ linux-4.11.3/net/ipv6/udp.c
624	624	@@ -360,6 +360,8 @@ try_again:
625	625	skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
626	626	if (!skb)

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

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

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

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

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

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

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 4.4.69.
	1	+This is TOMOYO Linux patch for kernel 4.4.70.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.69.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.70.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.69.orig/fs/exec.c
32		-+++ linux-4.4.69/fs/exec.c
	31	+--- linux-4.4.70.orig/fs/exec.c
	32	++++ linux-4.4.70/fs/exec.c
33	33	@@ -1487,7 +1487,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.69.orig/fs/open.c
43		-+++ linux-4.4.69/fs/open.c
	42	+--- linux-4.4.70.orig/fs/open.c
	43	++++ linux-4.4.70/fs/open.c
44	44	@@ -1111,6 +1111,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.69.orig/fs/proc/version.c
54		-+++ linux-4.4.69/fs/proc/version.c
	53	+--- linux-4.4.70.orig/fs/proc/version.c
	54	++++ linux-4.4.70/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.69 2017/05/21\n");
	62	++ printk(KERN_INFO "Hook version: 4.4.70 2017/05/26\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-4.4.69.orig/include/linux/init_task.h
67		-+++ linux-4.4.69/include/linux/init_task.h
	66	+--- linux-4.4.70.orig/include/linux/init_task.h
	67	++++ linux-4.4.70/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.69.orig/include/linux/sched.h
92		-+++ linux-4.4.69/include/linux/sched.h
	91	+--- linux-4.4.70.orig/include/linux/sched.h
	92	++++ linux-4.4.70/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.69.orig/include/linux/security.h
114		-+++ linux-4.4.69/include/linux/security.h
	113	+--- linux-4.4.70.orig/include/linux/security.h
	114	++++ linux-4.4.70/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.69.orig/include/net/ip.h
322		-+++ linux-4.4.69/include/net/ip.h
	321	+--- linux-4.4.70.orig/include/net/ip.h
	322	++++ linux-4.4.70/include/net/ip.h
323	323	@@ -223,6 +223,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.69.orig/kernel/fork.c
342		-+++ linux-4.4.69/kernel/fork.c
	341	+--- linux-4.4.70.orig/kernel/fork.c
	342	++++ linux-4.4.70/kernel/fork.c
343	343	@@ -258,6 +258,7 @@ void __put_task_struct(struct task_struc
344	344	delayacct_tsk_free(tsk);
345	345	put_signal_struct(tsk->signal);

		@@ -358,7 +358,7 @@
358	358	retval = copy_semundo(clone_flags, p);
359	359	if (retval)
360	360	goto bad_fork_cleanup_audit;
361		-@@ -1671,6 +1675,7 @@ bad_fork_cleanup_semundo:
	361	+@@ -1675,6 +1679,7 @@ bad_fork_cleanup_semundo:
362	362	exit_sem(p);
363	363	bad_fork_cleanup_audit:
364	364	audit_free(p);

		@@ -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.69.orig/kernel/kexec.c
370		-+++ linux-4.4.69/kernel/kexec.c
	369	+--- linux-4.4.70.orig/kernel/kexec.c
	370	++++ linux-4.4.70/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.69.orig/kernel/module.c
390		-+++ linux-4.4.69/kernel/module.c
	389	+--- linux-4.4.70.orig/kernel/module.c
	390	++++ linux-4.4.70/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.69.orig/kernel/ptrace.c
418		-+++ linux-4.4.69/kernel/ptrace.c
	417	+--- linux-4.4.70.orig/kernel/ptrace.c
	418	++++ linux-4.4.70/kernel/ptrace.c
419	419	@@ -1079,6 +1079,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.69.orig/kernel/reboot.c
444		-+++ linux-4.4.69/kernel/reboot.c
	443	+--- linux-4.4.70.orig/kernel/reboot.c
	444	++++ linux-4.4.70/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.69.orig/kernel/sched/core.c
463		-+++ linux-4.4.69/kernel/sched/core.c
	462	+--- linux-4.4.70.orig/kernel/sched/core.c
	463	++++ linux-4.4.70/kernel/sched/core.c
464	464	@@ -3548,6 +3548,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.69.orig/kernel/signal.c
474		-+++ linux-4.4.69/kernel/signal.c
	473	+--- linux-4.4.70.orig/kernel/signal.c
	474	++++ linux-4.4.70/kernel/signal.c
475	475	@@ -2847,6 +2847,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.69.orig/kernel/sys.c
521		-+++ linux-4.4.69/kernel/sys.c
	520	+--- linux-4.4.70.orig/kernel/sys.c
	521	++++ linux-4.4.70/kernel/sys.c
522	522	@@ -183,6 +183,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.69.orig/kernel/time/ntp.c
552		-+++ linux-4.4.69/kernel/time/ntp.c
	551	+--- linux-4.4.70.orig/kernel/time/ntp.c
	552	++++ linux-4.4.70/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.69.orig/net/ipv4/raw.c
587		-+++ linux-4.4.69/net/ipv4/raw.c
	586	+--- linux-4.4.70.orig/net/ipv4/raw.c
	587	++++ linux-4.4.70/net/ipv4/raw.c
588	588	@@ -742,6 +742,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.69.orig/net/ipv4/udp.c
600		-+++ linux-4.4.69/net/ipv4/udp.c
	599	+--- linux-4.4.70.orig/net/ipv4/udp.c
	600	++++ linux-4.4.70/net/ipv4/udp.c
601	601	@@ -1286,6 +1286,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.69.orig/net/ipv6/raw.c
613		-+++ linux-4.4.69/net/ipv6/raw.c
	612	+--- linux-4.4.70.orig/net/ipv6/raw.c
	613	++++ linux-4.4.70/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.69.orig/net/ipv6/udp.c
626		-+++ linux-4.4.69/net/ipv6/udp.c
	625	+--- linux-4.4.70.orig/net/ipv6/udp.c
	626	++++ linux-4.4.70/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.69.orig/net/socket.c
639		-+++ linux-4.4.69/net/socket.c
	638	+--- linux-4.4.70.orig/net/socket.c
	639	++++ linux-4.4.70/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.69.orig/net/unix/af_unix.c
652		-+++ linux-4.4.69/net/unix/af_unix.c
	651	+--- linux-4.4.70.orig/net/unix/af_unix.c
	652	++++ linux-4.4.70/net/unix/af_unix.c
653	653	@@ -2139,6 +2139,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.69.orig/security/Kconfig
665		-+++ linux-4.4.69/security/Kconfig
	664	+--- linux-4.4.70.orig/security/Kconfig
	665	++++ linux-4.4.70/security/Kconfig
666	666	@@ -163,5 +163,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.69.orig/security/Makefile
675		-+++ linux-4.4.69/security/Makefile
	674	+--- linux-4.4.70.orig/security/Makefile
	675	++++ linux-4.4.70/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 6577)

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

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 4.9.29.
	1	+This is TOMOYO Linux patch for kernel 4.9.30.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.29.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.30.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.29.orig/fs/exec.c
32		-+++ linux-4.9.29/fs/exec.c
	31	+--- linux-4.9.30.orig/fs/exec.c
	32	++++ linux-4.9.30/fs/exec.c
33	33	@@ -1640,7 +1640,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.29.orig/fs/open.c
43		-+++ linux-4.9.29/fs/open.c
	42	+--- linux-4.9.30.orig/fs/open.c
	43	++++ linux-4.9.30/fs/open.c
44	44	@@ -1145,6 +1145,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.29.orig/fs/proc/version.c
54		-+++ linux-4.9.29/fs/proc/version.c
	53	+--- linux-4.9.30.orig/fs/proc/version.c
	54	++++ linux-4.9.30/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.29 2017/05/21\n");
	62	++ printk(KERN_INFO "Hook version: 4.9.30 2017/05/26\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-4.9.29.orig/include/linux/init_task.h
67		-+++ linux-4.9.29/include/linux/init_task.h
	66	+--- linux-4.9.30.orig/include/linux/init_task.h
	67	++++ linux-4.9.30/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.29.orig/include/linux/sched.h
92		-+++ linux-4.9.29/include/linux/sched.h
	91	+--- linux-4.9.30.orig/include/linux/sched.h
	92	++++ linux-4.9.30/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.29.orig/include/linux/security.h
114		-+++ linux-4.9.29/include/linux/security.h
	113	+--- linux-4.9.30.orig/include/linux/security.h
	114	++++ linux-4.9.30/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.29.orig/include/net/ip.h
322		-+++ linux-4.9.29/include/net/ip.h
	321	+--- linux-4.9.30.orig/include/net/ip.h
	322	++++ linux-4.9.30/include/net/ip.h
323	323	@@ -252,6 +252,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.29.orig/kernel/fork.c
342		-+++ linux-4.9.29/kernel/fork.c
	341	+--- linux-4.9.30.orig/kernel/fork.c
	342	++++ linux-4.9.30/kernel/fork.c
343	343	@@ -390,6 +390,7 @@ void __put_task_struct(struct task_struc
344	344	delayacct_tsk_free(tsk);
345	345	put_signal_struct(tsk->signal);

		@@ -358,7 +358,7 @@
358	358	retval = copy_semundo(clone_flags, p);
359	359	if (retval)
360	360	goto bad_fork_cleanup_audit;
361		-@@ -1856,6 +1860,7 @@ bad_fork_cleanup_semundo:
	361	+@@ -1860,6 +1864,7 @@ bad_fork_cleanup_semundo:
362	362	exit_sem(p);
363	363	bad_fork_cleanup_audit:
364	364	audit_free(p);

		@@ -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.29.orig/kernel/kexec.c
370		-+++ linux-4.9.29/kernel/kexec.c
	369	+--- linux-4.9.30.orig/kernel/kexec.c
	370	++++ linux-4.9.30/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.29.orig/kernel/module.c
390		-+++ linux-4.9.29/kernel/module.c
	389	+--- linux-4.9.30.orig/kernel/module.c
	390	++++ linux-4.9.30/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.29.orig/kernel/ptrace.c
418		-+++ linux-4.9.29/kernel/ptrace.c
	417	+--- linux-4.9.30.orig/kernel/ptrace.c
	418	++++ linux-4.9.30/kernel/ptrace.c
419	419	@@ -1116,6 +1116,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.29.orig/kernel/reboot.c
444		-+++ linux-4.9.29/kernel/reboot.c
	443	+--- linux-4.9.30.orig/kernel/reboot.c
	444	++++ linux-4.9.30/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.29.orig/kernel/sched/core.c
463		-+++ linux-4.9.29/kernel/sched/core.c
	462	+--- linux-4.9.30.orig/kernel/sched/core.c
	463	++++ linux-4.9.30/kernel/sched/core.c
464	464	@@ -3811,6 +3811,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.29.orig/kernel/signal.c
474		-+++ linux-4.9.29/kernel/signal.c
	473	+--- linux-4.9.30.orig/kernel/signal.c
	474	++++ linux-4.9.30/kernel/signal.c
475	475	@@ -2847,6 +2847,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.29.orig/kernel/sys.c
521		-+++ linux-4.9.29/kernel/sys.c
	520	+--- linux-4.9.30.orig/kernel/sys.c
	521	++++ linux-4.9.30/kernel/sys.c
522	522	@@ -183,6 +183,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.29.orig/kernel/time/ntp.c
552		-+++ linux-4.9.29/kernel/time/ntp.c
	551	+--- linux-4.9.30.orig/kernel/time/ntp.c
	552	++++ linux-4.9.30/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.29.orig/net/ipv4/raw.c
587		-+++ linux-4.9.29/net/ipv4/raw.c
	586	+--- linux-4.9.30.orig/net/ipv4/raw.c
	587	++++ linux-4.9.30/net/ipv4/raw.c
588	588	@@ -739,6 +739,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.29.orig/net/ipv4/udp.c
600		-+++ linux-4.9.29/net/ipv4/udp.c
	599	+--- linux-4.9.30.orig/net/ipv4/udp.c
	600	++++ linux-4.9.30/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.29.orig/net/ipv6/raw.c
611		-+++ linux-4.9.29/net/ipv6/raw.c
	610	+--- linux-4.9.30.orig/net/ipv6/raw.c
	611	++++ linux-4.9.30/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.29.orig/net/ipv6/udp.c
624		-+++ linux-4.9.29/net/ipv6/udp.c
	623	+--- linux-4.9.30.orig/net/ipv6/udp.c
	624	++++ linux-4.9.30/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.29.orig/net/socket.c
635		-+++ linux-4.9.29/net/socket.c
	634	+--- linux-4.9.30.orig/net/socket.c
	635	++++ linux-4.9.30/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.29.orig/net/unix/af_unix.c
648		-+++ linux-4.9.29/net/unix/af_unix.c
	647	+--- linux-4.9.30.orig/net/unix/af_unix.c
	648	++++ linux-4.9.30/net/unix/af_unix.c
649	649	@@ -2145,6 +2145,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.29.orig/security/Kconfig
669		-+++ linux-4.9.29/security/Kconfig
	668	+--- linux-4.9.30.orig/security/Kconfig
	669	++++ linux-4.9.30/security/Kconfig
670	670	@@ -204,5 +204,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.29.orig/security/Makefile
679		-+++ linux-4.9.29/security/Makefile
	678	+--- linux-4.9.30.orig/security/Makefile
	679	++++ linux-4.9.30/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 6577)

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

		@@ -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-514.16.1.el7.src.rpm ]
	13	+if [ ! -r kernel-3.10.0-514.21.1.el7.src.rpm ]
14	14	then
15		- wget http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-514.16.1.el7.src.rpm \|\| die "Can't download source package."
	15	+ wget http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-514.21.1.el7.src.rpm \|\| die "Can't download source package."
16	16	fi
17		-LANG=C rpm --checksig kernel-3.10.0-514.16.1.el7.src.rpm \| grep -F ': rsa sha1 (md5) pgp md5 OK' \|\| die "Can't verify signature."
18		-rpm -ivh kernel-3.10.0-514.16.1.el7.src.rpm \|\| die "Can't install source package."
	17	+LANG=C rpm --checksig kernel-3.10.0-514.21.1.el7.src.rpm \| grep -F ': rsa sha1 (md5) pgp md5 OK' \|\| die "Can't verify signature."
	18	+rpm -ivh kernel-3.10.0-514.21.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-20170515.tar.gz ]

旧リポジトリブラウザで表示

TOMOYO Fork

tomoyo: コミット

コミットメタ情報

ログメッセージ

変更サマリ

差分

TOMOYO
Fork