OSDN > Find Software > System > Operating System Kernels > Linux > CaitSith > SCM > SVN > Commit

CaitSith

R/O
SSH
HTTPS

caitsith: Commit

Commit MetaInfo

Revision	218 (tree)
Time	2016-10-16 18:00:36
Author	kumaneko

Log Message

(empty log message)

Change Summary

modified: tags/htdocs/index.html (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-3.10-centos-7.diff (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-3.13-ubuntu-14.04.diff (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-3.18.diff (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-3.2-ubuntu-12.04.diff (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-4.1.diff (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-4.4.diff (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-4.7.diff (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-4.8.diff (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-4.9.diff (diff)
modified: trunk/caitsith-patch/specs/build-c6-2.6.32.sh (diff)
modified: trunk/caitsith-patch/specs/build-c7-3.10.sh (diff)

Incremental Difference

--- tags/htdocs/index.html (revision 217)

+++ tags/htdocs/index.html (revision 218)

		@@ -423,10 +423,10 @@
423	423	<p>Make sure the dependencies described above have been installed. Compile and install the tools with the following commands. (Please use USRLIBDIR=/usr/lib or USRLIBDIR=/usr/lib32 if needed):</p>
424	424
425	425	<pre class="command">
426		-$ wget -O caitsith-tools-0.2-20161005.tar.gz 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/55465/caitsith-tools-0.2-20161005.tar.gz'
427		-$ wget -O caitsith-tools-0.2-20161005.tar.gz.asc 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/55465/caitsith-tools-0.2-20161005.tar.gz.asc'
428		-$ gpg caitsith-tools-0.2-20161005.tar.gz.asc
429		-$ tar -zxf caitsith-tools-0.2-20161005.tar.gz
	426	+$ wget -O caitsith-tools-0.2-20161016.tar.gz 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/55465/caitsith-tools-0.2-20161016.tar.gz'
	427	+$ wget -O caitsith-tools-0.2-20161016.tar.gz.asc 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/55465/caitsith-tools-0.2-20161016.tar.gz.asc'
	428	+$ gpg caitsith-tools-0.2-20161016.tar.gz.asc
	429	+$ tar -zxf caitsith-tools-0.2-20161016.tar.gz
430	430	$ cd caitsith-tools/
431	431	$ make -s USRLIBDIR=/usr/lib64
432	432	$ su

		@@ -448,7 +448,7 @@
448	448	<p>FYI: If your system has rpm-build package installed, you can make a tools RPM package with the following commands:</p>
449	449
450	450	<pre class="command">
451		-$ rpmbuild -tb caitsith-tools-0.2-20161005.tar.gz
	451	+$ rpmbuild -tb caitsith-tools-0.2-20161016.tar.gz
452	452	</pre>
453	453
454	454	<hr>

		@@ -679,10 +679,10 @@
679	679	<p>Make sure the dependencies described above have been installed. Compile and install the tools with the following commands. (Please use USRLIBDIR=/usr/lib or USRLIBDIR=/usr/lib32 if needed):</p>
680	680
681	681	<pre class="command">
682		-$ wget -O caitsith-tools-0.2-20161005.tar.gz 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/55465/caitsith-tools-0.2-20161005.tar.gz'
683		-$ wget -O caitsith-tools-0.2-20161005.tar.gz.asc 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/55465/caitsith-tools-0.2-20161005.tar.gz.asc'
684		-$ gpg caitsith-tools-0.2-20161005.tar.gz.asc
685		-$ tar -zxf caitsith-tools-0.2-20161005.tar.gz
	682	+$ wget -O caitsith-tools-0.2-20161016.tar.gz 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/55465/caitsith-tools-0.2-20161016.tar.gz'
	683	+$ wget -O caitsith-tools-0.2-20161016.tar.gz.asc 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/55465/caitsith-tools-0.2-20161016.tar.gz.asc'
	684	+$ gpg caitsith-tools-0.2-20161016.tar.gz.asc
	685	+$ tar -zxf caitsith-tools-0.2-20161016.tar.gz
686	686	$ cd caitsith-tools/
687	687	$ make -s USRLIBDIR=/usr/lib64
688	688	$ su

		@@ -704,7 +704,7 @@
704	704	<p>FYI: If your system has rpm-build package installed, you can make a tools RPM package with the following commands:</p>
705	705
706	706	<pre class="command">
707		-$ rpmbuild -tb caitsith-tools-0.2-20161005.tar.gz
	707	+$ rpmbuild -tb caitsith-tools-0.2-20161016.tar.gz
708	708	</pre>
709	709
710	710	<hr>

		@@ -4485,7 +4485,7 @@
4485	4485	<li>Otherwise, do not use execute handler.</li>
4486	4486	</ul>
4487	4487
4488		-<p>Please see usr_lib_caitsith/audit-exec-param.c included in the caitsith-tools-0.2-20161005.tar.gz for example for using as execute handler program.</p>
	4488	+<p>Please see usr_lib_caitsith/audit-exec-param.c included in the caitsith-tools-0.2-20161016.tar.gz for example for using as execute handler program.</p>
4489	4489
4490	4490	<hr>
4491	4491	<a href="#index">Return to index.</a>

--- trunk/caitsith-patch/patches/ccs-patch-3.10-centos-7.diff (revision 217)

+++ trunk/caitsith-patch/patches/ccs-patch-3.10-centos-7.diff (revision 218)

		@@ -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-327.36.1.el7.src.rpm
	3	+Source code for this patch is http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-327.26.2.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-327.36.1.el7.orig/fs/exec.c
32		-+++ linux-3.10.0-327.36.1.el7/fs/exec.c
	31	+--- linux-3.10.0-327.36.2.el7.orig/fs/exec.c
	32	++++ linux-3.10.0-327.36.2.el7/fs/exec.c
33	33	@@ -1573,7 +1573,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-327.36.1.el7.orig/fs/open.c
43		-+++ linux-3.10.0-327.36.1.el7/fs/open.c
	42	+--- linux-3.10.0-327.36.2.el7.orig/fs/open.c
	43	++++ linux-3.10.0-327.36.2.el7/fs/open.c
44	44	@@ -1115,6 +1115,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-327.36.1.el7.orig/fs/proc/version.c
54		-+++ linux-3.10.0-327.36.1.el7/fs/proc/version.c
	53	+--- linux-3.10.0-327.36.2.el7.orig/fs/proc/version.c
	54	++++ linux-3.10.0-327.36.2.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-327.36.1.el7 2016/09/20\n");
	62	++ printk(KERN_INFO "Hook version: 3.10.0-327.26.2.el7 2016/10/16\n");
63	63	+ return 0;
64	64	+}
65	65	+module_init(ccs_show_version);
66		---- linux-3.10.0-327.36.1.el7.orig/include/linux/init_task.h
67		-+++ linux-3.10.0-327.36.1.el7/include/linux/init_task.h
	66	+--- linux-3.10.0-327.36.2.el7.orig/include/linux/init_task.h
	67	++++ linux-3.10.0-327.36.2.el7/include/linux/init_task.h
68	68	@@ -155,6 +155,14 @@ extern struct task_group root_task_group
69	69
70	70	#define INIT_TASK_COMM "swapper"

		@@ -88,8 +88,8 @@
88	88	}
89	89
90	90
91		---- linux-3.10.0-327.36.1.el7.orig/include/linux/sched.h
92		-+++ linux-3.10.0-327.36.1.el7/include/linux/sched.h
	91	+--- linux-3.10.0-327.36.2.el7.orig/include/linux/sched.h
	92	++++ linux-3.10.0-327.36.2.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-327.36.1.el7.orig/include/linux/security.h
114		-+++ linux-3.10.0-327.36.1.el7/include/linux/security.h
	113	+--- linux-3.10.0-327.36.2.el7.orig/include/linux/security.h
	114	++++ linux-3.10.0-327.36.2.el7/include/linux/security.h
115	115	@@ -53,6 +53,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-327.36.1.el7.orig/include/net/ip.h
327		-+++ linux-3.10.0-327.36.1.el7/include/net/ip.h
	326	+--- linux-3.10.0-327.36.2.el7.orig/include/net/ip.h
	327	++++ linux-3.10.0-327.36.2.el7/include/net/ip.h
328	328	@@ -227,6 +227,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-327.36.1.el7.orig/kernel/fork.c
338		-+++ linux-3.10.0-327.36.1.el7/kernel/fork.c
	337	+--- linux-3.10.0-327.36.2.el7.orig/kernel/fork.c
	338	++++ linux-3.10.0-327.36.2.el7/kernel/fork.c
339	339	@@ -242,6 +242,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-327.36.1.el7.orig/kernel/kexec.c
366		-+++ linux-3.10.0-327.36.1.el7/kernel/kexec.c
	365	+--- linux-3.10.0-327.36.2.el7.orig/kernel/kexec.c
	366	++++ linux-3.10.0-327.36.2.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-327.36.1.el7.orig/kernel/module.c
377		-+++ linux-3.10.0-327.36.1.el7/kernel/module.c
	376	+--- linux-3.10.0-327.36.2.el7.orig/kernel/module.c
	377	++++ linux-3.10.0-327.36.2.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-327.36.1.el7.orig/kernel/ptrace.c
405		-+++ linux-3.10.0-327.36.1.el7/kernel/ptrace.c
	404	+--- linux-3.10.0-327.36.2.el7.orig/kernel/ptrace.c
	405	++++ linux-3.10.0-327.36.2.el7/kernel/ptrace.c
406	406	@@ -1045,6 +1045,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-327.36.1.el7.orig/kernel/sched/core.c
431		-+++ linux-3.10.0-327.36.1.el7/kernel/sched/core.c
	430	+--- linux-3.10.0-327.36.2.el7.orig/kernel/sched/core.c
	431	++++ linux-3.10.0-327.36.2.el7/kernel/sched/core.c
432	432	@@ -3979,6 +3979,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-327.36.1.el7.orig/kernel/signal.c
442		-+++ linux-3.10.0-327.36.1.el7/kernel/signal.c
	441	+--- linux-3.10.0-327.36.2.el7.orig/kernel/signal.c
	442	++++ linux-3.10.0-327.36.2.el7/kernel/signal.c
443	443	@@ -2910,6 +2910,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-327.36.1.el7.orig/kernel/sys.c
489		-+++ linux-3.10.0-327.36.1.el7/kernel/sys.c
	488	+--- linux-3.10.0-327.36.2.el7.orig/kernel/sys.c
	489	++++ linux-3.10.0-327.36.2.el7/kernel/sys.c
490	490	@@ -186,6 +186,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-327.36.1.el7.orig/kernel/time/ntp.c
529		-+++ linux-3.10.0-327.36.1.el7/kernel/time/ntp.c
	528	+--- linux-3.10.0-327.36.2.el7.orig/kernel/time/ntp.c
	529	++++ linux-3.10.0-327.36.2.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-327.36.1.el7.orig/net/ipv4/raw.c
564		-+++ linux-3.10.0-327.36.1.el7/net/ipv4/raw.c
	563	+--- linux-3.10.0-327.36.2.el7.orig/net/ipv4/raw.c
	564	++++ linux-3.10.0-327.36.2.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-327.36.1.el7.orig/net/ipv4/udp.c
577		-+++ linux-3.10.0-327.36.1.el7/net/ipv4/udp.c
	576	+--- linux-3.10.0-327.36.2.el7.orig/net/ipv4/udp.c
	577	++++ linux-3.10.0-327.36.2.el7/net/ipv4/udp.c
578	578	@@ -1272,6 +1272,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-327.36.1.el7.orig/net/ipv6/raw.c
590		-+++ linux-3.10.0-327.36.1.el7/net/ipv6/raw.c
	589	+--- linux-3.10.0-327.36.2.el7.orig/net/ipv6/raw.c
	590	++++ linux-3.10.0-327.36.2.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-327.36.1.el7.orig/net/ipv6/udp.c
603		-+++ linux-3.10.0-327.36.1.el7/net/ipv6/udp.c
	602	+--- linux-3.10.0-327.36.2.el7.orig/net/ipv6/udp.c
	603	++++ linux-3.10.0-327.36.2.el7/net/ipv6/udp.c
604	604	@@ -404,6 +404,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-327.36.1.el7.orig/net/socket.c
616		-+++ linux-3.10.0-327.36.1.el7/net/socket.c
	615	+--- linux-3.10.0-327.36.2.el7.orig/net/socket.c
	616	++++ linux-3.10.0-327.36.2.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-327.36.1.el7.orig/net/unix/af_unix.c
629		-+++ linux-3.10.0-327.36.1.el7/net/unix/af_unix.c
	628	+--- linux-3.10.0-327.36.2.el7.orig/net/unix/af_unix.c
	629	++++ linux-3.10.0-327.36.2.el7/net/unix/af_unix.c
630	630	@@ -2065,6 +2065,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-327.36.1.el7.orig/security/Kconfig
642		-+++ linux-3.10.0-327.36.1.el7/security/Kconfig
	641	+--- linux-3.10.0-327.36.2.el7.orig/security/Kconfig
	642	++++ linux-3.10.0-327.36.2.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-327.36.1.el7.orig/security/Makefile
652		-+++ linux-3.10.0-327.36.1.el7/security/Makefile
	651	+--- linux-3.10.0-327.36.2.el7.orig/security/Makefile
	652	++++ linux-3.10.0-327.36.2.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-327.36.1.el7.orig/security/security.c
661		-+++ linux-3.10.0-327.36.1.el7/security/security.c
	660	+--- linux-3.10.0-327.36.2.el7.orig/security/security.c
	661	++++ linux-3.10.0-327.36.2.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/caitsith-patch/patches/ccs-patch-3.13-ubuntu-14.04.diff (revision 217)

+++ trunk/caitsith-patch/patches/ccs-patch-3.13-ubuntu-14.04.diff (revision 218)

		@@ -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-96.143.orig/fs/exec.c
33		-+++ linux-3.13.0-96.143/fs/exec.c
	32	+--- linux-3.13.0-98.145.orig/fs/exec.c
	33	++++ linux-3.13.0-98.145/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-96.143.orig/fs/open.c
44		-+++ linux-3.13.0-96.143/fs/open.c
	43	+--- linux-3.13.0-98.145.orig/fs/open.c
	44	++++ linux-3.13.0-98.145/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-96.143.orig/fs/proc/version.c
55		-+++ linux-3.13.0-96.143/fs/proc/version.c
	54	+--- linux-3.13.0-98.145.orig/fs/proc/version.c
	55	++++ linux-3.13.0-98.145/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-96.143 2016/09/23\n");
	63	++ printk(KERN_INFO "Hook version: 3.13.0-98.145 2016/10/16\n");
64	64	+ return 0;
65	65	+}
66	66	+module_init(ccs_show_version);
67		---- linux-3.13.0-96.143.orig/include/linux/init_task.h
68		-+++ linux-3.13.0-96.143/include/linux/init_task.h
	67	+--- linux-3.13.0-98.145.orig/include/linux/init_task.h
	68	++++ linux-3.13.0-98.145/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-96.143.orig/include/linux/sched.h
93		-+++ linux-3.13.0-96.143/include/linux/sched.h
	92	+--- linux-3.13.0-98.145.orig/include/linux/sched.h
	93	++++ linux-3.13.0-98.145/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-96.143.orig/include/linux/security.h
115		-+++ linux-3.13.0-96.143/include/linux/security.h
	114	+--- linux-3.13.0-98.145.orig/include/linux/security.h
	115	++++ linux-3.13.0-98.145/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-96.143.orig/include/net/ip.h
318		-+++ linux-3.13.0-96.143/include/net/ip.h
	317	+--- linux-3.13.0-98.145.orig/include/net/ip.h
	318	++++ linux-3.13.0-98.145/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-96.143.orig/kernel/fork.c
329		-+++ linux-3.13.0-96.143/kernel/fork.c
	328	+--- linux-3.13.0-98.145.orig/kernel/fork.c
	329	++++ linux-3.13.0-98.145/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-96.143.orig/kernel/kexec.c
357		-+++ linux-3.13.0-96.143/kernel/kexec.c
	356	+--- linux-3.13.0-98.145.orig/kernel/kexec.c
	357	++++ linux-3.13.0-98.145/kernel/kexec.c
358	358	@@ -37,6 +37,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-96.143.orig/kernel/module.c
376		-+++ linux-3.13.0-96.143/kernel/module.c
	375	+--- linux-3.13.0-98.145.orig/kernel/module.c
	376	++++ linux-3.13.0-98.145/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-96.143.orig/kernel/ptrace.c
404		-+++ linux-3.13.0-96.143/kernel/ptrace.c
	403	+--- linux-3.13.0-98.145.orig/kernel/ptrace.c
	404	++++ linux-3.13.0-98.145/kernel/ptrace.c
405	405	@@ -1078,6 +1078,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-96.143.orig/kernel/reboot.c
430		-+++ linux-3.13.0-96.143/kernel/reboot.c
	429	+--- linux-3.13.0-98.145.orig/kernel/reboot.c
	430	++++ linux-3.13.0-98.145/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-96.143.orig/kernel/sched/core.c
449		-+++ linux-3.13.0-96.143/kernel/sched/core.c
	448	+--- linux-3.13.0-98.145.orig/kernel/sched/core.c
	449	++++ linux-3.13.0-98.145/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-96.143.orig/kernel/signal.c
460		-+++ linux-3.13.0-96.143/kernel/signal.c
	459	+--- linux-3.13.0-98.145.orig/kernel/signal.c
	460	++++ linux-3.13.0-98.145/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-96.143.orig/kernel/sys.c
507		-+++ linux-3.13.0-96.143/kernel/sys.c
	506	+--- linux-3.13.0-98.145.orig/kernel/sys.c
	507	++++ linux-3.13.0-98.145/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-96.143.orig/kernel/time/ntp.c
538		-+++ linux-3.13.0-96.143/kernel/time/ntp.c
	537	+--- linux-3.13.0-98.145.orig/kernel/time/ntp.c
	538	++++ linux-3.13.0-98.145/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-96.143.orig/net/ipv4/raw.c
573		-+++ linux-3.13.0-96.143/net/ipv4/raw.c
	572	+--- linux-3.13.0-98.145.orig/net/ipv4/raw.c
	573	++++ linux-3.13.0-98.145/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-96.143.orig/net/ipv4/udp.c
586		-+++ linux-3.13.0-96.143/net/ipv4/udp.c
	585	+--- linux-3.13.0-98.145.orig/net/ipv4/udp.c
	586	++++ linux-3.13.0-98.145/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-96.143.orig/net/ipv6/raw.c
599		-+++ linux-3.13.0-96.143/net/ipv6/raw.c
	598	+--- linux-3.13.0-98.145.orig/net/ipv6/raw.c
	599	++++ linux-3.13.0-98.145/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-96.143.orig/net/ipv6/udp.c
612		-+++ linux-3.13.0-96.143/net/ipv6/udp.c
	611	+--- linux-3.13.0-98.145.orig/net/ipv6/udp.c
	612	++++ linux-3.13.0-98.145/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-96.143.orig/net/socket.c
625		-+++ linux-3.13.0-96.143/net/socket.c
	624	+--- linux-3.13.0-98.145.orig/net/socket.c
	625	++++ linux-3.13.0-98.145/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-96.143.orig/net/unix/af_unix.c
638		-+++ linux-3.13.0-96.143/net/unix/af_unix.c
	637	+--- linux-3.13.0-98.145.orig/net/unix/af_unix.c
	638	++++ linux-3.13.0-98.145/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-96.143.orig/security/Kconfig
651		-+++ linux-3.13.0-96.143/security/Kconfig
	650	+--- linux-3.13.0-98.145.orig/security/Kconfig
	651	++++ linux-3.13.0-98.145/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-96.143.orig/security/Makefile
661		-+++ linux-3.13.0-96.143/security/Makefile
	660	+--- linux-3.13.0-98.145.orig/security/Makefile
	661	++++ linux-3.13.0-98.145/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-96.143.orig/security/security.c
670		-+++ linux-3.13.0-96.143/security/security.c
	669	+--- linux-3.13.0-98.145.orig/security/security.c
	670	++++ linux-3.13.0-98.145/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/caitsith-patch/patches/ccs-patch-3.18.diff (revision 217)

+++ trunk/caitsith-patch/patches/ccs-patch-3.18.diff (revision 218)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 3.18.42.
	1	+This is TOMOYO Linux patch for kernel 3.18.43.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.42.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.43.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.42.orig/fs/exec.c
33		-+++ linux-3.18.42/fs/exec.c
	32	+--- linux-3.18.43.orig/fs/exec.c
	33	++++ linux-3.18.43/fs/exec.c
34	34	@@ -1436,7 +1436,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.42.orig/fs/open.c
44		-+++ linux-3.18.42/fs/open.c
	43	+--- linux-3.18.43.orig/fs/open.c
	44	++++ linux-3.18.43/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.42.orig/fs/proc/version.c
55		-+++ linux-3.18.42/fs/proc/version.c
	54	+--- linux-3.18.43.orig/fs/proc/version.c
	55	++++ linux-3.18.43/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.42 2016/09/20\n");
	63	++ printk(KERN_INFO "Hook version: 3.18.43 2016/10/16\n");
64	64	+ return 0;
65	65	+}
66	66	+fs_initcall(ccs_show_version);
67		---- linux-3.18.42.orig/include/linux/init_task.h
68		-+++ linux-3.18.42/include/linux/init_task.h
	67	+--- linux-3.18.43.orig/include/linux/init_task.h
	68	++++ linux-3.18.43/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.42.orig/include/linux/sched.h
93		-+++ linux-3.18.42/include/linux/sched.h
	92	+--- linux-3.18.43.orig/include/linux/sched.h
	93	++++ linux-3.18.43/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.42.orig/include/linux/security.h
115		-+++ linux-3.18.42/include/linux/security.h
	114	+--- linux-3.18.43.orig/include/linux/security.h
	115	++++ linux-3.18.43/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.42.orig/include/net/ip.h
328		-+++ linux-3.18.42/include/net/ip.h
	327	+--- linux-3.18.43.orig/include/net/ip.h
	328	++++ linux-3.18.43/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.42.orig/kernel/fork.c
348		-+++ linux-3.18.42/kernel/fork.c
	347	+--- linux-3.18.43.orig/kernel/fork.c
	348	++++ linux-3.18.43/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.42.orig/kernel/kexec.c
376		-+++ linux-3.18.42/kernel/kexec.c
	375	+--- linux-3.18.43.orig/kernel/kexec.c
	376	++++ linux-3.18.43/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.42.orig/kernel/module.c
395		-+++ linux-3.18.42/kernel/module.c
	394	+--- linux-3.18.43.orig/kernel/module.c
	395	++++ linux-3.18.43/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.42.orig/kernel/ptrace.c
423		-+++ linux-3.18.42/kernel/ptrace.c
	422	+--- linux-3.18.43.orig/kernel/ptrace.c
	423	++++ linux-3.18.43/kernel/ptrace.c
424	424	@@ -1075,6 +1075,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.42.orig/kernel/reboot.c
449		-+++ linux-3.18.42/kernel/reboot.c
	448	+--- linux-3.18.43.orig/kernel/reboot.c
	449	++++ linux-3.18.43/kernel/reboot.c
450	450	@@ -16,6 +16,7 @@
451	451	#include <linux/syscalls.h>
452	452	#include <linux/syscore_ops.h>

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

		@@ -475,8 +475,8 @@
475	475
476	476	/*
477	477	* Setpriority might change our priority at the same moment.
478		---- linux-3.18.42.orig/kernel/signal.c
479		-+++ linux-3.18.42/kernel/signal.c
	478	+--- linux-3.18.43.orig/kernel/signal.c
	479	++++ linux-3.18.43/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.42.orig/kernel/sys.c
526		-+++ linux-3.18.42/kernel/sys.c
	525	+--- linux-3.18.43.orig/kernel/sys.c
	526	++++ linux-3.18.43/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.42.orig/kernel/time/ntp.c
557		-+++ linux-3.18.42/kernel/time/ntp.c
	556	+--- linux-3.18.43.orig/kernel/time/ntp.c
	557	++++ linux-3.18.43/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.42.orig/net/ipv4/raw.c
592		-+++ linux-3.18.42/net/ipv4/raw.c
	591	+--- linux-3.18.43.orig/net/ipv4/raw.c
	592	++++ linux-3.18.43/net/ipv4/raw.c
593	593	@@ -711,6 +711,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.42.orig/net/ipv4/udp.c
605		-+++ linux-3.18.42/net/ipv4/udp.c
	604	+--- linux-3.18.43.orig/net/ipv4/udp.c
	605	++++ linux-3.18.43/net/ipv4/udp.c
606	606	@@ -1262,6 +1262,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.42.orig/net/ipv6/raw.c
618		-+++ linux-3.18.42/net/ipv6/raw.c
	617	+--- linux-3.18.43.orig/net/ipv6/raw.c
	618	++++ linux-3.18.43/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.42.orig/net/ipv6/udp.c
631		-+++ linux-3.18.42/net/ipv6/udp.c
	630	+--- linux-3.18.43.orig/net/ipv6/udp.c
	631	++++ linux-3.18.43/net/ipv6/udp.c
632	632	@@ -402,6 +402,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.42.orig/net/socket.c
644		-+++ linux-3.18.42/net/socket.c
	643	+--- linux-3.18.43.orig/net/socket.c
	644	++++ linux-3.18.43/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.42.orig/net/unix/af_unix.c
657		-+++ linux-3.18.42/net/unix/af_unix.c
	656	+--- linux-3.18.43.orig/net/unix/af_unix.c
	657	++++ linux-3.18.43/net/unix/af_unix.c
658	658	@@ -1990,6 +1990,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.42.orig/security/Kconfig
670		-+++ linux-3.18.42/security/Kconfig
	669	+--- linux-3.18.43.orig/security/Kconfig
	670	++++ linux-3.18.43/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.42.orig/security/Makefile
680		-+++ linux-3.18.42/security/Makefile
	679	+--- linux-3.18.43.orig/security/Makefile
	680	++++ linux-3.18.43/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.42.orig/security/security.c
689		-+++ linux-3.18.42/security/security.c
	688	+--- linux-3.18.43.orig/security/security.c
	689	++++ linux-3.18.43/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/caitsith-patch/patches/ccs-patch-3.2-ubuntu-12.04.diff (revision 217)

+++ trunk/caitsith-patch/patches/ccs-patch-3.2-ubuntu-12.04.diff (revision 218)

		@@ -28,8 +28,8 @@
28	28	security/security.c \| 132 +++++++++++++++++++++++++++++++++++++---------
29	29	24 files changed, 245 insertions(+), 49 deletions(-)
30	30
31		---- linux-3.2.0-110.151.orig/fs/exec.c
32		-+++ linux-3.2.0-110.151/fs/exec.c
	31	+--- linux-3.2.0-111.153.orig/fs/exec.c
	32	++++ linux-3.2.0-111.153/fs/exec.c
33	33	@@ -1582,7 +1582,7 @@ static int do_execve_common(const char *
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.2.0-110.151.orig/fs/open.c
43		-+++ linux-3.2.0-110.151/fs/open.c
	42	+--- linux-3.2.0-111.153.orig/fs/open.c
	43	++++ linux-3.2.0-111.153/fs/open.c
44	44	@@ -1129,6 +1129,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.2.0-110.151.orig/fs/proc/version.c
54		-+++ linux-3.2.0-110.151/fs/proc/version.c
	53	+--- linux-3.2.0-111.153.orig/fs/proc/version.c
	54	++++ linux-3.2.0-111.153/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.2.0-110.151 2016/09/23\n");
	62	++ printk(KERN_INFO "Hook version: 3.2.0-111.153 2016/10/16\n");
63	63	+ return 0;
64	64	+}
65	65	+module_init(ccs_show_version);
66		---- linux-3.2.0-110.151.orig/include/linux/init_task.h
67		-+++ linux-3.2.0-110.151/include/linux/init_task.h
	66	+--- linux-3.2.0-111.153.orig/include/linux/init_task.h
	67	++++ linux-3.2.0-111.153/include/linux/init_task.h
68	68	@@ -144,6 +144,14 @@ extern struct task_group root_task_group
69	69
70	70	#define INIT_TASK_COMM "swapper"

		@@ -88,8 +88,8 @@
88	88	}
89	89
90	90
91		---- linux-3.2.0-110.151.orig/include/linux/sched.h
92		-+++ linux-3.2.0-110.151/include/linux/sched.h
	91	+--- linux-3.2.0-111.153.orig/include/linux/sched.h
	92	++++ linux-3.2.0-111.153/include/linux/sched.h
93	93	@@ -44,6 +44,8 @@
94	94
95	95	#ifdef __KERNEL__

		@@ -110,8 +110,8 @@
110	110	};
111	111
112	112	/* Future-safe accessor for struct task_struct's cpus_allowed. */
113		---- linux-3.2.0-110.151.orig/include/linux/security.h
114		-+++ linux-3.2.0-110.151/include/linux/security.h
	113	+--- linux-3.2.0-111.153.orig/include/linux/security.h
	114	++++ linux-3.2.0-111.153/include/linux/security.h
115	115	@@ -38,6 +38,7 @@
116	116	#include <linux/slab.h>
117	117	#include <linux/xattr.h>

		@@ -308,8 +308,8 @@
308	308	}
309	309	#endif /* CONFIG_SECURITY_PATH */
310	310
311		---- linux-3.2.0-110.151.orig/include/net/ip.h
312		-+++ linux-3.2.0-110.151/include/net/ip.h
	311	+--- linux-3.2.0-111.153.orig/include/net/ip.h
	312	++++ linux-3.2.0-111.153/include/net/ip.h
313	313	@@ -218,6 +218,8 @@ extern void inet_get_local_port_range(in
314	314	extern unsigned long *sysctl_local_reserved_ports;
315	315	static inline int inet_is_reserved_local_port(int port)

		@@ -319,8 +319,8 @@
319	319	return test_bit(port, sysctl_local_reserved_ports);
320	320	}
321	321
322		---- linux-3.2.0-110.151.orig/kernel/fork.c
323		-+++ linux-3.2.0-110.151/kernel/fork.c
	322	+--- linux-3.2.0-111.153.orig/kernel/fork.c
	323	++++ linux-3.2.0-111.153/kernel/fork.c
324	324	@@ -198,6 +198,7 @@ void __put_task_struct(struct task_struc
325	325	delayacct_tsk_free(tsk);
326	326	put_signal_struct(tsk->signal);

		@@ -347,8 +347,8 @@
347	347	bad_fork_cleanup_perf:
348	348	perf_event_free_task(p);
349	349	bad_fork_cleanup_policy:
350		---- linux-3.2.0-110.151.orig/kernel/kexec.c
351		-+++ linux-3.2.0-110.151/kernel/kexec.c
	350	+--- linux-3.2.0-111.153.orig/kernel/kexec.c
	351	++++ linux-3.2.0-111.153/kernel/kexec.c
352	352	@@ -39,6 +39,7 @@
353	353	#include <asm/io.h>
354	354	#include <asm/system.h>

		@@ -366,8 +366,8 @@
366	366
367	367	/* Processes in containers must not be allowed to load a new
368	368	* kernel, even if they have CAP_SYS_BOOT */
369		---- linux-3.2.0-110.151.orig/kernel/module.c
370		-+++ linux-3.2.0-110.151/kernel/module.c
	369	+--- linux-3.2.0-111.153.orig/kernel/module.c
	370	++++ linux-3.2.0-111.153/kernel/module.c
371	371	@@ -58,6 +58,7 @@
372	372	#include <linux/jump_label.h>
373	373	#include <linux/pfn.h>

		@@ -394,8 +394,8 @@
394	394
395	395	/* Do all the hard work */
396	396	mod = load_module(umod, len, uargs);
397		---- linux-3.2.0-110.151.orig/kernel/ptrace.c
398		-+++ linux-3.2.0-110.151/kernel/ptrace.c
	397	+--- linux-3.2.0-111.153.orig/kernel/ptrace.c
	398	++++ linux-3.2.0-111.153/kernel/ptrace.c
399	399	@@ -931,6 +931,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
400	400	{
401	401	struct task_struct *child;

		@@ -420,8 +420,8 @@
420	420
421	421	if (request == PTRACE_TRACEME) {
422	422	ret = ptrace_traceme();
423		---- linux-3.2.0-110.151.orig/kernel/sched.c
424		-+++ linux-3.2.0-110.151/kernel/sched.c
	423	+--- linux-3.2.0-111.153.orig/kernel/sched.c
	424	++++ linux-3.2.0-111.153/kernel/sched.c
425	425	@@ -5317,6 +5317,8 @@ int can_nice(const struct task_struct *p
426	426	SYSCALL_DEFINE1(nice, int, increment)
427	427	{

		@@ -431,8 +431,8 @@
431	431
432	432	/*
433	433	* Setpriority might change our priority at the same moment.
434		---- linux-3.2.0-110.151.orig/kernel/signal.c
435		-+++ linux-3.2.0-110.151/kernel/signal.c
	434	+--- linux-3.2.0-111.153.orig/kernel/signal.c
	435	++++ linux-3.2.0-111.153/kernel/signal.c
436	436	@@ -2755,6 +2755,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
437	437	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
438	438	{

		@@ -478,8 +478,8 @@
478	478
479	479	return do_send_specific(tgid, pid, sig, info);
480	480	}
481		---- linux-3.2.0-110.151.orig/kernel/sys.c
482		-+++ linux-3.2.0-110.151/kernel/sys.c
	481	+--- linux-3.2.0-111.153.orig/kernel/sys.c
	482	++++ linux-3.2.0-111.153/kernel/sys.c
483	483	@@ -180,6 +180,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
484	484
485	485	if (which > PRIO_USER \|\| which < PRIO_PROCESS)

		@@ -518,8 +518,8 @@
518	518
519	519	down_write(&uts_sem);
520	520	errno = -EFAULT;
521		---- linux-3.2.0-110.151.orig/kernel/time/ntp.c
522		-+++ linux-3.2.0-110.151/kernel/time/ntp.c
	521	+--- linux-3.2.0-111.153.orig/kernel/time/ntp.c
	522	++++ linux-3.2.0-111.153/kernel/time/ntp.c
523	523	@@ -15,6 +15,7 @@
524	524	#include <linux/time.h>
525	525	#include <linux/mm.h>

		@@ -553,8 +553,8 @@
553	553	if (!(txc->modes & ADJ_NANO))
554	554	delta.tv_nsec *= 1000;
555	555	result = timekeeping_inject_offset(&delta);
556		---- linux-3.2.0-110.151.orig/net/ipv4/raw.c
557		-+++ linux-3.2.0-110.151/net/ipv4/raw.c
	556	+--- linux-3.2.0-111.153.orig/net/ipv4/raw.c
	557	++++ linux-3.2.0-111.153/net/ipv4/raw.c
558	558	@@ -697,6 +697,10 @@ static int raw_recvmsg(struct kiocb *ioc
559	559	skb = skb_recv_datagram(sk, flags, noblock, &err);
560	560	if (!skb)

		@@ -566,8 +566,8 @@
566	566
567	567	copied = skb->len;
568	568	if (len < copied) {
569		---- linux-3.2.0-110.151.orig/net/ipv4/udp.c
570		-+++ linux-3.2.0-110.151/net/ipv4/udp.c
	569	+--- linux-3.2.0-111.153.orig/net/ipv4/udp.c
	570	++++ linux-3.2.0-111.153/net/ipv4/udp.c
571	571	@@ -1183,6 +1183,10 @@ try_again:
572	572	&peeked, &err);
573	573	if (!skb)

		@@ -579,8 +579,8 @@
579	579
580	580	ulen = skb->len - sizeof(struct udphdr);
581	581	copied = len;
582		---- linux-3.2.0-110.151.orig/net/ipv6/raw.c
583		-+++ linux-3.2.0-110.151/net/ipv6/raw.c
	582	+--- linux-3.2.0-111.153.orig/net/ipv6/raw.c
	583	++++ linux-3.2.0-111.153/net/ipv6/raw.c
584	584	@@ -465,6 +465,10 @@ static int rawv6_recvmsg(struct kiocb *i
585	585	skb = skb_recv_datagram(sk, flags, noblock, &err);
586	586	if (!skb)

		@@ -592,8 +592,8 @@
592	592
593	593	copied = skb->len;
594	594	if (copied > len) {
595		---- linux-3.2.0-110.151.orig/net/ipv6/udp.c
596		-+++ linux-3.2.0-110.151/net/ipv6/udp.c
	595	+--- linux-3.2.0-111.153.orig/net/ipv6/udp.c
	596	++++ linux-3.2.0-111.153/net/ipv6/udp.c
597	597	@@ -359,6 +359,10 @@ try_again:
598	598	&peeked, &err);
599	599	if (!skb)

		@@ -605,8 +605,8 @@
605	605
606	606	ulen = skb->len - sizeof(struct udphdr);
607	607	copied = len;
608		---- linux-3.2.0-110.151.orig/net/socket.c
609		-+++ linux-3.2.0-110.151/net/socket.c
	608	+--- linux-3.2.0-111.153.orig/net/socket.c
	609	++++ linux-3.2.0-111.153/net/socket.c
610	610	@@ -1531,6 +1531,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
611	611	if (err < 0)
612	612	goto out_fd;

		@@ -618,8 +618,8 @@
618	618	if (upeer_sockaddr) {
619	619	if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
620	620	&len, 2) < 0) {
621		---- linux-3.2.0-110.151.orig/net/unix/af_unix.c
622		-+++ linux-3.2.0-110.151/net/unix/af_unix.c
	621	+--- linux-3.2.0-111.153.orig/net/unix/af_unix.c
	622	++++ linux-3.2.0-111.153/net/unix/af_unix.c
623	623	@@ -1957,6 +1957,10 @@ static int unix_dgram_recvmsg(struct kio
624	624	wake_up_interruptible_sync_poll(&u->peer_wait,
625	625	POLLOUT \| POLLWRNORM \| POLLWRBAND);

		@@ -631,8 +631,8 @@
631	631	if (msg->msg_name)
632	632	unix_copy_addr(msg, skb->sk);
633	633
634		---- linux-3.2.0-110.151.orig/security/Kconfig
635		-+++ linux-3.2.0-110.151/security/Kconfig
	634	+--- linux-3.2.0-111.153.orig/security/Kconfig
	635	++++ linux-3.2.0-111.153/security/Kconfig
636	636	@@ -233,5 +233,7 @@ config DEFAULT_SECURITY
637	637	default "yama" if DEFAULT_SECURITY_YAMA
638	638	default "" if DEFAULT_SECURITY_DAC

		@@ -641,8 +641,8 @@
641	641	+
642	642	endmenu
643	643
644		---- linux-3.2.0-110.151.orig/security/Makefile
645		-+++ linux-3.2.0-110.151/security/Makefile
	644	+--- linux-3.2.0-111.153.orig/security/Makefile
	645	++++ linux-3.2.0-111.153/security/Makefile
646	646	@@ -28,3 +28,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
647	647	# Object integrity file lists
648	648	subdir-$(CONFIG_INTEGRITY) += integrity

		@@ -650,8 +650,8 @@
650	650	+
651	651	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
652	652	+obj-$(CONFIG_CCSECURITY) += ccsecurity/built-in.o
653		---- linux-3.2.0-110.151.orig/security/security.c
654		-+++ linux-3.2.0-110.151/security/security.c
	653	+--- linux-3.2.0-111.153.orig/security/security.c
	654	++++ linux-3.2.0-111.153/security/security.c
655	655	@@ -206,7 +206,10 @@ int security_syslog(int type)
656	656
657	657	int security_settime(const struct timespec ts, const struct timezone tz)

--- trunk/caitsith-patch/patches/ccs-patch-4.1.diff (revision 217)

+++ trunk/caitsith-patch/patches/ccs-patch-4.1.diff (revision 218)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 4.1.33.
	1	+This is TOMOYO Linux patch for kernel 4.1.34.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.33.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.34.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 \| 110 ++++++++++++++++++++++++++++++++++++++++------
30	30	25 files changed, 248 insertions(+), 37 deletions(-)
31	31
32		---- linux-4.1.33.orig/fs/exec.c
33		-+++ linux-4.1.33/fs/exec.c
	32	+--- linux-4.1.34.orig/fs/exec.c
	33	++++ linux-4.1.34/fs/exec.c
34	34	@@ -1461,7 +1461,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-4.1.33.orig/fs/open.c
44		-+++ linux-4.1.33/fs/open.c
	43	+--- linux-4.1.34.orig/fs/open.c
	44	++++ linux-4.1.34/fs/open.c
45	45	@@ -1107,6 +1107,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-4.1.33.orig/fs/proc/version.c
55		-+++ linux-4.1.33/fs/proc/version.c
	54	+--- linux-4.1.34.orig/fs/proc/version.c
	55	++++ linux-4.1.34/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: 4.1.33 2016/09/20\n");
	63	++ printk(KERN_INFO "Hook version: 4.1.34 2016/10/16\n");
64	64	+ return 0;
65	65	+}
66	66	+fs_initcall(ccs_show_version);
67		---- linux-4.1.33.orig/include/linux/init_task.h
68		-+++ linux-4.1.33/include/linux/init_task.h
	67	+--- linux-4.1.34.orig/include/linux/init_task.h
	68	++++ linux-4.1.34/include/linux/init_task.h
69	69	@@ -182,6 +182,14 @@ extern struct task_group root_task_group
70	70	# define INIT_KASAN(tsk)
71	71	#endif

		@@ -89,8 +89,8 @@
89	89	}
90	90
91	91
92		---- linux-4.1.33.orig/include/linux/sched.h
93		-+++ linux-4.1.33/include/linux/sched.h
	92	+--- linux-4.1.34.orig/include/linux/sched.h
	93	++++ linux-4.1.34/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-4.1.33.orig/include/linux/security.h
115		-+++ linux-4.1.33/include/linux/security.h
	114	+--- linux-4.1.34.orig/include/linux/security.h
	115	++++ linux-4.1.34/include/linux/security.h
116	116	@@ -53,6 +53,7 @@ struct msg_queue;
117	117	struct xattr;
118	118	struct xfrm_sec_ctx;

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

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

		@@ -367,8 +367,8 @@
367	367	bad_fork_cleanup_perf:
368	368	perf_event_free_task(p);
369	369	bad_fork_cleanup_policy:
370		---- linux-4.1.33.orig/kernel/kexec.c
371		-+++ linux-4.1.33/kernel/kexec.c
	370	+--- linux-4.1.34.orig/kernel/kexec.c
	371	++++ linux-4.1.34/kernel/kexec.c
372	372	@@ -41,6 +41,7 @@
373	373	#include <asm/uaccess.h>
374	374	#include <asm/io.h>

		@@ -386,8 +386,8 @@
386	386
387	387	/*
388	388	* Verify we have a legal set of flags
389		---- linux-4.1.33.orig/kernel/module.c
390		-+++ linux-4.1.33/kernel/module.c
	389	+--- linux-4.1.34.orig/kernel/module.c
	390	++++ linux-4.1.34/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.1.33.orig/kernel/ptrace.c
418		-+++ linux-4.1.33/kernel/ptrace.c
	417	+--- linux-4.1.34.orig/kernel/ptrace.c
	418	++++ linux-4.1.34/kernel/ptrace.c
419	419	@@ -1057,6 +1057,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.1.33.orig/kernel/reboot.c
444		-+++ linux-4.1.33/kernel/reboot.c
	443	+--- linux-4.1.34.orig/kernel/reboot.c
	444	++++ linux-4.1.34/kernel/reboot.c
445	445	@@ -16,6 +16,7 @@
446	446	#include <linux/syscalls.h>
447	447	#include <linux/syscore_ops.h>

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

		@@ -470,8 +470,8 @@
470	470
471	471	/*
472	472	* Setpriority might change our priority at the same moment.
473		---- linux-4.1.33.orig/kernel/signal.c
474		-+++ linux-4.1.33/kernel/signal.c
	473	+--- linux-4.1.34.orig/kernel/signal.c
	474	++++ linux-4.1.34/kernel/signal.c
475	475	@@ -2901,6 +2901,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.1.33.orig/kernel/sys.c
521		-+++ linux-4.1.33/kernel/sys.c
	520	+--- linux-4.1.34.orig/kernel/sys.c
	521	++++ linux-4.1.34/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.1.33.orig/kernel/time/ntp.c
552		-+++ linux-4.1.33/kernel/time/ntp.c
	551	+--- linux-4.1.34.orig/kernel/time/ntp.c
	552	++++ linux-4.1.34/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	/*
585	585	* Check for potential multiplication overflows that can
586		---- linux-4.1.33.orig/net/ipv4/raw.c
587		-+++ linux-4.1.33/net/ipv4/raw.c
	586	+--- linux-4.1.34.orig/net/ipv4/raw.c
	587	++++ linux-4.1.34/net/ipv4/raw.c
588	588	@@ -729,6 +729,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.1.33.orig/net/ipv4/udp.c
600		-+++ linux-4.1.33/net/ipv4/udp.c
	599	+--- linux-4.1.34.orig/net/ipv4/udp.c
	600	++++ linux-4.1.34/net/ipv4/udp.c
601	601	@@ -1274,6 +1274,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.1.33.orig/net/ipv6/raw.c
613		-+++ linux-4.1.33/net/ipv6/raw.c
	612	+--- linux-4.1.34.orig/net/ipv6/raw.c
	613	++++ linux-4.1.34/net/ipv6/raw.c
614	614	@@ -477,6 +477,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.1.33.orig/net/ipv6/udp.c
626		-+++ linux-4.1.33/net/ipv6/udp.c
	625	+--- linux-4.1.34.orig/net/ipv6/udp.c
	626	++++ linux-4.1.34/net/ipv6/udp.c
627	627	@@ -413,6 +413,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.1.33.orig/net/socket.c
639		-+++ linux-4.1.33/net/socket.c
	638	+--- linux-4.1.34.orig/net/socket.c
	639	++++ linux-4.1.34/net/socket.c
640	640	@@ -1485,6 +1485,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.1.33.orig/net/unix/af_unix.c
652		-+++ linux-4.1.33/net/unix/af_unix.c
	651	+--- linux-4.1.34.orig/net/unix/af_unix.c
	652	++++ linux-4.1.34/net/unix/af_unix.c
653	653	@@ -1978,6 +1978,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.1.33.orig/security/Kconfig
665		-+++ linux-4.1.33/security/Kconfig
	664	+--- linux-4.1.34.orig/security/Kconfig
	665	++++ linux-4.1.34/security/Kconfig
666	666	@@ -168,5 +168,7 @@ config DEFAULT_SECURITY
667	667	default "yama" if DEFAULT_SECURITY_YAMA
668	668	default "" if DEFAULT_SECURITY_DAC

		@@ -671,8 +671,8 @@
671	671	+
672	672	endmenu
673	673
674		---- linux-4.1.33.orig/security/Makefile
675		-+++ linux-4.1.33/security/Makefile
	674	+--- linux-4.1.34.orig/security/Makefile
	675	++++ linux-4.1.34/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

		@@ -680,8 +680,8 @@
680	680	+
681	681	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
682	682	+obj-$(CONFIG_CCSECURITY) += ccsecurity/
683		---- linux-4.1.33.orig/security/security.c
684		-+++ linux-4.1.33/security/security.c
	683	+--- linux-4.1.34.orig/security/security.c
	684	++++ linux-4.1.34/security/security.c
685	685	@@ -226,7 +226,10 @@ int security_syslog(int type)
686	686
687	687	int security_settime(const struct timespec ts, const struct timezone tz)

--- trunk/caitsith-patch/patches/ccs-patch-4.4.diff (revision 217)

+++ trunk/caitsith-patch/patches/ccs-patch-4.4.diff (revision 218)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 4.4.22.
	1	+This is TOMOYO Linux patch for kernel 4.4.24.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.22.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.24.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.23.orig/fs/exec.c
32		-+++ linux-4.4.23/fs/exec.c
	31	+--- linux-4.4.24.orig/fs/exec.c
	32	++++ linux-4.4.24/fs/exec.c
33	33	@@ -1467,7 +1467,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.23.orig/fs/open.c
43		-+++ linux-4.4.23/fs/open.c
	42	+--- linux-4.4.24.orig/fs/open.c
	43	++++ linux-4.4.24/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.23.orig/fs/proc/version.c
54		-+++ linux-4.4.23/fs/proc/version.c
	53	+--- linux-4.4.24.orig/fs/proc/version.c
	54	++++ linux-4.4.24/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.23 2016/10/01\n");
	62	++ printk(KERN_INFO "Hook version: 4.4.24 2016/10/16\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-4.4.23.orig/include/linux/init_task.h
67		-+++ linux-4.4.23/include/linux/init_task.h
	66	+--- linux-4.4.24.orig/include/linux/init_task.h
	67	++++ linux-4.4.24/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.23.orig/include/linux/sched.h
92		-+++ linux-4.4.23/include/linux/sched.h
	91	+--- linux-4.4.24.orig/include/linux/sched.h
	92	++++ linux-4.4.24/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.23.orig/include/linux/security.h
114		-+++ linux-4.4.23/include/linux/security.h
	113	+--- linux-4.4.24.orig/include/linux/security.h
	114	++++ linux-4.4.24/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.23.orig/include/net/ip.h
322		-+++ linux-4.4.23/include/net/ip.h
	321	+--- linux-4.4.24.orig/include/net/ip.h
	322	++++ linux-4.4.24/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.23.orig/kernel/fork.c
342		-+++ linux-4.4.23/kernel/fork.c
	341	+--- linux-4.4.24.orig/kernel/fork.c
	342	++++ linux-4.4.24/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);

		@@ -348,7 +348,7 @@
348	348	if (!profile_handoff_task(tsk))
349	349	free_task(tsk);
350	350	}
351		-@@ -1451,6 +1452,9 @@ static struct task_struct *copy_process(
	351	+@@ -1449,6 +1450,9 @@ static struct task_struct *copy_process(
352	352	goto bad_fork_cleanup_perf;
353	353	/* copy all the process information */
354	354	shm_init_task(p);

		@@ -358,7 +358,7 @@
358	358	retval = copy_semundo(clone_flags, p);
359	359	if (retval)
360	360	goto bad_fork_cleanup_audit;
361		-@@ -1668,6 +1672,7 @@ bad_fork_cleanup_semundo:
	361	+@@ -1666,6 +1670,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.23.orig/kernel/kexec.c
370		-+++ linux-4.4.23/kernel/kexec.c
	369	+--- linux-4.4.24.orig/kernel/kexec.c
	370	++++ linux-4.4.24/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.23.orig/kernel/module.c
390		-+++ linux-4.4.23/kernel/module.c
	389	+--- linux-4.4.24.orig/kernel/module.c
	390	++++ linux-4.4.24/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.23.orig/kernel/ptrace.c
418		-+++ linux-4.4.23/kernel/ptrace.c
	417	+--- linux-4.4.24.orig/kernel/ptrace.c
	418	++++ linux-4.4.24/kernel/ptrace.c
419	419	@@ -1075,6 +1075,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.23.orig/kernel/reboot.c
444		-+++ linux-4.4.23/kernel/reboot.c
	443	+--- linux-4.4.24.orig/kernel/reboot.c
	444	++++ linux-4.4.24/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.23.orig/kernel/sched/core.c
463		-+++ linux-4.4.23/kernel/sched/core.c
	462	+--- linux-4.4.24.orig/kernel/sched/core.c
	463	++++ linux-4.4.24/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.23.orig/kernel/signal.c
474		-+++ linux-4.4.23/kernel/signal.c
	473	+--- linux-4.4.24.orig/kernel/signal.c
	474	++++ linux-4.4.24/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.23.orig/kernel/sys.c
521		-+++ linux-4.4.23/kernel/sys.c
	520	+--- linux-4.4.24.orig/kernel/sys.c
	521	++++ linux-4.4.24/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.23.orig/kernel/time/ntp.c
552		-+++ linux-4.4.23/kernel/time/ntp.c
	551	+--- linux-4.4.24.orig/kernel/time/ntp.c
	552	++++ linux-4.4.24/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.23.orig/net/ipv4/raw.c
587		-+++ linux-4.4.23/net/ipv4/raw.c
	586	+--- linux-4.4.24.orig/net/ipv4/raw.c
	587	++++ linux-4.4.24/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.4.23.orig/net/ipv4/udp.c
600		-+++ linux-4.4.23/net/ipv4/udp.c
	599	+--- linux-4.4.24.orig/net/ipv4/udp.c
	600	++++ linux-4.4.24/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.23.orig/net/ipv6/raw.c
613		-+++ linux-4.4.23/net/ipv6/raw.c
	612	+--- linux-4.4.24.orig/net/ipv6/raw.c
	613	++++ linux-4.4.24/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.23.orig/net/ipv6/udp.c
626		-+++ linux-4.4.23/net/ipv6/udp.c
	625	+--- linux-4.4.24.orig/net/ipv6/udp.c
	626	++++ linux-4.4.24/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.23.orig/net/socket.c
639		-+++ linux-4.4.23/net/socket.c
	638	+--- linux-4.4.24.orig/net/socket.c
	639	++++ linux-4.4.24/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.23.orig/net/unix/af_unix.c
652		-+++ linux-4.4.23/net/unix/af_unix.c
	651	+--- linux-4.4.24.orig/net/unix/af_unix.c
	652	++++ linux-4.4.24/net/unix/af_unix.c
653	653	@@ -2134,6 +2134,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.23.orig/security/Kconfig
665		-+++ linux-4.4.23/security/Kconfig
	664	+--- linux-4.4.24.orig/security/Kconfig
	665	++++ linux-4.4.24/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.23.orig/security/Makefile
675		-+++ linux-4.4.23/security/Makefile
	674	+--- linux-4.4.24.orig/security/Makefile
	675	++++ linux-4.4.24/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/caitsith-patch/patches/ccs-patch-4.7.diff (revision 217)

+++ trunk/caitsith-patch/patches/ccs-patch-4.7.diff (revision 218)

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

		@@ -348,7 +348,7 @@
348	348	if (!profile_handoff_task(tsk))
349	349	free_task(tsk);
350	350	}
351		-@@ -1488,6 +1489,9 @@ static struct task_struct *copy_process(
	351	+@@ -1486,6 +1487,9 @@ static struct task_struct *copy_process(
352	352	goto bad_fork_cleanup_perf;
353	353	/* copy all the process information */
354	354	shm_init_task(p);

		@@ -358,7 +358,7 @@
358	358	retval = copy_semundo(clone_flags, p);
359	359	if (retval)
360	360	goto bad_fork_cleanup_audit;
361		-@@ -1707,6 +1711,7 @@ bad_fork_cleanup_semundo:
	361	+@@ -1705,6 +1709,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.7.6.orig/kernel/kexec.c
370		-+++ linux-4.7.6/kernel/kexec.c
	369	+--- linux-4.7.7.orig/kernel/kexec.c
	370	++++ linux-4.7.7/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.7.6.orig/kernel/module.c
390		-+++ linux-4.7.6/kernel/module.c
	389	+--- linux-4.7.7.orig/kernel/module.c
	390	++++ linux-4.7.7/kernel/module.c
391	391	@@ -62,6 +62,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.7.6.orig/kernel/ptrace.c
418		-+++ linux-4.7.6/kernel/ptrace.c
	417	+--- linux-4.7.7.orig/kernel/ptrace.c
	418	++++ linux-4.7.7/kernel/ptrace.c
419	419	@@ -1080,6 +1080,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.7.6.orig/kernel/reboot.c
444		-+++ linux-4.7.6/kernel/reboot.c
	443	+--- linux-4.7.7.orig/kernel/reboot.c
	444	++++ linux-4.7.7/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.7.6.orig/kernel/sched/core.c
463		-+++ linux-4.7.6/kernel/sched/core.c
	462	+--- linux-4.7.7.orig/kernel/sched/core.c
	463	++++ linux-4.7.7/kernel/sched/core.c
464	464	@@ -3746,6 +3746,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.7.6.orig/kernel/signal.c
474		-+++ linux-4.7.6/kernel/signal.c
	473	+--- linux-4.7.7.orig/kernel/signal.c
	474	++++ linux-4.7.7/kernel/signal.c
475	475	@@ -2851,6 +2851,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.7.6.orig/kernel/sys.c
521		-+++ linux-4.7.6/kernel/sys.c
	520	+--- linux-4.7.7.orig/kernel/sys.c
	521	++++ linux-4.7.7/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.7.6.orig/kernel/time/ntp.c
552		-+++ linux-4.7.6/kernel/time/ntp.c
	551	+--- linux-4.7.7.orig/kernel/time/ntp.c
	552	++++ linux-4.7.7/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.7.6.orig/net/ipv4/raw.c
587		-+++ linux-4.7.6/net/ipv4/raw.c
	586	+--- linux-4.7.7.orig/net/ipv4/raw.c
	587	++++ linux-4.7.7/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.7.6.orig/net/ipv4/udp.c
600		-+++ linux-4.7.6/net/ipv4/udp.c
	599	+--- linux-4.7.7.orig/net/ipv4/udp.c
	600	++++ linux-4.7.7/net/ipv4/udp.c
601	601	@@ -1272,6 +1272,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.7.6.orig/net/ipv6/raw.c
611		-+++ linux-4.7.6/net/ipv6/raw.c
	610	+--- linux-4.7.7.orig/net/ipv6/raw.c
	611	++++ linux-4.7.7/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.7.6.orig/net/ipv6/udp.c
624		-+++ linux-4.7.6/net/ipv6/udp.c
	623	+--- linux-4.7.7.orig/net/ipv6/udp.c
	624	++++ linux-4.7.7/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.7.6.orig/net/socket.c
635		-+++ linux-4.7.6/net/socket.c
	634	+--- linux-4.7.7.orig/net/socket.c
	635	++++ linux-4.7.7/net/socket.c
636	636	@@ -1469,6 +1469,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.7.6.orig/net/unix/af_unix.c
648		-+++ linux-4.7.6/net/unix/af_unix.c
	647	+--- linux-4.7.7.orig/net/unix/af_unix.c
	648	++++ linux-4.7.7/net/unix/af_unix.c
649	649	@@ -2139,6 +2139,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.7.6.orig/security/Kconfig
669		-+++ linux-4.7.6/security/Kconfig
	668	+--- linux-4.7.7.orig/security/Kconfig
	669	++++ linux-4.7.7/security/Kconfig
670	670	@@ -164,5 +164,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.7.6.orig/security/Makefile
679		-+++ linux-4.7.6/security/Makefile
	678	+--- linux-4.7.7.orig/security/Makefile
	679	++++ linux-4.7.7/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/caitsith-patch/patches/ccs-patch-4.8.diff (revision 217)

+++ trunk/caitsith-patch/patches/ccs-patch-4.8.diff (revision 218)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 4.8.
	1	+This is TOMOYO Linux patch for kernel 4.8.1.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.8.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.8.1.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.8.orig/fs/exec.c
32		-+++ linux-4.8/fs/exec.c
	31	+--- linux-4.8.1.orig/fs/exec.c
	32	++++ linux-4.8.1/fs/exec.c
33	33	@@ -1616,7 +1616,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.8.orig/fs/open.c
43		-+++ linux-4.8/fs/open.c
	42	+--- linux-4.8.1.orig/fs/open.c
	43	++++ linux-4.8.1/fs/open.c
44	44	@@ -1128,6 +1128,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.8.orig/fs/proc/version.c
54		-+++ linux-4.8/fs/proc/version.c
	53	+--- linux-4.8.1.orig/fs/proc/version.c
	54	++++ linux-4.8.1/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.8 2016/10/03\n");
	62	++ printk(KERN_INFO "Hook version: 4.8.1 2016/10/16\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-4.8.orig/include/linux/init_task.h
67		-+++ linux-4.8/include/linux/init_task.h
	66	+--- linux-4.8.1.orig/include/linux/init_task.h
	67	++++ linux-4.8.1/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.8.orig/include/linux/sched.h
92		-+++ linux-4.8/include/linux/sched.h
	91	+--- linux-4.8.1.orig/include/linux/sched.h
	92	++++ linux-4.8.1/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.8.orig/include/linux/security.h
114		-+++ linux-4.8/include/linux/security.h
	113	+--- linux-4.8.1.orig/include/linux/security.h
	114	++++ linux-4.8.1/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.8.orig/include/net/ip.h
322		-+++ linux-4.8/include/net/ip.h
	321	+--- linux-4.8.1.orig/include/net/ip.h
	322	++++ linux-4.8.1/include/net/ip.h
323	323	@@ -224,6 +224,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.8.orig/kernel/fork.c
342		-+++ linux-4.8/kernel/fork.c
	341	+--- linux-4.8.1.orig/kernel/fork.c
	342	++++ linux-4.8.1/kernel/fork.c
343	343	@@ -265,6 +265,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.8.orig/kernel/kexec.c
370		-+++ linux-4.8/kernel/kexec.c
	369	+--- linux-4.8.1.orig/kernel/kexec.c
	370	++++ linux-4.8.1/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.8.orig/kernel/module.c
390		-+++ linux-4.8/kernel/module.c
	389	+--- linux-4.8.1.orig/kernel/module.c
	390	++++ linux-4.8.1/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.8.orig/kernel/ptrace.c
418		-+++ linux-4.8/kernel/ptrace.c
	417	+--- linux-4.8.1.orig/kernel/ptrace.c
	418	++++ linux-4.8.1/kernel/ptrace.c
419	419	@@ -1080,6 +1080,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.8.orig/kernel/reboot.c
444		-+++ linux-4.8/kernel/reboot.c
	443	+--- linux-4.8.1.orig/kernel/reboot.c
	444	++++ linux-4.8.1/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.8.orig/kernel/sched/core.c
463		-+++ linux-4.8/kernel/sched/core.c
	462	+--- linux-4.8.1.orig/kernel/sched/core.c
	463	++++ linux-4.8.1/kernel/sched/core.c
464	464	@@ -3775,6 +3775,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.8.orig/kernel/signal.c
474		-+++ linux-4.8/kernel/signal.c
	473	+--- linux-4.8.1.orig/kernel/signal.c
	474	++++ linux-4.8.1/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.8.orig/kernel/sys.c
521		-+++ linux-4.8/kernel/sys.c
	520	+--- linux-4.8.1.orig/kernel/sys.c
	521	++++ linux-4.8.1/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.8.orig/kernel/time/ntp.c
552		-+++ linux-4.8/kernel/time/ntp.c
	551	+--- linux-4.8.1.orig/kernel/time/ntp.c
	552	++++ linux-4.8.1/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.8.orig/net/ipv4/raw.c
587		-+++ linux-4.8/net/ipv4/raw.c
	586	+--- linux-4.8.1.orig/net/ipv4/raw.c
	587	++++ linux-4.8.1/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.8.orig/net/ipv4/udp.c
600		-+++ linux-4.8/net/ipv4/udp.c
	599	+--- linux-4.8.1.orig/net/ipv4/udp.c
	600	++++ linux-4.8.1/net/ipv4/udp.c
601	601	@@ -1272,6 +1272,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.8.orig/net/ipv6/raw.c
611		-+++ linux-4.8/net/ipv6/raw.c
	610	+--- linux-4.8.1.orig/net/ipv6/raw.c
	611	++++ linux-4.8.1/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.8.orig/net/ipv6/udp.c
624		-+++ linux-4.8/net/ipv6/udp.c
	623	+--- linux-4.8.1.orig/net/ipv6/udp.c
	624	++++ linux-4.8.1/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.8.orig/net/socket.c
635		-+++ linux-4.8/net/socket.c
	634	+--- linux-4.8.1.orig/net/socket.c
	635	++++ linux-4.8.1/net/socket.c
636	636	@@ -1469,6 +1469,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.8.orig/net/unix/af_unix.c
648		-+++ linux-4.8/net/unix/af_unix.c
	647	+--- linux-4.8.1.orig/net/unix/af_unix.c
	648	++++ linux-4.8.1/net/unix/af_unix.c
649	649	@@ -2140,6 +2140,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.8.orig/security/Kconfig
669		-+++ linux-4.8/security/Kconfig
	668	+--- linux-4.8.1.orig/security/Kconfig
	669	++++ linux-4.8.1/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.8.orig/security/Makefile
679		-+++ linux-4.8/security/Makefile
	678	+--- linux-4.8.1.orig/security/Makefile
	679	++++ linux-4.8.1/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/caitsith-patch/patches/ccs-patch-4.9.diff (revision 217)

+++ trunk/caitsith-patch/patches/ccs-patch-4.9.diff (revision 218)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for linux-next.
	1	+This is TOMOYO Linux patch for kernel 4.9-rc1.
2	2
3		-Source code for this patch is https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/snapshot/linux-next-next-20161003.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/testing/linux-4.9-rc1.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-next.orig/fs/exec.c
32		-+++ linux-next/fs/exec.c
	31	+--- linux-4.9-rc1.orig/fs/exec.c
	32	++++ linux-4.9-rc1/fs/exec.c
33	33	@@ -1616,7 +1616,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,9 +39,9 @@
39	39	if (ret >= 0) {
40	40	audit_bprm(bprm);
41	41	trace_sched_process_exec(current, old_pid, bprm);
42		---- linux-next.orig/fs/open.c
43		-+++ linux-next/fs/open.c
44		-@@ -1140,6 +1140,8 @@ EXPORT_SYMBOL(sys_close);
	42	+--- linux-4.9-rc1.orig/fs/open.c
	43	++++ linux-4.9-rc1/fs/open.c
	44	+@@ -1145,6 +1145,8 @@ EXPORT_SYMBOL(sys_close);
45	45	*/
46	46	SYSCALL_DEFINE0(vhangup)
47	47	{

		@@ -50,8 +50,8 @@
50	50	if (capable(CAP_SYS_TTY_CONFIG)) {
51	51	tty_vhangup_self();
52	52	return 0;
53		---- linux-next.orig/fs/proc/version.c
54		-+++ linux-next/fs/proc/version.c
	53	+--- linux-4.9-rc1.orig/fs/proc/version.c
	54	++++ linux-4.9-rc1/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.8-rc8-next-20161003 2016/10/03\n");
	62	++ printk(KERN_INFO "Hook version: 4.9-rc1 2016/10/16\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-next.orig/include/linux/init_task.h
67		-+++ linux-next/include/linux/init_task.h
	66	+--- linux-4.9-rc1.orig/include/linux/init_task.h
	67	++++ linux-4.9-rc1/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-next.orig/include/linux/sched.h
92		-+++ linux-next/include/linux/sched.h
	91	+--- linux-4.9-rc1.orig/include/linux/sched.h
	92	++++ linux-4.9-rc1/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-next.orig/include/linux/security.h
114		-+++ linux-next/include/linux/security.h
	113	+--- linux-4.9-rc1.orig/include/linux/security.h
	114	++++ linux-4.9-rc1/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-next.orig/include/net/ip.h
322		-+++ linux-next/include/net/ip.h
	321	+--- linux-4.9-rc1.orig/include/net/ip.h
	322	++++ linux-4.9-rc1/include/net/ip.h
323	323	@@ -247,6 +247,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-next.orig/kernel/fork.c
342		-+++ linux-next/kernel/fork.c
	341	+--- linux-4.9-rc1.orig/kernel/fork.c
	342	++++ linux-4.9-rc1/kernel/fork.c
343	343	@@ -387,6 +387,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-next.orig/kernel/kexec.c
370		-+++ linux-next/kernel/kexec.c
	369	+--- linux-4.9-rc1.orig/kernel/kexec.c
	370	++++ linux-4.9-rc1/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-next.orig/kernel/module.c
390		-+++ linux-next/kernel/module.c
	389	+--- linux-4.9-rc1.orig/kernel/module.c
	390	++++ linux-4.9-rc1/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-next.orig/kernel/ptrace.c
418		-+++ linux-next/kernel/ptrace.c
	417	+--- linux-4.9-rc1.orig/kernel/ptrace.c
	418	++++ linux-4.9-rc1/kernel/ptrace.c
419	419	@@ -1081,6 +1081,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-next.orig/kernel/reboot.c
444		-+++ linux-next/kernel/reboot.c
	443	+--- linux-4.9-rc1.orig/kernel/reboot.c
	444	++++ linux-4.9-rc1/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-next.orig/kernel/sched/core.c
463		-+++ linux-next/kernel/sched/core.c
	462	+--- linux-4.9-rc1.orig/kernel/sched/core.c
	463	++++ linux-4.9-rc1/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-next.orig/kernel/signal.c
474		-+++ linux-next/kernel/signal.c
	473	+--- linux-4.9-rc1.orig/kernel/signal.c
	474	++++ linux-4.9-rc1/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-next.orig/kernel/sys.c
521		-+++ linux-next/kernel/sys.c
	520	+--- linux-4.9-rc1.orig/kernel/sys.c
	521	++++ linux-4.9-rc1/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-next.orig/kernel/time/ntp.c
552		-+++ linux-next/kernel/time/ntp.c
	551	+--- linux-4.9-rc1.orig/kernel/time/ntp.c
	552	++++ linux-4.9-rc1/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-next.orig/net/ipv4/raw.c
587		-+++ linux-next/net/ipv4/raw.c
	586	+--- linux-4.9-rc1.orig/net/ipv4/raw.c
	587	++++ linux-4.9-rc1/net/ipv4/raw.c
588	588	@@ -736,6 +736,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-next.orig/net/ipv4/udp.c
600		-+++ linux-next/net/ipv4/udp.c
	599	+--- linux-4.9-rc1.orig/net/ipv4/udp.c
	600	++++ linux-4.9-rc1/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-next.orig/net/ipv6/raw.c
611		-+++ linux-next/net/ipv6/raw.c
	610	+--- linux-4.9-rc1.orig/net/ipv6/raw.c
	611	++++ linux-4.9-rc1/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-next.orig/net/ipv6/udp.c
624		-+++ linux-next/net/ipv6/udp.c
	623	+--- linux-4.9-rc1.orig/net/ipv6/udp.c
	624	++++ linux-4.9-rc1/net/ipv6/udp.c
625	625	@@ -348,6 +348,8 @@ try_again:
626	626	&peeked, &off, &err);
627	627	if (!skb)

		@@ -631,9 +631,9 @@
631	631
632	632	ulen = skb->len;
633	633	copied = len;
634		---- linux-next.orig/net/socket.c
635		-+++ linux-next/net/socket.c
636		-@@ -1469,6 +1469,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
	634	+--- linux-4.9-rc1.orig/net/socket.c
	635	++++ linux-4.9-rc1/net/socket.c
	636	+@@ -1466,6 +1466,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
637	637	if (err < 0)
638	638	goto out_fd;
639	639

		@@ -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-next.orig/net/unix/af_unix.c
648		-+++ linux-next/net/unix/af_unix.c
	647	+--- linux-4.9-rc1.orig/net/unix/af_unix.c
	648	++++ linux-4.9-rc1/net/unix/af_unix.c
649	649	@@ -2140,6 +2140,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-next.orig/security/Kconfig
669		-+++ linux-next/security/Kconfig
	668	+--- linux-4.9-rc1.orig/security/Kconfig
	669	++++ linux-4.9-rc1/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-next.orig/security/Makefile
679		-+++ linux-next/security/Makefile
	678	+--- linux-4.9-rc1.orig/security/Makefile
	679	++++ linux-4.9-rc1/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/caitsith-patch/specs/build-c6-2.6.32.sh (revision 217)

+++ trunk/caitsith-patch/specs/build-c6-2.6.32.sh (revision 218)

		@@ -10,12 +10,12 @@
10	10
11	11	cd /tmp/ \|\| die "Can't chdir to /tmp/ ."
12	12
13		-if [ ! -r kernel-2.6.32-642.4.2.el6.src.rpm ]
	13	+if [ ! -r kernel-2.6.32-642.6.1.el6.src.rpm ]
14	14	then
15		- wget http://vault.centos.org/6.8/updates/Source/SPackages/kernel-2.6.32-642.4.2.el6.src.rpm \|\| die "Can't download source package."
	15	+ wget http://vault.centos.org/6.8/updates/Source/SPackages/kernel-2.6.32-642.6.1.el6.src.rpm \|\| die "Can't download source package."
16	16	fi
17		-LANG=C rpm --checksig kernel-2.6.32-642.4.2.el6.src.rpm \| grep -F ': rsa sha1 (md5) pgp md5 OK' \|\| die "Can't verify signature."
18		-rpm -ivh kernel-2.6.32-642.4.2.el6.src.rpm \|\| die "Can't install source package."
	17	+LANG=C rpm --checksig kernel-2.6.32-642.6.1.el6.src.rpm \| grep -F ': rsa sha1 (md5) pgp md5 OK' \|\| die "Can't verify signature."
	18	+rpm -ivh kernel-2.6.32-642.6.1.el6.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 caitsith-patch-0.2-20161005.tar.gz ]

		@@ -35,7 +35,7 @@
35	35	-# % define buildid .local
36	36	+%define buildid _caitsith_0.2
37	37
38		- %define distro_build 642.4.2
	38	+ %define distro_build 642.6.1
39	39	%define signmodules 1
40	40	@@ -437,7 +437,7 @@
41	41	# Packages that need to be installed before the kernel is, because the %post

--- trunk/caitsith-patch/specs/build-c7-3.10.sh (revision 217)

+++ trunk/caitsith-patch/specs/build-c7-3.10.sh (revision 218)

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

Show on old repository browser