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

CaitSith

R/O
SSH
HTTPS

caitsith: コミット

コミットメタ情報

リビジョン	362 (tree)
日時	2021-12-12 16:48:27
作者	kumaneko

ログメッセージ

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

変更サマリ

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-4.14.diff (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-4.19.diff (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-4.4.diff (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-4.9.diff (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-5.10.diff (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-5.14.diff (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-5.15.diff (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-5.16.diff (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-5.4.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)
modified: trunk/caitsith-patch/specs/build-c8-4.18.sh (diff)
modified: trunk/caitsith-patch/specs/build-debian_wheezy.sh (diff)
modified: trunk/caitsith-patch/specs/build-ubuntu_12.04.sh (diff)
modified: trunk/caitsith-patch/specs/build-ubuntu_14.04.sh (diff)
modified: trunk/caitsith-patch/specs/build-vl6-4.4.sh (diff)

差分

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

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

		@@ -304,12 +304,12 @@
304	304	<p>Run the following commands in order to extract source code of CaitSith:</p>
305	305
306	306	<pre class="command">
307		-# wget -O caitsith-patch-0.2-20210916.tar.gz 'https://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20210916.tar.gz'
308		-# wget -O caitsith-patch-0.2-20210916.tar.gz.asc 'https://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20210916.tar.gz.asc'
	307	+# wget -O caitsith-patch-0.2-20211212.tar.gz 'https://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20211212.tar.gz'
	308	+# wget -O caitsith-patch-0.2-20211212.tar.gz.asc 'https://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20211212.tar.gz.asc'
309	309	# wget https://tomoyo.osdn.jp/kumaneko-key
310	310	# gpg --import kumaneko-key
311		-# gpg caitsith-patch-0.2-20210916.tar.gz.asc
312		-# tar -zxf caitsith-patch-0.2-20210916.tar.gz
	311	+# gpg caitsith-patch-0.2-20211212.tar.gz.asc
	312	+# tar -zxf caitsith-patch-0.2-20211212.tar.gz
313	313	</pre>
314	314
315	315	<hr>

		@@ -641,16 +641,16 @@
641	641	Linux kernel 5.0 and later are supported from the linux-5 tree.</p>
642	642
643	643	<p>Extract the kernel source and go to the extracted directory.<br>
644		-In the operations below, "$VERSION" should be replaced with appropriate kernel version. For example "5.12" if using Linux kernel 5.12.9, "2.6.27" if using Linux kernel 2.6.27.62.<br>
	644	+In the operations below, "$VERSION" should be replaced with appropriate kernel version. For example "5.15" if using Linux kernel 5.15.7, "2.6.27" if using Linux kernel 2.6.27.62.<br>
645	645	Also, there are several patches which can be applied to distributor's latest kernels. For example "3.10-centos-7" if using CentOS 7's latest kernel:</p>
646	646
647	647	<pre class="command">
648		-$ wget -O caitsith-patch-0.2-20210916.tar.gz 'https://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20210916.tar.gz'
649		-$ wget -O caitsith-patch-0.2-20210916.tar.gz.asc 'https://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20210916.tar.gz.asc'
	648	+$ wget -O caitsith-patch-0.2-20211212.tar.gz 'https://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20211212.tar.gz'
	649	+$ wget -O caitsith-patch-0.2-20211212.tar.gz.asc 'https://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20211212.tar.gz.asc'
650	650	$ wget https://tomoyo.osdn.jp/kumaneko-key
651	651	$ gpg --import kumaneko-key
652		-$ gpg caitsith-patch-0.2-20210916.tar.gz.asc
653		-$ tar -zxf caitsith-patch-0.2-20210916.tar.gz
	652	+$ gpg caitsith-patch-0.2-20211212.tar.gz.asc
	653	+$ tar -zxf caitsith-patch-0.2-20211212.tar.gz
654	654	$ sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' -- patches/ccs-patch-*.diff
655	655	$ patch -sp1 < patches/ccs-patch-$VERSION.diff
656	656	</pre>

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

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

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

		@@ -28,8 +28,8 @@
28	28	security/security.c \| 111 +++++++++++++++++++++++++++++++++++++++++-----
29	29	24 files changed, 248 insertions(+), 37 deletions(-)
30	30
31		---- linux-3.10.0-1160.45.1.el7.orig/fs/exec.c
32		-+++ linux-3.10.0-1160.45.1.el7/fs/exec.c
	31	+--- linux-3.10.0-1160.49.1.el7.orig/fs/exec.c
	32	++++ linux-3.10.0-1160.49.1.el7/fs/exec.c
33	33	@@ -1506,7 +1506,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-3.10.0-1160.45.1.el7.orig/fs/open.c
43		-+++ linux-3.10.0-1160.45.1.el7/fs/open.c
	42	+--- linux-3.10.0-1160.49.1.el7.orig/fs/open.c
	43	++++ linux-3.10.0-1160.49.1.el7/fs/open.c
44	44	@@ -1106,6 +1106,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-1160.45.1.el7.orig/fs/proc/version.c
54		-+++ linux-3.10.0-1160.45.1.el7/fs/proc/version.c
	53	+--- linux-3.10.0-1160.49.1.el7.orig/fs/proc/version.c
	54	++++ linux-3.10.0-1160.49.1.el7/fs/proc/version.c
55	55	@@ -32,3 +32,10 @@ static int __init proc_version_init(void
56	56	return 0;
57	57	}

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

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

		@@ -110,8 +110,8 @@
110	110	};
111	111
112	112	/* Future-safe accessor for struct task_struct's cpus_allowed. */
113		---- linux-3.10.0-1160.45.1.el7.orig/include/linux/security.h
114		-+++ linux-3.10.0-1160.45.1.el7/include/linux/security.h
	113	+--- linux-3.10.0-1160.49.1.el7.orig/include/linux/security.h
	114	++++ linux-3.10.0-1160.49.1.el7/include/linux/security.h
115	115	@@ -56,6 +56,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-1160.45.1.el7.orig/include/net/ip.h
327		-+++ linux-3.10.0-1160.45.1.el7/include/net/ip.h
	326	+--- linux-3.10.0-1160.49.1.el7.orig/include/net/ip.h
	327	++++ linux-3.10.0-1160.49.1.el7/include/net/ip.h
328	328	@@ -232,6 +232,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-1160.45.1.el7.orig/kernel/fork.c
338		-+++ linux-3.10.0-1160.45.1.el7/kernel/fork.c
	337	+--- linux-3.10.0-1160.49.1.el7.orig/kernel/fork.c
	338	++++ linux-3.10.0-1160.49.1.el7/kernel/fork.c
339	339	@@ -297,6 +297,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-1160.45.1.el7.orig/kernel/kexec.c
366		-+++ linux-3.10.0-1160.45.1.el7/kernel/kexec.c
	365	+--- linux-3.10.0-1160.49.1.el7.orig/kernel/kexec.c
	366	++++ linux-3.10.0-1160.49.1.el7/kernel/kexec.c
367	367	@@ -190,6 +190,8 @@ SYSCALL_DEFINE4(kexec_load, unsigned lon
368	368	/* We only trust the superuser with rebooting the system. */
369	369	if (!capable(CAP_SYS_BOOT) \|\| kexec_load_disabled)

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

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

		@@ -427,8 +427,8 @@
427	427
428	428	if (request == PTRACE_TRACEME) {
429	429	ret = ptrace_traceme();
430		---- linux-3.10.0-1160.45.1.el7.orig/kernel/sched/core.c
431		-+++ linux-3.10.0-1160.45.1.el7/kernel/sched/core.c
	430	+--- linux-3.10.0-1160.49.1.el7.orig/kernel/sched/core.c
	431	++++ linux-3.10.0-1160.49.1.el7/kernel/sched/core.c
432	432	@@ -4421,6 +4421,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-1160.45.1.el7.orig/kernel/signal.c
442		-+++ linux-3.10.0-1160.45.1.el7/kernel/signal.c
	441	+--- linux-3.10.0-1160.49.1.el7.orig/kernel/signal.c
	442	++++ linux-3.10.0-1160.49.1.el7/kernel/signal.c
443	443	@@ -2942,6 +2942,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-1160.45.1.el7.orig/kernel/sys.c
489		-+++ linux-3.10.0-1160.45.1.el7/kernel/sys.c
	488	+--- linux-3.10.0-1160.49.1.el7.orig/kernel/sys.c
	489	++++ linux-3.10.0-1160.49.1.el7/kernel/sys.c
490	490	@@ -197,6 +197,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-1160.45.1.el7.orig/kernel/time/ntp.c
529		-+++ linux-3.10.0-1160.45.1.el7/kernel/time/ntp.c
	528	+--- linux-3.10.0-1160.49.1.el7.orig/kernel/time/ntp.c
	529	++++ linux-3.10.0-1160.49.1.el7/kernel/time/ntp.c
530	530	@@ -16,6 +16,7 @@
531	531	#include <linux/mm.h>
532	532	#include <linux/module.h>

		@@ -560,8 +560,8 @@
560	560
561	561	return 0;
562	562	}
563		---- linux-3.10.0-1160.45.1.el7.orig/net/ipv4/raw.c
564		-+++ linux-3.10.0-1160.45.1.el7/net/ipv4/raw.c
	563	+--- linux-3.10.0-1160.49.1.el7.orig/net/ipv4/raw.c
	564	++++ linux-3.10.0-1160.49.1.el7/net/ipv4/raw.c
565	565	@@ -710,6 +710,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-1160.45.1.el7.orig/net/ipv4/udp.c
577		-+++ linux-3.10.0-1160.45.1.el7/net/ipv4/udp.c
	576	+--- linux-3.10.0-1160.49.1.el7.orig/net/ipv4/udp.c
	577	++++ linux-3.10.0-1160.49.1.el7/net/ipv4/udp.c
578	578	@@ -1467,6 +1467,10 @@ try_again:
579	579	skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
580	580	if (!skb)

		@@ -586,8 +586,8 @@
586	586
587	587	ulen = skb->len - sizeof(struct udphdr);
588	588	copied = len;
589		---- linux-3.10.0-1160.45.1.el7.orig/net/ipv6/raw.c
590		-+++ linux-3.10.0-1160.45.1.el7/net/ipv6/raw.c
	589	+--- linux-3.10.0-1160.49.1.el7.orig/net/ipv6/raw.c
	590	++++ linux-3.10.0-1160.49.1.el7/net/ipv6/raw.c
591	591	@@ -470,6 +470,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-1160.45.1.el7.orig/net/ipv6/udp.c
603		-+++ linux-3.10.0-1160.45.1.el7/net/ipv6/udp.c
	602	+--- linux-3.10.0-1160.49.1.el7.orig/net/ipv6/udp.c
	603	++++ linux-3.10.0-1160.49.1.el7/net/ipv6/udp.c
604	604	@@ -384,6 +384,10 @@ try_again:
605	605	skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
606	606	if (!skb)

		@@ -612,8 +612,8 @@
612	612
613	613	ulen = skb->len - sizeof(struct udphdr);
614	614	copied = len;
615		---- linux-3.10.0-1160.45.1.el7.orig/net/socket.c
616		-+++ linux-3.10.0-1160.45.1.el7/net/socket.c
	615	+--- linux-3.10.0-1160.49.1.el7.orig/net/socket.c
	616	++++ linux-3.10.0-1160.49.1.el7/net/socket.c
617	617	@@ -1661,6 +1661,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-1160.45.1.el7.orig/net/unix/af_unix.c
629		-+++ linux-3.10.0-1160.45.1.el7/net/unix/af_unix.c
	628	+--- linux-3.10.0-1160.49.1.el7.orig/net/unix/af_unix.c
	629	++++ linux-3.10.0-1160.49.1.el7/net/unix/af_unix.c
630	630	@@ -2138,6 +2138,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-1160.45.1.el7.orig/security/Kconfig
642		-+++ linux-3.10.0-1160.45.1.el7/security/Kconfig
	641	+--- linux-3.10.0-1160.49.1.el7.orig/security/Kconfig
	642	++++ linux-3.10.0-1160.49.1.el7/security/Kconfig
643	643	@@ -226,5 +226,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-1160.45.1.el7.orig/security/Makefile
652		-+++ linux-3.10.0-1160.45.1.el7/security/Makefile
	651	+--- linux-3.10.0-1160.49.1.el7.orig/security/Makefile
	652	++++ linux-3.10.0-1160.49.1.el7/security/Makefile
653	653	@@ -29,3 +29,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
654	654	# Object integrity file lists
655	655	subdir-$(CONFIG_INTEGRITY) += integrity

		@@ -657,8 +657,8 @@
657	657	+
658	658	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
659	659	+obj-$(CONFIG_CCSECURITY) += ccsecurity/built-in.o
660		---- linux-3.10.0-1160.45.1.el7.orig/security/security.c
661		-+++ linux-3.10.0-1160.45.1.el7/security/security.c
	660	+--- linux-3.10.0-1160.49.1.el7.orig/security/security.c
	661	++++ linux-3.10.0-1160.49.1.el7/security/security.c
662	662	@@ -229,7 +229,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-4.14.diff (revision 361)

+++ trunk/caitsith-patch/patches/ccs-patch-4.14.diff (revision 362)

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

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

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

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

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

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

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

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

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

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

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

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

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

		@@ -455,9 +455,9 @@
455	455
456	456	/*
457	457	* Setpriority might change our priority at the same moment.
458		---- linux-4.14.255.orig/kernel/signal.c
459		-+++ linux-4.14.255/kernel/signal.c
460		-@@ -3042,6 +3042,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait,
	458	+--- linux-4.14.257.orig/kernel/signal.c
	459	++++ linux-4.14.257/kernel/signal.c
	460	+@@ -3031,6 +3031,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait,
461	461	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
462	462	{
463	463	struct siginfo info;

		@@ -466,7 +466,7 @@
466	466
467	467	info.si_signo = sig;
468	468	info.si_errno = 0;
469		-@@ -3110,6 +3112,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
	469	+@@ -3099,6 +3101,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
470	470	/* This is only valid for single tasks */
471	471	if (pid <= 0 \|\| tgid <= 0)
472	472	return -EINVAL;

		@@ -475,7 +475,7 @@
475	475
476	476	return do_tkill(tgid, pid, sig);
477	477	}
478		-@@ -3126,6 +3130,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
	478	+@@ -3115,6 +3119,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
479	479	/* This is only valid for single tasks */
480	480	if (pid <= 0)
481	481	return -EINVAL;

		@@ -484,7 +484,7 @@
484	484
485	485	return do_tkill(0, pid, sig);
486	486	}
487		-@@ -3140,6 +3146,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
	487	+@@ -3129,6 +3135,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
488	488	return -EPERM;
489	489
490	490	info->si_signo = sig;

		@@ -493,7 +493,7 @@
493	493
494	494	/* POSIX.1b doesn't mention process groups. */
495	495	return kill_proc_info(sig, info, pid);
496		-@@ -3188,6 +3196,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
	496	+@@ -3177,6 +3185,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
497	497	return -EPERM;
498	498
499	499	info->si_signo = sig;

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

		@@ -533,8 +533,8 @@
533	533
534	534	errno = -EFAULT;
535	535	if (!copy_from_user(tmp, name, len)) {
536		---- linux-4.14.255.orig/kernel/time/ntp.c
537		-+++ linux-4.14.255/kernel/time/ntp.c
	536	+--- linux-4.14.257.orig/kernel/time/ntp.c
	537	++++ linux-4.14.257/kernel/time/ntp.c
538	538	@@ -18,6 +18,7 @@
539	539	#include <linux/module.h>
540	540	#include <linux/rtc.h>

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

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

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

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

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

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

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

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

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

--- trunk/caitsith-patch/patches/ccs-patch-4.19.diff (revision 361)

+++ trunk/caitsith-patch/patches/ccs-patch-4.19.diff (revision 362)

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

		@@ -28,8 +28,8 @@
28	28	security/security.c \| 9 +++++-
29	29	24 files changed, 148 insertions(+), 29 deletions(-)
30	30
31		---- linux-4.19.217.orig/fs/exec.c
32		-+++ linux-4.19.217/fs/exec.c
	31	+--- linux-4.19.220.orig/fs/exec.c
	32	++++ linux-4.19.220/fs/exec.c
33	33	@@ -1707,7 +1707,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.19.217.orig/fs/open.c
43		-+++ linux-4.19.217/fs/open.c
	42	+--- linux-4.19.220.orig/fs/open.c
	43	++++ linux-4.19.220/fs/open.c
44	44	@@ -1196,6 +1196,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd)
45	45	*/
46	46	SYSCALL_DEFINE0(vhangup)

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

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

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

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

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

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

		@@ -359,8 +359,8 @@
359	359
360	360	/* Permit LSMs and IMA to fail the kexec */
361	361	result = security_kernel_load_data(LOADING_KEXEC_IMAGE);
362		---- linux-4.19.217.orig/kernel/module.c
363		-+++ linux-4.19.217/kernel/module.c
	362	+--- linux-4.19.220.orig/kernel/module.c
	363	++++ linux-4.19.220/kernel/module.c
364	364	@@ -66,6 +66,7 @@
365	365	#include <linux/audit.h>
366	366	#include <uapi/linux/module.h>

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

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

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

		@@ -443,9 +443,9 @@
443	443
444	444	/*
445	445	* Setpriority might change our priority at the same moment.
446		---- linux-4.19.217.orig/kernel/signal.c
447		-+++ linux-4.19.217/kernel/signal.c
448		-@@ -3286,6 +3286,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait,
	446	+--- linux-4.19.220.orig/kernel/signal.c
	447	++++ linux-4.19.220/kernel/signal.c
	448	+@@ -3276,6 +3276,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait,
449	449	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
450	450	{
451	451	struct siginfo info;

		@@ -454,7 +454,7 @@
454	454
455	455	clear_siginfo(&info);
456	456	info.si_signo = sig;
457		-@@ -3356,6 +3358,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
	457	+@@ -3346,6 +3348,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
458	458	/* This is only valid for single tasks */
459	459	if (pid <= 0 \|\| tgid <= 0)
460	460	return -EINVAL;

		@@ -463,7 +463,7 @@
463	463
464	464	return do_tkill(tgid, pid, sig);
465	465	}
466		-@@ -3372,6 +3376,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
	466	+@@ -3362,6 +3366,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
467	467	/* This is only valid for single tasks */
468	468	if (pid <= 0)
469	469	return -EINVAL;

		@@ -472,7 +472,7 @@
472	472
473	473	return do_tkill(0, pid, sig);
474	474	}
475		-@@ -3386,6 +3392,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
	475	+@@ -3376,6 +3382,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
476	476	return -EPERM;
477	477
478	478	info->si_signo = sig;

		@@ -481,7 +481,7 @@
481	481
482	482	/* POSIX.1b doesn't mention process groups. */
483	483	return kill_proc_info(sig, info, pid);
484		-@@ -3434,6 +3442,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
	484	+@@ -3424,6 +3432,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
485	485	return -EPERM;
486	486
487	487	info->si_signo = sig;

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

		@@ -521,8 +521,8 @@
521	521
522	522	errno = -EFAULT;
523	523	if (!copy_from_user(tmp, name, len)) {
524		---- linux-4.19.217.orig/kernel/time/timekeeping.c
525		-+++ linux-4.19.217/kernel/time/timekeeping.c
	524	+--- linux-4.19.220.orig/kernel/time/timekeeping.c
	525	++++ linux-4.19.220/kernel/time/timekeeping.c
526	526	@@ -26,6 +26,7 @@
527	527	#include <linux/stop_machine.h>
528	528	#include <linux/pvclock_gtod.h>

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

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

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

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

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

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

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

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

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

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

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

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 4.4.292.
	1	+This is TOMOYO Linux patch for kernel 4.4.294.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.292.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.294.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.292.orig/fs/exec.c
32		-+++ linux-4.4.292/fs/exec.c
	31	+--- linux-4.4.294.orig/fs/exec.c
	32	++++ linux-4.4.294/fs/exec.c
33	33	@@ -1514,7 +1514,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.292.orig/fs/open.c
43		-+++ linux-4.4.292/fs/open.c
	42	+--- linux-4.4.294.orig/fs/open.c
	43	++++ linux-4.4.294/fs/open.c
44	44	@@ -1136,6 +1136,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.292.orig/fs/proc/version.c
54		-+++ linux-4.4.292/fs/proc/version.c
	53	+--- linux-4.4.294.orig/fs/proc/version.c
	54	++++ linux-4.4.294/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.292 2021/11/15\n");
	62	++ printk(KERN_INFO "Hook version: 4.4.294 2021/12/12\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-4.4.292.orig/include/linux/init_task.h
67		-+++ linux-4.4.292/include/linux/init_task.h
	66	+--- linux-4.4.294.orig/include/linux/init_task.h
	67	++++ linux-4.4.294/include/linux/init_task.h
68	68	@@ -191,6 +191,14 @@ extern struct task_group root_task_group
69	69	# define INIT_TASK_TI(tsk)
70	70	#endif

		@@ -88,8 +88,8 @@
88	88	}
89	89
90	90
91		---- linux-4.4.292.orig/include/linux/sched.h
92		-+++ linux-4.4.292/include/linux/sched.h
	91	+--- linux-4.4.294.orig/include/linux/sched.h
	92	++++ linux-4.4.294/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.292.orig/include/linux/security.h
114		-+++ linux-4.4.292/include/linux/security.h
	113	+--- linux-4.4.294.orig/include/linux/security.h
	114	++++ linux-4.4.294/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.292.orig/include/net/ip.h
322		-+++ linux-4.4.292/include/net/ip.h
	321	+--- linux-4.4.294.orig/include/net/ip.h
	322	++++ linux-4.4.294/include/net/ip.h
323	323	@@ -225,6 +225,8 @@ void inet_get_local_port_range(struct ne
324	324	#ifdef CONFIG_SYSCTL
325	325	static inline int inet_is_local_reserved_port(struct net *net, int port)

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

		@@ -366,8 +366,8 @@
366	366	bad_fork_cleanup_perf:
367	367	perf_event_free_task(p);
368	368	bad_fork_cleanup_policy:
369		---- linux-4.4.292.orig/kernel/kexec.c
370		-+++ linux-4.4.292/kernel/kexec.c
	369	+--- linux-4.4.294.orig/kernel/kexec.c
	370	++++ linux-4.4.294/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.292.orig/kernel/module.c
390		-+++ linux-4.4.292/kernel/module.c
	389	+--- linux-4.4.294.orig/kernel/module.c
	390	++++ linux-4.4.294/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.292.orig/kernel/ptrace.c
418		-+++ linux-4.4.292/kernel/ptrace.c
	417	+--- linux-4.4.294.orig/kernel/ptrace.c
	418	++++ linux-4.4.294/kernel/ptrace.c
419	419	@@ -1125,6 +1125,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.292.orig/kernel/reboot.c
444		-+++ linux-4.4.292/kernel/reboot.c
	443	+--- linux-4.4.294.orig/kernel/reboot.c
	444	++++ linux-4.4.294/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.4.292.orig/kernel/sched/core.c
463		-+++ linux-4.4.292/kernel/sched/core.c
464		-@@ -3550,6 +3550,8 @@ int can_nice(const struct task_struct *p
	462	+--- linux-4.4.294.orig/kernel/sched/core.c
	463	++++ linux-4.4.294/kernel/sched/core.c
	464	+@@ -3553,6 +3553,8 @@ int can_nice(const struct task_struct *p
465	465	SYSCALL_DEFINE1(nice, int, increment)
466	466	{
467	467	long nice, retval;

		@@ -470,9 +470,9 @@
470	470
471	471	/*
472	472	* Setpriority might change our priority at the same moment.
473		---- linux-4.4.292.orig/kernel/signal.c
474		-+++ linux-4.4.292/kernel/signal.c
475		-@@ -2943,6 +2943,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
	473	+--- linux-4.4.294.orig/kernel/signal.c
	474	++++ linux-4.4.294/kernel/signal.c
	475	+@@ -2930,6 +2930,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
476	476	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
477	477	{
478	478	struct siginfo info;

		@@ -481,7 +481,7 @@
481	481
482	482	info.si_signo = sig;
483	483	info.si_errno = 0;
484		-@@ -3011,6 +3013,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
	484	+@@ -2998,6 +3000,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
485	485	/* This is only valid for single tasks */
486	486	if (pid <= 0 \|\| tgid <= 0)
487	487	return -EINVAL;

		@@ -490,7 +490,7 @@
490	490
491	491	return do_tkill(tgid, pid, sig);
492	492	}
493		-@@ -3027,6 +3031,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
	493	+@@ -3014,6 +3018,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
494	494	/* This is only valid for single tasks */
495	495	if (pid <= 0)
496	496	return -EINVAL;

		@@ -499,7 +499,7 @@
499	499
500	500	return do_tkill(0, pid, sig);
501	501	}
502		-@@ -3041,6 +3047,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
	502	+@@ -3028,6 +3034,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
503	503	return -EPERM;
504	504
505	505	info->si_signo = sig;

		@@ -508,7 +508,7 @@
508	508
509	509	/* POSIX.1b doesn't mention process groups. */
510	510	return kill_proc_info(sig, info, pid);
511		-@@ -3089,6 +3097,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
	511	+@@ -3076,6 +3084,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
512	512	return -EPERM;
513	513
514	514	info->si_signo = sig;

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

		@@ -548,8 +548,8 @@
548	548
549	549	errno = -EFAULT;
550	550	if (!copy_from_user(tmp, name, len)) {
551		---- linux-4.4.292.orig/kernel/time/ntp.c
552		-+++ linux-4.4.292/kernel/time/ntp.c
	551	+--- linux-4.4.294.orig/kernel/time/ntp.c
	552	++++ linux-4.4.294/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.292.orig/net/ipv4/raw.c
587		-+++ linux-4.4.292/net/ipv4/raw.c
	586	+--- linux-4.4.294.orig/net/ipv4/raw.c
	587	++++ linux-4.4.294/net/ipv4/raw.c
588	588	@@ -749,6 +749,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.292.orig/net/ipv4/udp.c
600		-+++ linux-4.4.292/net/ipv4/udp.c
	599	+--- linux-4.4.294.orig/net/ipv4/udp.c
	600	++++ linux-4.4.294/net/ipv4/udp.c
601	601	@@ -1289,6 +1289,10 @@ try_again:
602	602	&peeked, &off, &err);
603	603	if (!skb)

		@@ -609,8 +609,8 @@
609	609
610	610	ulen = skb->len - sizeof(struct udphdr);
611	611	copied = len;
612		---- linux-4.4.292.orig/net/ipv6/raw.c
613		-+++ linux-4.4.292/net/ipv6/raw.c
	612	+--- linux-4.4.294.orig/net/ipv6/raw.c
	613	++++ linux-4.4.294/net/ipv6/raw.c
614	614	@@ -480,6 +480,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.292.orig/net/ipv6/udp.c
626		-+++ linux-4.4.292/net/ipv6/udp.c
	625	+--- linux-4.4.294.orig/net/ipv6/udp.c
	626	++++ linux-4.4.294/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.292.orig/net/socket.c
639		-+++ linux-4.4.292/net/socket.c
	638	+--- linux-4.4.294.orig/net/socket.c
	639	++++ linux-4.4.294/net/socket.c
640	640	@@ -1465,6 +1465,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.292.orig/net/unix/af_unix.c
652		-+++ linux-4.4.292/net/unix/af_unix.c
	651	+--- linux-4.4.294.orig/net/unix/af_unix.c
	652	++++ linux-4.4.294/net/unix/af_unix.c
653	653	@@ -2158,6 +2158,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.292.orig/security/Kconfig
665		-+++ linux-4.4.292/security/Kconfig
	664	+--- linux-4.4.294.orig/security/Kconfig
	665	++++ linux-4.4.294/security/Kconfig
666	666	@@ -173,5 +173,7 @@ config DEFAULT_SECURITY
667	667	default "apparmor" if DEFAULT_SECURITY_APPARMOR
668	668	default "" if DEFAULT_SECURITY_DAC

		@@ -671,8 +671,8 @@
671	671	+
672	672	endmenu
673	673
674		---- linux-4.4.292.orig/security/Makefile
675		-+++ linux-4.4.292/security/Makefile
	674	+--- linux-4.4.294.orig/security/Makefile
	675	++++ linux-4.4.294/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.9.diff (revision 361)

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

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

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

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

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

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

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

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

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

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

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

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

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

		@@ -440,8 +440,8 @@
440	440
441	441	if (request == PTRACE_TRACEME) {
442	442	ret = ptrace_traceme();
443		---- linux-4.9.290.orig/kernel/reboot.c
444		-+++ linux-4.9.290/kernel/reboot.c
	443	+--- linux-4.9.292.orig/kernel/reboot.c
	444	++++ linux-4.9.292/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.9.290.orig/kernel/sched/core.c
463		-+++ linux-4.9.290/kernel/sched/core.c
464		-@@ -3814,6 +3814,8 @@ int can_nice(const struct task_struct *p
	462	+--- linux-4.9.292.orig/kernel/sched/core.c
	463	++++ linux-4.9.292/kernel/sched/core.c
	464	+@@ -3817,6 +3817,8 @@ int can_nice(const struct task_struct *p
465	465	SYSCALL_DEFINE1(nice, int, increment)
466	466	{
467	467	long nice, retval;

		@@ -470,9 +470,9 @@
470	470
471	471	/*
472	472	* Setpriority might change our priority at the same moment.
473		---- linux-4.9.290.orig/kernel/signal.c
474		-+++ linux-4.9.290/kernel/signal.c
475		-@@ -2943,6 +2943,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
	473	+--- linux-4.9.292.orig/kernel/signal.c
	474	++++ linux-4.9.292/kernel/signal.c
	475	+@@ -2930,6 +2930,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
476	476	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
477	477	{
478	478	struct siginfo info;

		@@ -481,7 +481,7 @@
481	481
482	482	info.si_signo = sig;
483	483	info.si_errno = 0;
484		-@@ -3011,6 +3013,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
	484	+@@ -2998,6 +3000,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
485	485	/* This is only valid for single tasks */
486	486	if (pid <= 0 \|\| tgid <= 0)
487	487	return -EINVAL;

		@@ -490,7 +490,7 @@
490	490
491	491	return do_tkill(tgid, pid, sig);
492	492	}
493		-@@ -3027,6 +3031,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
	493	+@@ -3014,6 +3018,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
494	494	/* This is only valid for single tasks */
495	495	if (pid <= 0)
496	496	return -EINVAL;

		@@ -499,7 +499,7 @@
499	499
500	500	return do_tkill(0, pid, sig);
501	501	}
502		-@@ -3041,6 +3047,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
	502	+@@ -3028,6 +3034,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
503	503	return -EPERM;
504	504
505	505	info->si_signo = sig;

		@@ -508,7 +508,7 @@
508	508
509	509	/* POSIX.1b doesn't mention process groups. */
510	510	return kill_proc_info(sig, info, pid);
511		-@@ -3089,6 +3097,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
	511	+@@ -3076,6 +3084,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
512	512	return -EPERM;
513	513
514	514	info->si_signo = sig;

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

		@@ -548,8 +548,8 @@
548	548
549	549	errno = -EFAULT;
550	550	if (!copy_from_user(tmp, name, len)) {
551		---- linux-4.9.290.orig/kernel/time/ntp.c
552		-+++ linux-4.9.290/kernel/time/ntp.c
	551	+--- linux-4.9.292.orig/kernel/time/ntp.c
	552	++++ linux-4.9.292/kernel/time/ntp.c
553	553	@@ -17,6 +17,7 @@
554	554	#include <linux/module.h>
555	555	#include <linux/rtc.h>

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

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

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

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

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

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

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

		@@ -675,8 +675,8 @@
675	675	+
676	676	endmenu
677	677
678		---- linux-4.9.290.orig/security/Makefile
679		-+++ linux-4.9.290/security/Makefile
	678	+--- linux-4.9.292.orig/security/Makefile
	679	++++ linux-4.9.292/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-5.10.diff (revision 361)

+++ trunk/caitsith-patch/patches/ccs-patch-5.10.diff (revision 362)

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

		@@ -28,8 +28,8 @@
28	28	security/security.c \| 5 ++-
29	29	24 files changed, 160 insertions(+), 30 deletions(-)
30	30
31		---- linux-5.10.79.orig/fs/exec.c
32		-+++ linux-5.10.79/fs/exec.c
	31	+--- linux-5.10.84.orig/fs/exec.c
	32	++++ linux-5.10.84/fs/exec.c
33	33	@@ -1817,7 +1817,7 @@ static int bprm_execve(struct linux_binp
34	34	if (retval)
35	35	goto out;

		@@ -39,8 +39,8 @@
39	39	if (retval < 0)
40	40	goto out;
41	41
42		---- linux-5.10.79.orig/fs/open.c
43		-+++ linux-5.10.79/fs/open.c
	42	+--- linux-5.10.84.orig/fs/open.c
	43	++++ linux-5.10.84/fs/open.c
44	44	@@ -1339,6 +1339,8 @@ SYSCALL_DEFINE3(close_range, unsigned in
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-5.10.79.orig/fs/proc/version.c
54		-+++ linux-5.10.79/fs/proc/version.c
	53	+--- linux-5.10.84.orig/fs/proc/version.c
	54	++++ linux-5.10.84/fs/proc/version.c
55	55	@@ -21,3 +21,10 @@ static int __init proc_version_init(void
56	56	return 0;
57	57	}

		@@ -59,12 +59,12 @@
59	59	+
60	60	+static int __init ccs_show_version(void)
61	61	+{
62		-+ printk(KERN_INFO "Hook version: 5.10.79 2021/11/15\n");
	62	++ printk(KERN_INFO "Hook version: 5.10.84 2021/12/12\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.10.79.orig/include/linux/sched.h
67		-+++ linux-5.10.79/include/linux/sched.h
	66	+--- linux-5.10.84.orig/include/linux/sched.h
	67	++++ linux-5.10.84/include/linux/sched.h
68	68	@@ -41,6 +41,7 @@ struct backing_dev_info;
69	69	struct bio_list;
70	70	struct blk_plug;

		@@ -84,8 +84,8 @@
84	84
85	85	#ifdef CONFIG_GCC_PLUGIN_STACKLEAK
86	86	unsigned long lowest_stack;
87		---- linux-5.10.79.orig/include/linux/security.h
88		-+++ linux-5.10.79/include/linux/security.h
	87	+--- linux-5.10.84.orig/include/linux/security.h
	88	++++ linux-5.10.84/include/linux/security.h
89	89	@@ -59,6 +59,7 @@ struct fs_parameter;
90	90	enum fs_value_type;
91	91	struct watch;

		@@ -187,7 +187,7 @@
187	187
188	188	static inline int security_cred_alloc_blank(struct cred *cred, gfp_t gfp)
189	189	{
190		-@@ -1397,7 +1403,7 @@ static inline int security_unix_may_send
	190	+@@ -1402,7 +1408,7 @@ static inline int security_unix_may_send
191	191	static inline int security_socket_create(int family, int type,
192	192	int protocol, int kern)
193	193	{

		@@ -196,7 +196,7 @@
196	196	}
197	197
198	198	static inline int security_socket_post_create(struct socket *sock,
199		-@@ -1418,19 +1424,19 @@ static inline int security_socket_bind(s
	199	+@@ -1423,19 +1429,19 @@ static inline int security_socket_bind(s
200	200	struct sockaddr *address,
201	201	int addrlen)
202	202	{

		@@ -219,7 +219,7 @@
219	219	}
220	220
221	221	static inline int security_socket_accept(struct socket *sock,
222		-@@ -1442,7 +1448,7 @@ static inline int security_socket_accept
	222	+@@ -1447,7 +1453,7 @@ static inline int security_socket_accept
223	223	static inline int security_socket_sendmsg(struct socket *sock,
224	224	struct msghdr *msg, int size)
225	225	{

		@@ -228,7 +228,7 @@
228	228	}
229	229
230	230	static inline int security_socket_recvmsg(struct socket *sock,
231		-@@ -1729,42 +1735,42 @@ int security_path_chroot(const struct pa
	231	+@@ -1734,42 +1740,42 @@ int security_path_chroot(const struct pa
232	232	#else /* CONFIG_SECURITY_PATH */
233	233	static inline int security_path_unlink(const struct path dir, struct dentry dentry)
234	234	{

		@@ -278,7 +278,7 @@
278	278	}
279	279
280	280	static inline int security_path_rename(const struct path *old_dir,
281		-@@ -1773,22 +1779,32 @@ static inline int security_path_rename(c
	281	+@@ -1778,22 +1784,32 @@ static inline int security_path_rename(c
282	282	struct dentry *new_dentry,
283	283	unsigned int flags)
284	284	{

		@@ -315,8 +315,8 @@
315	315	}
316	316	#endif /* CONFIG_SECURITY_PATH */
317	317
318		---- linux-5.10.79.orig/include/net/ip.h
319		-+++ linux-5.10.79/include/net/ip.h
	318	+--- linux-5.10.84.orig/include/net/ip.h
	319	++++ linux-5.10.84/include/net/ip.h
320	320	@@ -339,6 +339,8 @@ void inet_get_local_port_range(struct ne
321	321	#ifdef CONFIG_SYSCTL
322	322	static inline bool inet_is_local_reserved_port(struct net *net, unsigned short port)

		@@ -335,8 +335,8 @@
335	335	return false;
336	336	}
337	337
338		---- linux-5.10.79.orig/init/init_task.c
339		-+++ linux-5.10.79/init/init_task.c
	338	+--- linux-5.10.84.orig/init/init_task.c
	339	++++ linux-5.10.84/init/init_task.c
340	340	@@ -213,6 +213,10 @@ struct task_struct init_task
341	341	#ifdef CONFIG_SECCOMP_FILTER
342	342	.seccomp = { .filter_count = ATOMIC_INIT(0) },

		@@ -348,8 +348,8 @@
348	348	};
349	349	EXPORT_SYMBOL(init_task);
350	350
351		---- linux-5.10.79.orig/kernel/kexec.c
352		-+++ linux-5.10.79/kernel/kexec.c
	351	+--- linux-5.10.84.orig/kernel/kexec.c
	352	++++ linux-5.10.84/kernel/kexec.c
353	353	@@ -16,7 +16,7 @@
354	354	#include <linux/syscalls.h>
355	355	#include <linux/vmalloc.h>

		@@ -368,8 +368,8 @@
368	368
369	369	/* Permit LSMs and IMA to fail the kexec */
370	370	result = security_kernel_load_data(LOADING_KEXEC_IMAGE, false);
371		---- linux-5.10.79.orig/kernel/module.c
372		-+++ linux-5.10.79/kernel/module.c
	371	+--- linux-5.10.84.orig/kernel/module.c
	372	++++ linux-5.10.84/kernel/module.c
373	373	@@ -59,6 +59,7 @@
374	374	#include <linux/audit.h>
375	375	#include <uapi/linux/module.h>

		@@ -396,8 +396,8 @@
396	396
397	397	return 0;
398	398	}
399		---- linux-5.10.79.orig/kernel/ptrace.c
400		-+++ linux-5.10.79/kernel/ptrace.c
	399	+--- linux-5.10.84.orig/kernel/ptrace.c
	400	++++ linux-5.10.84/kernel/ptrace.c
401	401	@@ -1254,6 +1254,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
402	402	{
403	403	struct task_struct *child;

		@@ -422,8 +422,8 @@
422	422
423	423	if (request == PTRACE_TRACEME) {
424	424	ret = ptrace_traceme();
425		---- linux-5.10.79.orig/kernel/reboot.c
426		-+++ linux-5.10.79/kernel/reboot.c
	425	+--- linux-5.10.84.orig/kernel/reboot.c
	426	++++ linux-5.10.84/kernel/reboot.c
427	427	@@ -17,6 +17,7 @@
428	428	#include <linux/syscalls.h>
429	429	#include <linux/syscore_ops.h>

		@@ -441,9 +441,9 @@
441	441
442	442	/*
443	443	* If pid namespaces are enabled and the current task is in a child
444		---- linux-5.10.79.orig/kernel/sched/core.c
445		-+++ linux-5.10.79/kernel/sched/core.c
446		-@@ -5052,6 +5052,8 @@ int can_nice(const struct task_struct *p
	444	+--- linux-5.10.84.orig/kernel/sched/core.c
	445	++++ linux-5.10.84/kernel/sched/core.c
	446	+@@ -5056,6 +5056,8 @@ int can_nice(const struct task_struct *p
447	447	SYSCALL_DEFINE1(nice, int, increment)
448	448	{
449	449	long nice, retval;

		@@ -452,9 +452,9 @@
452	452
453	453	/*
454	454	* Setpriority might change our priority at the same moment.
455		---- linux-5.10.79.orig/kernel/signal.c
456		-+++ linux-5.10.79/kernel/signal.c
457		-@@ -3658,6 +3658,8 @@ static inline void prepare_kill_siginfo(
	455	+--- linux-5.10.84.orig/kernel/signal.c
	456	++++ linux-5.10.84/kernel/signal.c
	457	+@@ -3648,6 +3648,8 @@ static inline void prepare_kill_siginfo(
458	458	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
459	459	{
460	460	struct kernel_siginfo info;

		@@ -463,7 +463,7 @@
463	463
464	464	prepare_kill_siginfo(sig, &info);
465	465
466		-@@ -3756,6 +3758,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int,
	466	+@@ -3746,6 +3748,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int,
467	467	if (!access_pidfd_pidns(pid))
468	468	goto err;
469	469

		@@ -485,7 +485,7 @@
485	485	if (info) {
486	486	ret = copy_siginfo_from_user_any(&kinfo, info);
487	487	if (unlikely(ret))
488		-@@ -3840,6 +3857,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
	488	+@@ -3830,6 +3847,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
489	489	/* This is only valid for single tasks */
490	490	if (pid <= 0 \|\| tgid <= 0)
491	491	return -EINVAL;

		@@ -494,7 +494,7 @@
494	494
495	495	return do_tkill(tgid, pid, sig);
496	496	}
497		-@@ -3856,6 +3875,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
	497	+@@ -3846,6 +3865,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
498	498	/* This is only valid for single tasks */
499	499	if (pid <= 0)
500	500	return -EINVAL;

		@@ -503,7 +503,7 @@
503	503
504	504	return do_tkill(0, pid, sig);
505	505	}
506		-@@ -3868,6 +3889,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
	506	+@@ -3858,6 +3879,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
507	507	if ((info->si_code >= 0 \|\| info->si_code == SI_TKILL) &&
508	508	(task_pid_vnr(current) != pid))
509	509	return -EPERM;

		@@ -512,7 +512,7 @@
512	512
513	513	/* POSIX.1b doesn't mention process groups. */
514	514	return kill_proc_info(sig, info, pid);
515		-@@ -3915,6 +3938,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
	515	+@@ -3905,6 +3928,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
516	516	if ((info->si_code >= 0 \|\| info->si_code == SI_TKILL) &&
517	517	(task_pid_vnr(current) != pid))
518	518	return -EPERM;

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

		@@ -552,8 +552,8 @@
552	552
553	553	errno = -EFAULT;
554	554	if (!copy_from_user(tmp, name, len)) {
555		---- linux-5.10.79.orig/kernel/time/timekeeping.c
556		-+++ linux-5.10.79/kernel/time/timekeeping.c
	555	+--- linux-5.10.84.orig/kernel/time/timekeeping.c
	556	++++ linux-5.10.84/kernel/time/timekeeping.c
557	557	@@ -22,6 +22,7 @@
558	558	#include <linux/pvclock_gtod.h>
559	559	#include <linux/compiler.h>

		@@ -587,8 +587,8 @@
587	587
588	588	/*
589	589	* Validate if a timespec/timeval used to inject a time
590		---- linux-5.10.79.orig/net/ipv4/raw.c
591		-+++ linux-5.10.79/net/ipv4/raw.c
	590	+--- linux-5.10.84.orig/net/ipv4/raw.c
	591	++++ linux-5.10.84/net/ipv4/raw.c
592	592	@@ -768,6 +768,10 @@ static int raw_recvmsg(struct sock *sk,
593	593	skb = skb_recv_datagram(sk, flags, noblock, &err);
594	594	if (!skb)

		@@ -600,8 +600,8 @@
600	600
601	601	copied = skb->len;
602	602	if (len < copied) {
603		---- linux-5.10.79.orig/net/ipv4/udp.c
604		-+++ linux-5.10.79/net/ipv4/udp.c
	603	+--- linux-5.10.84.orig/net/ipv4/udp.c
	604	++++ linux-5.10.84/net/ipv4/udp.c
605	605	@@ -1802,6 +1802,8 @@ try_again:
606	606	skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
607	607	if (!skb)

		@@ -611,8 +611,8 @@
611	611
612	612	ulen = udp_skb_len(skb);
613	613	copied = len;
614		---- linux-5.10.79.orig/net/ipv6/raw.c
615		-+++ linux-5.10.79/net/ipv6/raw.c
	614	+--- linux-5.10.84.orig/net/ipv6/raw.c
	615	++++ linux-5.10.84/net/ipv6/raw.c
616	616	@@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk
617	617	skb = skb_recv_datagram(sk, flags, noblock, &err);
618	618	if (!skb)

		@@ -624,8 +624,8 @@
624	624
625	625	copied = skb->len;
626	626	if (copied > len) {
627		---- linux-5.10.79.orig/net/ipv6/udp.c
628		-+++ linux-5.10.79/net/ipv6/udp.c
	627	+--- linux-5.10.84.orig/net/ipv6/udp.c
	628	++++ linux-5.10.84/net/ipv6/udp.c
629	629	@@ -344,6 +344,8 @@ try_again:
630	630	skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
631	631	if (!skb)

		@@ -635,8 +635,8 @@
635	635
636	636	ulen = udp6_skb_len(skb);
637	637	copied = len;
638		---- linux-5.10.79.orig/net/socket.c
639		-+++ linux-5.10.79/net/socket.c
	638	+--- linux-5.10.84.orig/net/socket.c
	639	++++ linux-5.10.84/net/socket.c
640	640	@@ -1744,6 +1744,10 @@ int __sys_accept4_file(struct file *file
641	641	if (err < 0)
642	642	goto out_fd;

		@@ -648,8 +648,8 @@
648	648	if (upeer_sockaddr) {
649	649	len = newsock->ops->getname(newsock,
650	650	(struct sockaddr *)&address, 2);
651		---- linux-5.10.79.orig/net/unix/af_unix.c
652		-+++ linux-5.10.79/net/unix/af_unix.c
	651	+--- linux-5.10.84.orig/net/unix/af_unix.c
	652	++++ linux-5.10.84/net/unix/af_unix.c
653	653	@@ -2197,6 +2197,10 @@ static int unix_dgram_recvmsg(struct soc
654	654	EPOLLOUT \| EPOLLWRNORM \|
655	655	EPOLLWRBAND);

		@@ -669,9 +669,9 @@
669	669	mutex_unlock(&u->iolock);
670	670	out:
671	671	return err;
672		---- linux-5.10.79.orig/security/Kconfig
673		-+++ linux-5.10.79/security/Kconfig
674		-@@ -291,5 +291,7 @@ config LSM
	672	+--- linux-5.10.84.orig/security/Kconfig
	673	++++ linux-5.10.84/security/Kconfig
	674	+@@ -294,5 +294,7 @@ config LSM
675	675
676	676	source "security/Kconfig.hardening"
677	677

		@@ -679,8 +679,8 @@
679	679	+
680	680	endmenu
681	681
682		---- linux-5.10.79.orig/security/Makefile
683		-+++ linux-5.10.79/security/Makefile
	682	+--- linux-5.10.84.orig/security/Makefile
	683	++++ linux-5.10.84/security/Makefile
684	684	@@ -36,3 +36,6 @@ obj-$(CONFIG_BPF_LSM) += bpf/
685	685	# Object integrity file lists
686	686	subdir-$(CONFIG_INTEGRITY) += integrity

		@@ -688,8 +688,8 @@
688	688	+
689	689	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
690	690	+obj-$(CONFIG_CCSECURITY) += ccsecurity/
691		---- linux-5.10.79.orig/security/security.c
692		-+++ linux-5.10.79/security/security.c
	691	+--- linux-5.10.84.orig/security/security.c
	692	++++ linux-5.10.84/security/security.c
693	693	@@ -1586,7 +1586,9 @@ int security_task_alloc(struct task_stru
694	694
695	695	if (rc)

--- trunk/caitsith-patch/patches/ccs-patch-5.14.diff (revision 361)

+++ trunk/caitsith-patch/patches/ccs-patch-5.14.diff (revision 362)

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

		@@ -28,8 +28,8 @@
28	28	security/security.c \| 5 ++-
29	29	24 files changed, 160 insertions(+), 30 deletions(-)
30	30
31		---- linux-5.14.18.orig/fs/exec.c
32		-+++ linux-5.14.18/fs/exec.c
	31	+--- linux-5.14.21.orig/fs/exec.c
	32	++++ linux-5.14.21/fs/exec.c
33	33	@@ -1828,7 +1828,7 @@ static int bprm_execve(struct linux_binp
34	34	if (retval)
35	35	goto out;

		@@ -39,8 +39,8 @@
39	39	if (retval < 0)
40	40	goto out;
41	41
42		---- linux-5.14.18.orig/fs/open.c
43		-+++ linux-5.14.18/fs/open.c
	42	+--- linux-5.14.21.orig/fs/open.c
	43	++++ linux-5.14.21/fs/open.c
44	44	@@ -1363,6 +1363,8 @@ SYSCALL_DEFINE3(close_range, unsigned in
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-5.14.18.orig/fs/proc/version.c
54		-+++ linux-5.14.18/fs/proc/version.c
	53	+--- linux-5.14.21.orig/fs/proc/version.c
	54	++++ linux-5.14.21/fs/proc/version.c
55	55	@@ -21,3 +21,10 @@ static int __init proc_version_init(void
56	56	return 0;
57	57	}

		@@ -59,12 +59,12 @@
59	59	+
60	60	+static int __init ccs_show_version(void)
61	61	+{
62		-+ printk(KERN_INFO "Hook version: 5.14.18 2021/11/15\n");
	62	++ printk(KERN_INFO "Hook version: 5.14.21 2021/11/29\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.14.18.orig/include/linux/sched.h
67		-+++ linux-5.14.18/include/linux/sched.h
	66	+--- linux-5.14.21.orig/include/linux/sched.h
	67	++++ linux-5.14.21/include/linux/sched.h
68	68	@@ -43,6 +43,7 @@ struct bio_list;
69	69	struct blk_plug;
70	70	struct bpf_local_storage;

		@@ -84,8 +84,8 @@
84	84
85	85	#ifdef CONFIG_GCC_PLUGIN_STACKLEAK
86	86	unsigned long lowest_stack;
87		---- linux-5.14.18.orig/include/linux/security.h
88		-+++ linux-5.14.18/include/linux/security.h
	87	+--- linux-5.14.21.orig/include/linux/security.h
	88	++++ linux-5.14.21/include/linux/security.h
89	89	@@ -59,6 +59,7 @@ struct fs_parameter;
90	90	enum fs_value_type;
91	91	struct watch;

		@@ -315,8 +315,8 @@
315	315	}
316	316	#endif /* CONFIG_SECURITY_PATH */
317	317
318		---- linux-5.14.18.orig/include/net/ip.h
319		-+++ linux-5.14.18/include/net/ip.h
	318	+--- linux-5.14.21.orig/include/net/ip.h
	319	++++ linux-5.14.21/include/net/ip.h
320	320	@@ -339,6 +339,8 @@ void inet_get_local_port_range(struct ne
321	321	#ifdef CONFIG_SYSCTL
322	322	static inline bool inet_is_local_reserved_port(struct net *net, unsigned short port)

		@@ -335,8 +335,8 @@
335	335	return false;
336	336	}
337	337
338		---- linux-5.14.18.orig/init/init_task.c
339		-+++ linux-5.14.18/init/init_task.c
	338	+--- linux-5.14.21.orig/init/init_task.c
	339	++++ linux-5.14.21/init/init_task.c
340	340	@@ -213,6 +213,10 @@ struct task_struct init_task
341	341	#ifdef CONFIG_SECCOMP_FILTER
342	342	.seccomp = { .filter_count = ATOMIC_INIT(0) },

		@@ -348,8 +348,8 @@
348	348	};
349	349	EXPORT_SYMBOL(init_task);
350	350
351		---- linux-5.14.18.orig/kernel/kexec.c
352		-+++ linux-5.14.18/kernel/kexec.c
	351	+--- linux-5.14.21.orig/kernel/kexec.c
	352	++++ linux-5.14.21/kernel/kexec.c
353	353	@@ -16,7 +16,7 @@
354	354	#include <linux/syscalls.h>
355	355	#include <linux/vmalloc.h>

		@@ -368,8 +368,8 @@
368	368
369	369	/* Permit LSMs and IMA to fail the kexec */
370	370	result = security_kernel_load_data(LOADING_KEXEC_IMAGE, false);
371		---- linux-5.14.18.orig/kernel/module.c
372		-+++ linux-5.14.18/kernel/module.c
	371	+--- linux-5.14.21.orig/kernel/module.c
	372	++++ linux-5.14.21/kernel/module.c
373	373	@@ -59,6 +59,7 @@
374	374	#include <linux/audit.h>
375	375	#include <uapi/linux/module.h>

		@@ -396,8 +396,8 @@
396	396
397	397	return 0;
398	398	}
399		---- linux-5.14.18.orig/kernel/ptrace.c
400		-+++ linux-5.14.18/kernel/ptrace.c
	399	+--- linux-5.14.21.orig/kernel/ptrace.c
	400	++++ linux-5.14.21/kernel/ptrace.c
401	401	@@ -1279,6 +1279,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
402	402	{
403	403	struct task_struct *child;

		@@ -422,8 +422,8 @@
422	422
423	423	if (request == PTRACE_TRACEME) {
424	424	ret = ptrace_traceme();
425		---- linux-5.14.18.orig/kernel/reboot.c
426		-+++ linux-5.14.18/kernel/reboot.c
	425	+--- linux-5.14.21.orig/kernel/reboot.c
	426	++++ linux-5.14.21/kernel/reboot.c
427	427	@@ -18,6 +18,7 @@
428	428	#include <linux/syscalls.h>
429	429	#include <linux/syscore_ops.h>

		@@ -441,9 +441,9 @@
441	441
442	442	/*
443	443	* If pid namespaces are enabled and the current task is in a child
444		---- linux-5.14.18.orig/kernel/sched/core.c
445		-+++ linux-5.14.18/kernel/sched/core.c
446		-@@ -6684,6 +6684,8 @@ int can_nice(const struct task_struct *p
	444	+--- linux-5.14.21.orig/kernel/sched/core.c
	445	++++ linux-5.14.21/kernel/sched/core.c
	446	+@@ -6685,6 +6685,8 @@ int can_nice(const struct task_struct *p
447	447	SYSCALL_DEFINE1(nice, int, increment)
448	448	{
449	449	long nice, retval;

		@@ -452,9 +452,9 @@
452	452
453	453	/*
454	454	* Setpriority might change our priority at the same moment.
455		---- linux-5.14.18.orig/kernel/signal.c
456		-+++ linux-5.14.18/kernel/signal.c
457		-@@ -3701,6 +3701,8 @@ static inline void prepare_kill_siginfo(
	455	+--- linux-5.14.21.orig/kernel/signal.c
	456	++++ linux-5.14.21/kernel/signal.c
	457	+@@ -3691,6 +3691,8 @@ static inline void prepare_kill_siginfo(
458	458	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
459	459	{
460	460	struct kernel_siginfo info;

		@@ -463,7 +463,7 @@
463	463
464	464	prepare_kill_siginfo(sig, &info);
465	465
466		-@@ -3800,6 +3802,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int,
	466	+@@ -3790,6 +3792,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int,
467	467	if (!access_pidfd_pidns(pid))
468	468	goto err;
469	469

		@@ -485,7 +485,7 @@
485	485	if (info) {
486	486	ret = copy_siginfo_from_user_any(&kinfo, info);
487	487	if (unlikely(ret))
488		-@@ -3884,6 +3901,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
	488	+@@ -3874,6 +3891,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
489	489	/* This is only valid for single tasks */
490	490	if (pid <= 0 \|\| tgid <= 0)
491	491	return -EINVAL;

		@@ -494,7 +494,7 @@
494	494
495	495	return do_tkill(tgid, pid, sig);
496	496	}
497		-@@ -3900,6 +3919,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
	497	+@@ -3890,6 +3909,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
498	498	/* This is only valid for single tasks */
499	499	if (pid <= 0)
500	500	return -EINVAL;

		@@ -503,7 +503,7 @@
503	503
504	504	return do_tkill(0, pid, sig);
505	505	}
506		-@@ -3912,6 +3933,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
	506	+@@ -3902,6 +3923,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
507	507	if ((info->si_code >= 0 \|\| info->si_code == SI_TKILL) &&
508	508	(task_pid_vnr(current) != pid))
509	509	return -EPERM;

		@@ -512,7 +512,7 @@
512	512
513	513	/* POSIX.1b doesn't mention process groups. */
514	514	return kill_proc_info(sig, info, pid);
515		-@@ -3959,6 +3982,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
	515	+@@ -3949,6 +3972,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
516	516	if ((info->si_code >= 0 \|\| info->si_code == SI_TKILL) &&
517	517	(task_pid_vnr(current) != pid))
518	518	return -EPERM;

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

		@@ -552,8 +552,8 @@
552	552
553	553	errno = -EFAULT;
554	554	if (!copy_from_user(tmp, name, len)) {
555		---- linux-5.14.18.orig/kernel/time/timekeeping.c
556		-+++ linux-5.14.18/kernel/time/timekeeping.c
	555	+--- linux-5.14.21.orig/kernel/time/timekeeping.c
	556	++++ linux-5.14.21/kernel/time/timekeeping.c
557	557	@@ -22,6 +22,7 @@
558	558	#include <linux/pvclock_gtod.h>
559	559	#include <linux/compiler.h>

		@@ -587,8 +587,8 @@
587	587
588	588	/*
589	589	* Validate if a timespec/timeval used to inject a time
590		---- linux-5.14.18.orig/net/ipv4/raw.c
591		-+++ linux-5.14.18/net/ipv4/raw.c
	590	+--- linux-5.14.21.orig/net/ipv4/raw.c
	591	++++ linux-5.14.21/net/ipv4/raw.c
592	592	@@ -768,6 +768,10 @@ static int raw_recvmsg(struct sock *sk,
593	593	skb = skb_recv_datagram(sk, flags, noblock, &err);
594	594	if (!skb)

		@@ -600,8 +600,8 @@
600	600
601	601	copied = skb->len;
602	602	if (len < copied) {
603		---- linux-5.14.18.orig/net/ipv4/udp.c
604		-+++ linux-5.14.18/net/ipv4/udp.c
	603	+--- linux-5.14.21.orig/net/ipv4/udp.c
	604	++++ linux-5.14.21/net/ipv4/udp.c
605	605	@@ -1851,6 +1851,8 @@ try_again:
606	606	skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
607	607	if (!skb)

		@@ -611,8 +611,8 @@
611	611
612	612	ulen = udp_skb_len(skb);
613	613	copied = len;
614		---- linux-5.14.18.orig/net/ipv6/raw.c
615		-+++ linux-5.14.18/net/ipv6/raw.c
	614	+--- linux-5.14.21.orig/net/ipv6/raw.c
	615	++++ linux-5.14.21/net/ipv6/raw.c
616	616	@@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk
617	617	skb = skb_recv_datagram(sk, flags, noblock, &err);
618	618	if (!skb)

		@@ -624,8 +624,8 @@
624	624
625	625	copied = skb->len;
626	626	if (copied > len) {
627		---- linux-5.14.18.orig/net/ipv6/udp.c
628		-+++ linux-5.14.18/net/ipv6/udp.c
	627	+--- linux-5.14.21.orig/net/ipv6/udp.c
	628	++++ linux-5.14.21/net/ipv6/udp.c
629	629	@@ -343,6 +343,8 @@ try_again:
630	630	skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
631	631	if (!skb)

		@@ -635,8 +635,8 @@
635	635
636	636	ulen = udp6_skb_len(skb);
637	637	copied = len;
638		---- linux-5.14.18.orig/net/socket.c
639		-+++ linux-5.14.18/net/socket.c
	638	+--- linux-5.14.21.orig/net/socket.c
	639	++++ linux-5.14.21/net/socket.c
640	640	@@ -1782,6 +1782,10 @@ int __sys_accept4_file(struct file *file
641	641	if (err < 0)
642	642	goto out_fd;

		@@ -648,8 +648,8 @@
648	648	if (upeer_sockaddr) {
649	649	len = newsock->ops->getname(newsock,
650	650	(struct sockaddr *)&address, 2);
651		---- linux-5.14.18.orig/net/unix/af_unix.c
652		-+++ linux-5.14.18/net/unix/af_unix.c
	651	+--- linux-5.14.21.orig/net/unix/af_unix.c
	652	++++ linux-5.14.21/net/unix/af_unix.c
653	653	@@ -2202,6 +2202,10 @@ static int unix_dgram_recvmsg(struct soc
654	654	EPOLLOUT \| EPOLLWRNORM \|
655	655	EPOLLWRBAND);

		@@ -669,9 +669,9 @@
669	669	mutex_unlock(&u->iolock);
670	670	out:
671	671	return err;
672		---- linux-5.14.18.orig/security/Kconfig
673		-+++ linux-5.14.18/security/Kconfig
674		-@@ -292,5 +292,7 @@ config LSM
	672	+--- linux-5.14.21.orig/security/Kconfig
	673	++++ linux-5.14.21/security/Kconfig
	674	+@@ -295,5 +295,7 @@ config LSM
675	675
676	676	source "security/Kconfig.hardening"
677	677

		@@ -679,8 +679,8 @@
679	679	+
680	680	endmenu
681	681
682		---- linux-5.14.18.orig/security/Makefile
683		-+++ linux-5.14.18/security/Makefile
	682	+--- linux-5.14.21.orig/security/Makefile
	683	++++ linux-5.14.21/security/Makefile
684	684	@@ -38,3 +38,6 @@ obj-$(CONFIG_SECURITY_LANDLOCK) += land
685	685	# Object integrity file lists
686	686	subdir-$(CONFIG_INTEGRITY) += integrity

		@@ -688,8 +688,8 @@
688	688	+
689	689	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
690	690	+obj-$(CONFIG_CCSECURITY) += ccsecurity/
691		---- linux-5.14.18.orig/security/security.c
692		-+++ linux-5.14.18/security/security.c
	691	+--- linux-5.14.21.orig/security/security.c
	692	++++ linux-5.14.21/security/security.c
693	693	@@ -1644,7 +1644,9 @@ int security_task_alloc(struct task_stru
694	694
695	695	if (rc)

--- trunk/caitsith-patch/patches/ccs-patch-5.15.diff (revision 361)

+++ trunk/caitsith-patch/patches/ccs-patch-5.15.diff (revision 362)

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

		@@ -28,8 +28,8 @@
28	28	security/security.c \| 5 ++-
29	29	24 files changed, 160 insertions(+), 30 deletions(-)
30	30
31		---- linux-5.15.2.orig/fs/exec.c
32		-+++ linux-5.15.2/fs/exec.c
	31	+--- linux-5.15.7.orig/fs/exec.c
	32	++++ linux-5.15.7/fs/exec.c
33	33	@@ -1832,7 +1832,7 @@ static int bprm_execve(struct linux_binp
34	34	if (retval)
35	35	goto out;

		@@ -39,9 +39,9 @@
39	39	if (retval < 0)
40	40	goto out;
41	41
42		---- linux-5.15.2.orig/fs/open.c
43		-+++ linux-5.15.2/fs/open.c
44		-@@ -1359,6 +1359,8 @@ SYSCALL_DEFINE3(close_range, unsigned in
	42	+--- linux-5.15.7.orig/fs/open.c
	43	++++ linux-5.15.7/fs/open.c
	44	+@@ -1371,6 +1371,8 @@ SYSCALL_DEFINE3(close_range, unsigned in
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-5.15.2.orig/fs/proc/version.c
54		-+++ linux-5.15.2/fs/proc/version.c
	53	+--- linux-5.15.7.orig/fs/proc/version.c
	54	++++ linux-5.15.7/fs/proc/version.c
55	55	@@ -21,3 +21,10 @@ static int __init proc_version_init(void
56	56	return 0;
57	57	}

		@@ -59,12 +59,12 @@
59	59	+
60	60	+static int __init ccs_show_version(void)
61	61	+{
62		-+ printk(KERN_INFO "Hook version: 5.15.2 2021/11/15\n");
	62	++ printk(KERN_INFO "Hook version: 5.15.7 2021/12/12\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.15.2.orig/include/linux/sched.h
67		-+++ linux-5.15.2/include/linux/sched.h
	66	+--- linux-5.15.7.orig/include/linux/sched.h
	67	++++ linux-5.15.7/include/linux/sched.h
68	68	@@ -44,6 +44,7 @@ struct blk_plug;
69	69	struct bpf_local_storage;
70	70	struct bpf_run_ctx;

		@@ -84,8 +84,8 @@
84	84
85	85	#ifdef CONFIG_TRACING
86	86	/* State flags for use by tracers: */
87		---- linux-5.15.2.orig/include/linux/security.h
88		-+++ linux-5.15.2/include/linux/security.h
	87	+--- linux-5.15.7.orig/include/linux/security.h
	88	++++ linux-5.15.7/include/linux/security.h
89	89	@@ -59,6 +59,7 @@ struct fs_parameter;
90	90	enum fs_value_type;
91	91	struct watch;

		@@ -315,8 +315,8 @@
315	315	}
316	316	#endif /* CONFIG_SECURITY_PATH */
317	317
318		---- linux-5.15.2.orig/include/net/ip.h
319		-+++ linux-5.15.2/include/net/ip.h
	318	+--- linux-5.15.7.orig/include/net/ip.h
	319	++++ linux-5.15.7/include/net/ip.h
320	320	@@ -339,6 +339,8 @@ void inet_get_local_port_range(struct ne
321	321	#ifdef CONFIG_SYSCTL
322	322	static inline bool inet_is_local_reserved_port(struct net *net, unsigned short port)

		@@ -335,8 +335,8 @@
335	335	return false;
336	336	}
337	337
338		---- linux-5.15.2.orig/init/init_task.c
339		-+++ linux-5.15.2/init/init_task.c
	338	+--- linux-5.15.7.orig/init/init_task.c
	339	++++ linux-5.15.7/init/init_task.c
340	340	@@ -214,6 +214,10 @@ struct task_struct init_task
341	341	#ifdef CONFIG_SECCOMP_FILTER
342	342	.seccomp = { .filter_count = ATOMIC_INIT(0) },

		@@ -348,8 +348,8 @@
348	348	};
349	349	EXPORT_SYMBOL(init_task);
350	350
351		---- linux-5.15.2.orig/kernel/kexec.c
352		-+++ linux-5.15.2/kernel/kexec.c
	351	+--- linux-5.15.7.orig/kernel/kexec.c
	352	++++ linux-5.15.7/kernel/kexec.c
353	353	@@ -16,7 +16,7 @@
354	354	#include <linux/syscalls.h>
355	355	#include <linux/vmalloc.h>

		@@ -368,8 +368,8 @@
368	368
369	369	/* Permit LSMs and IMA to fail the kexec */
370	370	result = security_kernel_load_data(LOADING_KEXEC_IMAGE, false);
371		---- linux-5.15.2.orig/kernel/module.c
372		-+++ linux-5.15.2/kernel/module.c
	371	+--- linux-5.15.7.orig/kernel/module.c
	372	++++ linux-5.15.7/kernel/module.c
373	373	@@ -59,6 +59,7 @@
374	374	#include <linux/audit.h>
375	375	#include <uapi/linux/module.h>

		@@ -396,8 +396,8 @@
396	396
397	397	return 0;
398	398	}
399		---- linux-5.15.2.orig/kernel/ptrace.c
400		-+++ linux-5.15.2/kernel/ptrace.c
	399	+--- linux-5.15.7.orig/kernel/ptrace.c
	400	++++ linux-5.15.7/kernel/ptrace.c
401	401	@@ -1279,6 +1279,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
402	402	{
403	403	struct task_struct *child;

		@@ -422,8 +422,8 @@
422	422
423	423	if (request == PTRACE_TRACEME) {
424	424	ret = ptrace_traceme();
425		---- linux-5.15.2.orig/kernel/reboot.c
426		-+++ linux-5.15.2/kernel/reboot.c
	425	+--- linux-5.15.7.orig/kernel/reboot.c
	426	++++ linux-5.15.7/kernel/reboot.c
427	427	@@ -18,6 +18,7 @@
428	428	#include <linux/syscalls.h>
429	429	#include <linux/syscore_ops.h>

		@@ -441,9 +441,9 @@
441	441
442	442	/*
443	443	* If pid namespaces are enabled and the current task is in a child
444		---- linux-5.15.2.orig/kernel/sched/core.c
445		-+++ linux-5.15.2/kernel/sched/core.c
446		-@@ -6944,6 +6944,8 @@ int can_nice(const struct task_struct *p
	444	+--- linux-5.15.7.orig/kernel/sched/core.c
	445	++++ linux-5.15.7/kernel/sched/core.c
	446	+@@ -6948,6 +6948,8 @@ int can_nice(const struct task_struct *p
447	447	SYSCALL_DEFINE1(nice, int, increment)
448	448	{
449	449	long nice, retval;

		@@ -452,9 +452,9 @@
452	452
453	453	/*
454	454	* Setpriority might change our priority at the same moment.
455		---- linux-5.15.2.orig/kernel/signal.c
456		-+++ linux-5.15.2/kernel/signal.c
457		-@@ -3764,6 +3764,8 @@ static inline void prepare_kill_siginfo(
	455	+--- linux-5.15.7.orig/kernel/signal.c
	456	++++ linux-5.15.7/kernel/signal.c
	457	+@@ -3786,6 +3786,8 @@ static inline void prepare_kill_siginfo(
458	458	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
459	459	{
460	460	struct kernel_siginfo info;

		@@ -463,7 +463,7 @@
463	463
464	464	prepare_kill_siginfo(sig, &info);
465	465
466		-@@ -3863,6 +3865,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int,
	466	+@@ -3885,6 +3887,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int,
467	467	if (!access_pidfd_pidns(pid))
468	468	goto err;
469	469

		@@ -485,7 +485,7 @@
485	485	if (info) {
486	486	ret = copy_siginfo_from_user_any(&kinfo, info);
487	487	if (unlikely(ret))
488		-@@ -3947,6 +3964,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
	488	+@@ -3969,6 +3986,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
489	489	/* This is only valid for single tasks */
490	490	if (pid <= 0 \|\| tgid <= 0)
491	491	return -EINVAL;

		@@ -494,7 +494,7 @@
494	494
495	495	return do_tkill(tgid, pid, sig);
496	496	}
497		-@@ -3963,6 +3982,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
	497	+@@ -3985,6 +4004,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
498	498	/* This is only valid for single tasks */
499	499	if (pid <= 0)
500	500	return -EINVAL;

		@@ -503,7 +503,7 @@
503	503
504	504	return do_tkill(0, pid, sig);
505	505	}
506		-@@ -3975,6 +3996,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
	506	+@@ -3997,6 +4018,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
507	507	if ((info->si_code >= 0 \|\| info->si_code == SI_TKILL) &&
508	508	(task_pid_vnr(current) != pid))
509	509	return -EPERM;

		@@ -512,7 +512,7 @@
512	512
513	513	/* POSIX.1b doesn't mention process groups. */
514	514	return kill_proc_info(sig, info, pid);
515		-@@ -4022,6 +4045,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
	515	+@@ -4044,6 +4067,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
516	516	if ((info->si_code >= 0 \|\| info->si_code == SI_TKILL) &&
517	517	(task_pid_vnr(current) != pid))
518	518	return -EPERM;

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

		@@ -552,8 +552,8 @@
552	552
553	553	errno = -EFAULT;
554	554	if (!copy_from_user(tmp, name, len)) {
555		---- linux-5.15.2.orig/kernel/time/timekeeping.c
556		-+++ linux-5.15.2/kernel/time/timekeeping.c
	555	+--- linux-5.15.7.orig/kernel/time/timekeeping.c
	556	++++ linux-5.15.7/kernel/time/timekeeping.c
557	557	@@ -22,6 +22,7 @@
558	558	#include <linux/pvclock_gtod.h>
559	559	#include <linux/compiler.h>

		@@ -587,8 +587,8 @@
587	587
588	588	/*
589	589	* Validate if a timespec/timeval used to inject a time
590		---- linux-5.15.2.orig/net/ipv4/raw.c
591		-+++ linux-5.15.2/net/ipv4/raw.c
	590	+--- linux-5.15.7.orig/net/ipv4/raw.c
	591	++++ linux-5.15.7/net/ipv4/raw.c
592	592	@@ -768,6 +768,10 @@ static int raw_recvmsg(struct sock *sk,
593	593	skb = skb_recv_datagram(sk, flags, noblock, &err);
594	594	if (!skb)

		@@ -600,9 +600,9 @@
600	600
601	601	copied = skb->len;
602	602	if (len < copied) {
603		---- linux-5.15.2.orig/net/ipv4/udp.c
604		-+++ linux-5.15.2/net/ipv4/udp.c
605		-@@ -1851,6 +1851,8 @@ try_again:
	603	+--- linux-5.15.7.orig/net/ipv4/udp.c
	604	++++ linux-5.15.7/net/ipv4/udp.c
	605	+@@ -1862,6 +1862,8 @@ try_again:
606	606	skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
607	607	if (!skb)
608	608	return err;

		@@ -611,8 +611,8 @@
611	611
612	612	ulen = udp_skb_len(skb);
613	613	copied = len;
614		---- linux-5.15.2.orig/net/ipv6/raw.c
615		-+++ linux-5.15.2/net/ipv6/raw.c
	614	+--- linux-5.15.7.orig/net/ipv6/raw.c
	615	++++ linux-5.15.7/net/ipv6/raw.c
616	616	@@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk
617	617	skb = skb_recv_datagram(sk, flags, noblock, &err);
618	618	if (!skb)

		@@ -624,8 +624,8 @@
624	624
625	625	copied = skb->len;
626	626	if (copied > len) {
627		---- linux-5.15.2.orig/net/ipv6/udp.c
628		-+++ linux-5.15.2/net/ipv6/udp.c
	627	+--- linux-5.15.7.orig/net/ipv6/udp.c
	628	++++ linux-5.15.7/net/ipv6/udp.c
629	629	@@ -343,6 +343,8 @@ try_again:
630	630	skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
631	631	if (!skb)

		@@ -635,8 +635,8 @@
635	635
636	636	ulen = udp6_skb_len(skb);
637	637	copied = len;
638		---- linux-5.15.2.orig/net/socket.c
639		-+++ linux-5.15.2/net/socket.c
	638	+--- linux-5.15.7.orig/net/socket.c
	639	++++ linux-5.15.7/net/socket.c
640	640	@@ -1775,6 +1775,10 @@ struct file do_accept(struct file file
641	641	if (err < 0)
642	642	goto out_fd;

		@@ -648,8 +648,8 @@
648	648	if (upeer_sockaddr) {
649	649	len = newsock->ops->getname(newsock,
650	650	(struct sockaddr *)&address, 2);
651		---- linux-5.15.2.orig/net/unix/af_unix.c
652		-+++ linux-5.15.2/net/unix/af_unix.c
	651	+--- linux-5.15.7.orig/net/unix/af_unix.c
	652	++++ linux-5.15.7/net/unix/af_unix.c
653	653	@@ -2331,6 +2331,10 @@ int __unix_dgram_recvmsg(struct sock *sk
654	654	EPOLLOUT \| EPOLLWRNORM \|
655	655	EPOLLWRBAND);

		@@ -669,9 +669,9 @@
669	669	mutex_unlock(&u->iolock);
670	670	out:
671	671	return err;
672		---- linux-5.15.2.orig/security/Kconfig
673		-+++ linux-5.15.2/security/Kconfig
674		-@@ -292,5 +292,7 @@ config LSM
	672	+--- linux-5.15.7.orig/security/Kconfig
	673	++++ linux-5.15.7/security/Kconfig
	674	+@@ -295,5 +295,7 @@ config LSM
675	675
676	676	source "security/Kconfig.hardening"
677	677

		@@ -679,8 +679,8 @@
679	679	+
680	680	endmenu
681	681
682		---- linux-5.15.2.orig/security/Makefile
683		-+++ linux-5.15.2/security/Makefile
	682	+--- linux-5.15.7.orig/security/Makefile
	683	++++ linux-5.15.7/security/Makefile
684	684	@@ -27,3 +27,6 @@ obj-$(CONFIG_SECURITY_LANDLOCK) += land
685	685
686	686	# Object integrity file lists

		@@ -688,8 +688,8 @@
688	688	+
689	689	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
690	690	+obj-$(CONFIG_CCSECURITY) += ccsecurity/
691		---- linux-5.15.2.orig/security/security.c
692		-+++ linux-5.15.2/security/security.c
	691	+--- linux-5.15.7.orig/security/security.c
	692	++++ linux-5.15.7/security/security.c
693	693	@@ -1644,7 +1644,9 @@ int security_task_alloc(struct task_stru
694	694
695	695	if (rc)

--- trunk/caitsith-patch/patches/ccs-patch-5.16.diff (revision 361)

+++ trunk/caitsith-patch/patches/ccs-patch-5.16.diff (revision 362)

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

		@@ -28,8 +28,8 @@
28	28	security/security.c \| 5 ++-
29	29	24 files changed, 160 insertions(+), 30 deletions(-)
30	30
31		---- linux-5.16-rc1.orig/fs/exec.c
32		-+++ linux-5.16-rc1/fs/exec.c
	31	+--- linux-5.16-rc4.orig/fs/exec.c
	32	++++ linux-5.16-rc4/fs/exec.c
33	33	@@ -1830,7 +1830,7 @@ static int bprm_execve(struct linux_binp
34	34	if (retval)
35	35	goto out;

		@@ -39,8 +39,8 @@
39	39	if (retval < 0)
40	40	goto out;
41	41
42		---- linux-5.16-rc1.orig/fs/open.c
43		-+++ linux-5.16-rc1/fs/open.c
	42	+--- linux-5.16-rc4.orig/fs/open.c
	43	++++ linux-5.16-rc4/fs/open.c
44	44	@@ -1373,6 +1373,8 @@ SYSCALL_DEFINE3(close_range, unsigned in
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-5.16-rc1.orig/fs/proc/version.c
54		-+++ linux-5.16-rc1/fs/proc/version.c
	53	+--- linux-5.16-rc4.orig/fs/proc/version.c
	54	++++ linux-5.16-rc4/fs/proc/version.c
55	55	@@ -21,3 +21,10 @@ static int __init proc_version_init(void
56	56	return 0;
57	57	}

		@@ -59,12 +59,12 @@
59	59	+
60	60	+static int __init ccs_show_version(void)
61	61	+{
62		-+ printk(KERN_INFO "Hook version: 5.16-rc1 2021/11/15\n");
	62	++ printk(KERN_INFO "Hook version: 5.16-rc4 2021/12/12\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.16-rc1.orig/include/linux/sched.h
67		-+++ linux-5.16-rc1/include/linux/sched.h
	66	+--- linux-5.16-rc4.orig/include/linux/sched.h
	67	++++ linux-5.16-rc4/include/linux/sched.h
68	68	@@ -44,6 +44,7 @@ struct blk_plug;
69	69	struct bpf_local_storage;
70	70	struct bpf_run_ctx;

		@@ -84,8 +84,8 @@
84	84
85	85	#ifdef CONFIG_TRACING
86	86	/* State flags for use by tracers: */
87		---- linux-5.16-rc1.orig/include/linux/security.h
88		-+++ linux-5.16-rc1/include/linux/security.h
	87	+--- linux-5.16-rc4.orig/include/linux/security.h
	88	++++ linux-5.16-rc4/include/linux/security.h
89	89	@@ -59,6 +59,7 @@ struct fs_parameter;
90	90	enum fs_value_type;
91	91	struct watch;

		@@ -315,8 +315,8 @@
315	315	}
316	316	#endif /* CONFIG_SECURITY_PATH */
317	317
318		---- linux-5.16-rc1.orig/include/net/ip.h
319		-+++ linux-5.16-rc1/include/net/ip.h
	318	+--- linux-5.16-rc4.orig/include/net/ip.h
	319	++++ linux-5.16-rc4/include/net/ip.h
320	320	@@ -344,6 +344,8 @@ void inet_get_local_port_range(struct ne
321	321	#ifdef CONFIG_SYSCTL
322	322	static inline bool inet_is_local_reserved_port(struct net *net, unsigned short port)

		@@ -335,8 +335,8 @@
335	335	return false;
336	336	}
337	337
338		---- linux-5.16-rc1.orig/init/init_task.c
339		-+++ linux-5.16-rc1/init/init_task.c
	338	+--- linux-5.16-rc4.orig/init/init_task.c
	339	++++ linux-5.16-rc4/init/init_task.c
340	340	@@ -214,6 +214,10 @@ struct task_struct init_task
341	341	#ifdef CONFIG_SECCOMP_FILTER
342	342	.seccomp = { .filter_count = ATOMIC_INIT(0) },

		@@ -348,8 +348,8 @@
348	348	};
349	349	EXPORT_SYMBOL(init_task);
350	350
351		---- linux-5.16-rc1.orig/kernel/kexec.c
352		-+++ linux-5.16-rc1/kernel/kexec.c
	351	+--- linux-5.16-rc4.orig/kernel/kexec.c
	352	++++ linux-5.16-rc4/kernel/kexec.c
353	353	@@ -16,7 +16,7 @@
354	354	#include <linux/syscalls.h>
355	355	#include <linux/vmalloc.h>

		@@ -368,8 +368,8 @@
368	368
369	369	/* Permit LSMs and IMA to fail the kexec */
370	370	result = security_kernel_load_data(LOADING_KEXEC_IMAGE, false);
371		---- linux-5.16-rc1.orig/kernel/module.c
372		-+++ linux-5.16-rc1/kernel/module.c
	371	+--- linux-5.16-rc4.orig/kernel/module.c
	372	++++ linux-5.16-rc4/kernel/module.c
373	373	@@ -59,6 +59,7 @@
374	374	#include <linux/audit.h>
375	375	#include <uapi/linux/module.h>

		@@ -396,8 +396,8 @@
396	396
397	397	return 0;
398	398	}
399		---- linux-5.16-rc1.orig/kernel/ptrace.c
400		-+++ linux-5.16-rc1/kernel/ptrace.c
	399	+--- linux-5.16-rc4.orig/kernel/ptrace.c
	400	++++ linux-5.16-rc4/kernel/ptrace.c
401	401	@@ -1279,6 +1279,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
402	402	{
403	403	struct task_struct *child;

		@@ -422,8 +422,8 @@
422	422
423	423	if (request == PTRACE_TRACEME) {
424	424	ret = ptrace_traceme();
425		---- linux-5.16-rc1.orig/kernel/reboot.c
426		-+++ linux-5.16-rc1/kernel/reboot.c
	425	+--- linux-5.16-rc4.orig/kernel/reboot.c
	426	++++ linux-5.16-rc4/kernel/reboot.c
427	427	@@ -18,6 +18,7 @@
428	428	#include <linux/syscalls.h>
429	429	#include <linux/syscore_ops.h>

		@@ -441,8 +441,8 @@
441	441
442	442	/*
443	443	* If pid namespaces are enabled and the current task is in a child
444		---- linux-5.16-rc1.orig/kernel/sched/core.c
445		-+++ linux-5.16-rc1/kernel/sched/core.c
	444	+--- linux-5.16-rc4.orig/kernel/sched/core.c
	445	++++ linux-5.16-rc4/kernel/sched/core.c
446	446	@@ -6925,6 +6925,8 @@ int can_nice(const struct task_struct *p
447	447	SYSCALL_DEFINE1(nice, int, increment)
448	448	{

		@@ -452,9 +452,9 @@
452	452
453	453	/*
454	454	* Setpriority might change our priority at the same moment.
455		---- linux-5.16-rc1.orig/kernel/signal.c
456		-+++ linux-5.16-rc1/kernel/signal.c
457		-@@ -3739,6 +3739,8 @@ static inline void prepare_kill_siginfo(
	455	+--- linux-5.16-rc4.orig/kernel/signal.c
	456	++++ linux-5.16-rc4/kernel/signal.c
	457	+@@ -3761,6 +3761,8 @@ static inline void prepare_kill_siginfo(
458	458	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
459	459	{
460	460	struct kernel_siginfo info;

		@@ -463,7 +463,7 @@
463	463
464	464	prepare_kill_siginfo(sig, &info);
465	465
466		-@@ -3838,6 +3840,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int,
	466	+@@ -3860,6 +3862,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int,
467	467	if (!access_pidfd_pidns(pid))
468	468	goto err;
469	469

		@@ -485,7 +485,7 @@
485	485	if (info) {
486	486	ret = copy_siginfo_from_user_any(&kinfo, info);
487	487	if (unlikely(ret))
488		-@@ -3922,6 +3939,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
	488	+@@ -3944,6 +3961,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
489	489	/* This is only valid for single tasks */
490	490	if (pid <= 0 \|\| tgid <= 0)
491	491	return -EINVAL;

		@@ -494,7 +494,7 @@
494	494
495	495	return do_tkill(tgid, pid, sig);
496	496	}
497		-@@ -3938,6 +3957,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
	497	+@@ -3960,6 +3979,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
498	498	/* This is only valid for single tasks */
499	499	if (pid <= 0)
500	500	return -EINVAL;

		@@ -503,7 +503,7 @@
503	503
504	504	return do_tkill(0, pid, sig);
505	505	}
506		-@@ -3950,6 +3971,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
	506	+@@ -3972,6 +3993,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
507	507	if ((info->si_code >= 0 \|\| info->si_code == SI_TKILL) &&
508	508	(task_pid_vnr(current) != pid))
509	509	return -EPERM;

		@@ -512,7 +512,7 @@
512	512
513	513	/* POSIX.1b doesn't mention process groups. */
514	514	return kill_proc_info(sig, info, pid);
515		-@@ -3997,6 +4020,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
	515	+@@ -4019,6 +4042,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
516	516	if ((info->si_code >= 0 \|\| info->si_code == SI_TKILL) &&
517	517	(task_pid_vnr(current) != pid))
518	518	return -EPERM;

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

		@@ -552,8 +552,8 @@
552	552
553	553	errno = -EFAULT;
554	554	if (!copy_from_user(tmp, name, len)) {
555		---- linux-5.16-rc1.orig/kernel/time/timekeeping.c
556		-+++ linux-5.16-rc1/kernel/time/timekeeping.c
	555	+--- linux-5.16-rc4.orig/kernel/time/timekeeping.c
	556	++++ linux-5.16-rc4/kernel/time/timekeeping.c
557	557	@@ -22,6 +22,7 @@
558	558	#include <linux/pvclock_gtod.h>
559	559	#include <linux/compiler.h>

		@@ -587,8 +587,8 @@
587	587
588	588	/*
589	589	* Validate if a timespec/timeval used to inject a time
590		---- linux-5.16-rc1.orig/net/ipv4/raw.c
591		-+++ linux-5.16-rc1/net/ipv4/raw.c
	590	+--- linux-5.16-rc4.orig/net/ipv4/raw.c
	591	++++ linux-5.16-rc4/net/ipv4/raw.c
592	592	@@ -768,6 +768,10 @@ static int raw_recvmsg(struct sock *sk,
593	593	skb = skb_recv_datagram(sk, flags, noblock, &err);
594	594	if (!skb)

		@@ -600,9 +600,9 @@
600	600
601	601	copied = skb->len;
602	602	if (len < copied) {
603		---- linux-5.16-rc1.orig/net/ipv4/udp.c
604		-+++ linux-5.16-rc1/net/ipv4/udp.c
605		-@@ -1850,6 +1850,8 @@ try_again:
	603	+--- linux-5.16-rc4.orig/net/ipv4/udp.c
	604	++++ linux-5.16-rc4/net/ipv4/udp.c
	605	+@@ -1861,6 +1861,8 @@ try_again:
606	606	skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
607	607	if (!skb)
608	608	return err;

		@@ -611,8 +611,8 @@
611	611
612	612	ulen = udp_skb_len(skb);
613	613	copied = len;
614		---- linux-5.16-rc1.orig/net/ipv6/raw.c
615		-+++ linux-5.16-rc1/net/ipv6/raw.c
	614	+--- linux-5.16-rc4.orig/net/ipv6/raw.c
	615	++++ linux-5.16-rc4/net/ipv6/raw.c
616	616	@@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk
617	617	skb = skb_recv_datagram(sk, flags, noblock, &err);
618	618	if (!skb)

		@@ -624,8 +624,8 @@
624	624
625	625	copied = skb->len;
626	626	if (copied > len) {
627		---- linux-5.16-rc1.orig/net/ipv6/udp.c
628		-+++ linux-5.16-rc1/net/ipv6/udp.c
	627	+--- linux-5.16-rc4.orig/net/ipv6/udp.c
	628	++++ linux-5.16-rc4/net/ipv6/udp.c
629	629	@@ -343,6 +343,8 @@ try_again:
630	630	skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
631	631	if (!skb)

		@@ -635,8 +635,8 @@
635	635
636	636	ulen = udp6_skb_len(skb);
637	637	copied = len;
638		---- linux-5.16-rc1.orig/net/socket.c
639		-+++ linux-5.16-rc1/net/socket.c
	638	+--- linux-5.16-rc4.orig/net/socket.c
	639	++++ linux-5.16-rc4/net/socket.c
640	640	@@ -1775,6 +1775,10 @@ struct file do_accept(struct file file
641	641	if (err < 0)
642	642	goto out_fd;

		@@ -648,8 +648,8 @@
648	648	if (upeer_sockaddr) {
649	649	len = newsock->ops->getname(newsock,
650	650	(struct sockaddr *)&address, 2);
651		---- linux-5.16-rc1.orig/net/unix/af_unix.c
652		-+++ linux-5.16-rc1/net/unix/af_unix.c
	651	+--- linux-5.16-rc4.orig/net/unix/af_unix.c
	652	++++ linux-5.16-rc4/net/unix/af_unix.c
653	653	@@ -2331,6 +2331,10 @@ int __unix_dgram_recvmsg(struct sock *sk
654	654	EPOLLOUT \| EPOLLWRNORM \|
655	655	EPOLLWRBAND);

		@@ -669,8 +669,8 @@
669	669	mutex_unlock(&u->iolock);
670	670	out:
671	671	return err;
672		---- linux-5.16-rc1.orig/security/Kconfig
673		-+++ linux-5.16-rc1/security/Kconfig
	672	+--- linux-5.16-rc4.orig/security/Kconfig
	673	++++ linux-5.16-rc4/security/Kconfig
674	674	@@ -281,5 +281,7 @@ config LSM
675	675
676	676	source "security/Kconfig.hardening"

		@@ -679,8 +679,8 @@
679	679	+
680	680	endmenu
681	681
682		---- linux-5.16-rc1.orig/security/Makefile
683		-+++ linux-5.16-rc1/security/Makefile
	682	+--- linux-5.16-rc4.orig/security/Makefile
	683	++++ linux-5.16-rc4/security/Makefile
684	684	@@ -27,3 +27,6 @@ obj-$(CONFIG_SECURITY_LANDLOCK) += land
685	685
686	686	# Object integrity file lists

		@@ -688,8 +688,8 @@
688	688	+
689	689	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
690	690	+obj-$(CONFIG_CCSECURITY) += ccsecurity/
691		---- linux-5.16-rc1.orig/security/security.c
692		-+++ linux-5.16-rc1/security/security.c
	691	+--- linux-5.16-rc4.orig/security/security.c
	692	++++ linux-5.16-rc4/security/security.c
693	693	@@ -1645,7 +1645,9 @@ int security_task_alloc(struct task_stru
694	694
695	695	if (rc)

--- trunk/caitsith-patch/patches/ccs-patch-5.4.diff (revision 361)

+++ trunk/caitsith-patch/patches/ccs-patch-5.4.diff (revision 362)

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

		@@ -28,8 +28,8 @@
28	28	security/security.c \| 5 ++-
29	29	24 files changed, 160 insertions(+), 30 deletions(-)
30	30
31		---- linux-5.4.159.orig/fs/exec.c
32		-+++ linux-5.4.159/fs/exec.c
	31	+--- linux-5.4.164.orig/fs/exec.c
	32	++++ linux-5.4.164/fs/exec.c
33	33	@@ -1730,7 +1730,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-5.4.159.orig/fs/open.c
43		-+++ linux-5.4.159/fs/open.c
	42	+--- linux-5.4.164.orig/fs/open.c
	43	++++ linux-5.4.164/fs/open.c
44	44	@@ -1205,6 +1205,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd)
45	45	*/
46	46	SYSCALL_DEFINE0(vhangup)

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

		@@ -59,12 +59,12 @@
59	59	+
60	60	+static int __init ccs_show_version(void)
61	61	+{
62		-+ printk(KERN_INFO "Hook version: 5.4.159 2021/11/15\n");
	62	++ printk(KERN_INFO "Hook version: 5.4.164 2021/12/12\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.4.159.orig/include/linux/sched.h
67		-+++ linux-5.4.159/include/linux/sched.h
	66	+--- linux-5.4.164.orig/include/linux/sched.h
	67	++++ linux-5.4.164/include/linux/sched.h
68	68	@@ -38,6 +38,7 @@ struct backing_dev_info;
69	69	struct bio_list;
70	70	struct blk_plug;

		@@ -84,8 +84,8 @@
84	84
85	85	#ifdef CONFIG_GCC_PLUGIN_STACKLEAK
86	86	unsigned long lowest_stack;
87		---- linux-5.4.159.orig/include/linux/security.h
88		-+++ linux-5.4.159/include/linux/security.h
	87	+--- linux-5.4.164.orig/include/linux/security.h
	88	++++ linux-5.4.164/include/linux/security.h
89	89	@@ -57,6 +57,7 @@ struct mm_struct;
90	90	struct fs_context;
91	91	struct fs_parameter;

		@@ -187,7 +187,7 @@
187	187
188	188	static inline int security_cred_alloc_blank(struct cred *cred, gfp_t gfp)
189	189	{
190		-@@ -1342,7 +1348,7 @@ static inline int security_unix_may_send
	190	+@@ -1347,7 +1353,7 @@ static inline int security_unix_may_send
191	191	static inline int security_socket_create(int family, int type,
192	192	int protocol, int kern)
193	193	{

		@@ -196,7 +196,7 @@
196	196	}
197	197
198	198	static inline int security_socket_post_create(struct socket *sock,
199		-@@ -1363,19 +1369,19 @@ static inline int security_socket_bind(s
	199	+@@ -1368,19 +1374,19 @@ static inline int security_socket_bind(s
200	200	struct sockaddr *address,
201	201	int addrlen)
202	202	{

		@@ -219,7 +219,7 @@
219	219	}
220	220
221	221	static inline int security_socket_accept(struct socket *sock,
222		-@@ -1387,7 +1393,7 @@ static inline int security_socket_accept
	222	+@@ -1392,7 +1398,7 @@ static inline int security_socket_accept
223	223	static inline int security_socket_sendmsg(struct socket *sock,
224	224	struct msghdr *msg, int size)
225	225	{

		@@ -228,7 +228,7 @@
228	228	}
229	229
230	230	static inline int security_socket_recvmsg(struct socket *sock,
231		-@@ -1674,42 +1680,42 @@ int security_path_chroot(const struct pa
	231	+@@ -1679,42 +1685,42 @@ int security_path_chroot(const struct pa
232	232	#else /* CONFIG_SECURITY_PATH */
233	233	static inline int security_path_unlink(const struct path dir, struct dentry dentry)
234	234	{

		@@ -278,7 +278,7 @@
278	278	}
279	279
280	280	static inline int security_path_rename(const struct path *old_dir,
281		-@@ -1718,22 +1724,32 @@ static inline int security_path_rename(c
	281	+@@ -1723,22 +1729,32 @@ static inline int security_path_rename(c
282	282	struct dentry *new_dentry,
283	283	unsigned int flags)
284	284	{

		@@ -315,8 +315,8 @@
315	315	}
316	316	#endif /* CONFIG_SECURITY_PATH */
317	317
318		---- linux-5.4.159.orig/include/net/ip.h
319		-+++ linux-5.4.159/include/net/ip.h
	318	+--- linux-5.4.164.orig/include/net/ip.h
	319	++++ linux-5.4.164/include/net/ip.h
320	320	@@ -342,6 +342,8 @@ void inet_get_local_port_range(struct ne
321	321	#ifdef CONFIG_SYSCTL
322	322	static inline int inet_is_local_reserved_port(struct net *net, int port)

		@@ -335,8 +335,8 @@
335	335	return 0;
336	336	}
337	337
338		---- linux-5.4.159.orig/init/init_task.c
339		-+++ linux-5.4.159/init/init_task.c
	338	+--- linux-5.4.164.orig/init/init_task.c
	339	++++ linux-5.4.164/init/init_task.c
340	340	@@ -183,6 +183,10 @@ struct task_struct init_task
341	341	#ifdef CONFIG_SECURITY
342	342	.security = NULL,

		@@ -348,8 +348,8 @@
348	348	};
349	349	EXPORT_SYMBOL(init_task);
350	350
351		---- linux-5.4.159.orig/kernel/kexec.c
352		-+++ linux-5.4.159/kernel/kexec.c
	351	+--- linux-5.4.164.orig/kernel/kexec.c
	352	++++ linux-5.4.164/kernel/kexec.c
353	353	@@ -16,7 +16,7 @@
354	354	#include <linux/syscalls.h>
355	355	#include <linux/vmalloc.h>

		@@ -368,8 +368,8 @@
368	368
369	369	/* Permit LSMs and IMA to fail the kexec */
370	370	result = security_kernel_load_data(LOADING_KEXEC_IMAGE);
371		---- linux-5.4.159.orig/kernel/module.c
372		-+++ linux-5.4.159/kernel/module.c
	371	+--- linux-5.4.164.orig/kernel/module.c
	372	++++ linux-5.4.164/kernel/module.c
373	373	@@ -55,6 +55,7 @@
374	374	#include <linux/audit.h>
375	375	#include <uapi/linux/module.h>

		@@ -396,8 +396,8 @@
396	396
397	397	return 0;
398	398	}
399		---- linux-5.4.159.orig/kernel/ptrace.c
400		-+++ linux-5.4.159/kernel/ptrace.c
	399	+--- linux-5.4.164.orig/kernel/ptrace.c
	400	++++ linux-5.4.164/kernel/ptrace.c
401	401	@@ -1254,6 +1254,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
402	402	{
403	403	struct task_struct *child;

		@@ -422,8 +422,8 @@
422	422
423	423	if (request == PTRACE_TRACEME) {
424	424	ret = ptrace_traceme();
425		---- linux-5.4.159.orig/kernel/reboot.c
426		-+++ linux-5.4.159/kernel/reboot.c
	425	+--- linux-5.4.164.orig/kernel/reboot.c
	426	++++ linux-5.4.164/kernel/reboot.c
427	427	@@ -17,6 +17,7 @@
428	428	#include <linux/syscalls.h>
429	429	#include <linux/syscore_ops.h>

		@@ -441,9 +441,9 @@
441	441
442	442	/*
443	443	* If pid namespaces are enabled and the current task is in a child
444		---- linux-5.4.159.orig/kernel/sched/core.c
445		-+++ linux-5.4.159/kernel/sched/core.c
446		-@@ -4674,6 +4674,8 @@ int can_nice(const struct task_struct *p
	444	+--- linux-5.4.164.orig/kernel/sched/core.c
	445	++++ linux-5.4.164/kernel/sched/core.c
	446	+@@ -4677,6 +4677,8 @@ int can_nice(const struct task_struct *p
447	447	SYSCALL_DEFINE1(nice, int, increment)
448	448	{
449	449	long nice, retval;

		@@ -452,9 +452,9 @@
452	452
453	453	/*
454	454	* Setpriority might change our priority at the same moment.
455		---- linux-5.4.159.orig/kernel/signal.c
456		-+++ linux-5.4.159/kernel/signal.c
457		-@@ -3644,6 +3644,8 @@ static inline void prepare_kill_siginfo(
	455	+--- linux-5.4.164.orig/kernel/signal.c
	456	++++ linux-5.4.164/kernel/signal.c
	457	+@@ -3634,6 +3634,8 @@ static inline void prepare_kill_siginfo(
458	458	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
459	459	{
460	460	struct kernel_siginfo info;

		@@ -463,7 +463,7 @@
463	463
464	464	prepare_kill_siginfo(sig, &info);
465	465
466		-@@ -3742,6 +3744,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int,
	466	+@@ -3732,6 +3734,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int,
467	467	if (!access_pidfd_pidns(pid))
468	468	goto err;
469	469

		@@ -485,7 +485,7 @@
485	485	if (info) {
486	486	ret = copy_siginfo_from_user_any(&kinfo, info);
487	487	if (unlikely(ret))
488		-@@ -3826,6 +3843,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
	488	+@@ -3816,6 +3833,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
489	489	/* This is only valid for single tasks */
490	490	if (pid <= 0 \|\| tgid <= 0)
491	491	return -EINVAL;

		@@ -494,7 +494,7 @@
494	494
495	495	return do_tkill(tgid, pid, sig);
496	496	}
497		-@@ -3842,6 +3861,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
	497	+@@ -3832,6 +3851,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
498	498	/* This is only valid for single tasks */
499	499	if (pid <= 0)
500	500	return -EINVAL;

		@@ -503,7 +503,7 @@
503	503
504	504	return do_tkill(0, pid, sig);
505	505	}
506		-@@ -3854,6 +3875,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
	506	+@@ -3844,6 +3865,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
507	507	if ((info->si_code >= 0 \|\| info->si_code == SI_TKILL) &&
508	508	(task_pid_vnr(current) != pid))
509	509	return -EPERM;

		@@ -512,7 +512,7 @@
512	512
513	513	/* POSIX.1b doesn't mention process groups. */
514	514	return kill_proc_info(sig, info, pid);
515		-@@ -3901,6 +3924,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
	515	+@@ -3891,6 +3914,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
516	516	if ((info->si_code >= 0 \|\| info->si_code == SI_TKILL) &&
517	517	(task_pid_vnr(current) != pid))
518	518	return -EPERM;

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

		@@ -552,8 +552,8 @@
552	552
553	553	errno = -EFAULT;
554	554	if (!copy_from_user(tmp, name, len)) {
555		---- linux-5.4.159.orig/kernel/time/timekeeping.c
556		-+++ linux-5.4.159/kernel/time/timekeeping.c
	555	+--- linux-5.4.164.orig/kernel/time/timekeeping.c
	556	++++ linux-5.4.164/kernel/time/timekeeping.c
557	557	@@ -22,6 +22,7 @@
558	558	#include <linux/pvclock_gtod.h>
559	559	#include <linux/compiler.h>

		@@ -587,8 +587,8 @@
587	587
588	588	/*
589	589	* Validate if a timespec/timeval used to inject a time
590		---- linux-5.4.159.orig/net/ipv4/raw.c
591		-+++ linux-5.4.159/net/ipv4/raw.c
	590	+--- linux-5.4.164.orig/net/ipv4/raw.c
	591	++++ linux-5.4.164/net/ipv4/raw.c
592	592	@@ -767,6 +767,10 @@ static int raw_recvmsg(struct sock *sk,
593	593	skb = skb_recv_datagram(sk, flags, noblock, &err);
594	594	if (!skb)

		@@ -600,8 +600,8 @@
600	600
601	601	copied = skb->len;
602	602	if (len < copied) {
603		---- linux-5.4.159.orig/net/ipv4/udp.c
604		-+++ linux-5.4.159/net/ipv4/udp.c
	603	+--- linux-5.4.164.orig/net/ipv4/udp.c
	604	++++ linux-5.4.164/net/ipv4/udp.c
605	605	@@ -1745,6 +1745,8 @@ try_again:
606	606	skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
607	607	if (!skb)

		@@ -611,8 +611,8 @@
611	611
612	612	ulen = udp_skb_len(skb);
613	613	copied = len;
614		---- linux-5.4.159.orig/net/ipv6/raw.c
615		-+++ linux-5.4.159/net/ipv6/raw.c
	614	+--- linux-5.4.164.orig/net/ipv6/raw.c
	615	++++ linux-5.4.164/net/ipv6/raw.c
616	616	@@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk
617	617	skb = skb_recv_datagram(sk, flags, noblock, &err);
618	618	if (!skb)

		@@ -624,8 +624,8 @@
624	624
625	625	copied = skb->len;
626	626	if (copied > len) {
627		---- linux-5.4.159.orig/net/ipv6/udp.c
628		-+++ linux-5.4.159/net/ipv6/udp.c
	627	+--- linux-5.4.164.orig/net/ipv6/udp.c
	628	++++ linux-5.4.164/net/ipv6/udp.c
629	629	@@ -292,6 +292,8 @@ try_again:
630	630	skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
631	631	if (!skb)

		@@ -635,8 +635,8 @@
635	635
636	636	ulen = udp6_skb_len(skb);
637	637	copied = len;
638		---- linux-5.4.159.orig/net/socket.c
639		-+++ linux-5.4.159/net/socket.c
	638	+--- linux-5.4.164.orig/net/socket.c
	639	++++ linux-5.4.164/net/socket.c
640	640	@@ -1744,6 +1744,10 @@ int __sys_accept4(int fd, struct sockadd
641	641	if (err < 0)
642	642	goto out_fd;

		@@ -648,8 +648,8 @@
648	648	if (upeer_sockaddr) {
649	649	len = newsock->ops->getname(newsock,
650	650	(struct sockaddr *)&address, 2);
651		---- linux-5.4.159.orig/net/unix/af_unix.c
652		-+++ linux-5.4.159/net/unix/af_unix.c
	651	+--- linux-5.4.164.orig/net/unix/af_unix.c
	652	++++ linux-5.4.164/net/unix/af_unix.c
653	653	@@ -2164,6 +2164,10 @@ static int unix_dgram_recvmsg(struct soc
654	654	EPOLLOUT \| EPOLLWRNORM \|
655	655	EPOLLWRBAND);

		@@ -669,9 +669,9 @@
669	669	mutex_unlock(&u->iolock);
670	670	out:
671	671	return err;
672		---- linux-5.4.159.orig/security/Kconfig
673		-+++ linux-5.4.159/security/Kconfig
674		-@@ -291,5 +291,7 @@ config LSM
	672	+--- linux-5.4.164.orig/security/Kconfig
	673	++++ linux-5.4.164/security/Kconfig
	674	+@@ -294,5 +294,7 @@ config LSM
675	675
676	676	source "security/Kconfig.hardening"
677	677

		@@ -679,8 +679,8 @@
679	679	+
680	680	endmenu
681	681
682		---- linux-5.4.159.orig/security/Makefile
683		-+++ linux-5.4.159/security/Makefile
	682	+--- linux-5.4.164.orig/security/Makefile
	683	++++ linux-5.4.164/security/Makefile
684	684	@@ -34,3 +34,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
685	685	# Object integrity file lists
686	686	subdir-$(CONFIG_INTEGRITY) += integrity

		@@ -688,8 +688,8 @@
688	688	+
689	689	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
690	690	+obj-$(CONFIG_CCSECURITY) += ccsecurity/
691		---- linux-5.4.159.orig/security/security.c
692		-+++ linux-5.4.159/security/security.c
	691	+--- linux-5.4.164.orig/security/security.c
	692	++++ linux-5.4.164/security/security.c
693	693	@@ -1507,7 +1507,9 @@ int security_task_alloc(struct task_stru
694	694
695	695	if (rc)

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

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

		@@ -18,9 +18,9 @@
18	18	rpm -ivh kernel-2.6.32-754.35.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		-if [ ! -r caitsith-patch-0.2-20210916.tar.gz ]
	21	+if [ ! -r caitsith-patch-0.2-20211212.tar.gz ]
22	22	then
23		- wget -O caitsith-patch-0.2-20210916.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20210916.tar.gz' \|\| die "Can't download patch."
	23	+ wget -O caitsith-patch-0.2-20211212.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20211212.tar.gz' \|\| die "Can't download patch."
24	24	fi
25	25
26	26	cd ~/rpmbuild/SPECS/ \|\| die "Can't chdir to ~/rpmbuild/SPECS/ ."

		@@ -69,7 +69,7 @@
69	69	ApplyOptionalPatch linux-kernel-test.patch
70	70
71	71	+# CaitSith
72		-+tar -zxf %_sourcedir/caitsith-patch-0.2-20210916.tar.gz
	72	++tar -zxf %_sourcedir/caitsith-patch-0.2-20211212.tar.gz
73	73	+sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
74	74	+patch -sp1 < patches/ccs-patch-2.6.32-centos-6.diff
75	75	# Any further pre-build tree manipulations happen here.

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

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

		@@ -10,17 +10,17 @@
10	10
11	11	cd /tmp/ \|\| die "Can't chdir to /tmp/ ."
12	12
13		-if [ ! -r kernel-3.10.0-1160.45.1.el7.src.rpm ]
	13	+if [ ! -r kernel-3.10.0-1160.49.1.el7.src.rpm ]
14	14	then
15		- wget https://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-1160.45.1.el7.src.rpm \|\| die "Can't download source package."
	15	+ wget https://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-1160.49.1.el7.src.rpm \|\| die "Can't download source package."
16	16	fi
17		-LANG=C rpm --checksig kernel-3.10.0-1160.45.1.el7.src.rpm \| grep -F ': rsa sha1 (md5) pgp md5 OK' \|\| die "Can't verify signature."
18		-rpm -ivh kernel-3.10.0-1160.45.1.el7.src.rpm \|\| die "Can't install source package."
	17	+LANG=C rpm --checksig kernel-3.10.0-1160.49.1.el7.src.rpm \| grep -F ': rsa sha1 (md5) pgp md5 OK' \|\| die "Can't verify signature."
	18	+rpm -ivh kernel-3.10.0-1160.49.1.el7.src.rpm \|\| die "Can't install source package."
19	19
20	20	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
21		-if [ ! -r caitsith-patch-0.2-20210916.tar.gz ]
	21	+if [ ! -r caitsith-patch-0.2-20211212.tar.gz ]
22	22	then
23		- wget -O caitsith-patch-0.2-20210916.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20210916.tar.gz' \|\| die "Can't download patch."
	23	+ wget -O caitsith-patch-0.2-20211212.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20211212.tar.gz' \|\| die "Can't download patch."
24	24	fi
25	25
26	26	cd ~/rpmbuild/SPECS/ \|\| die "Can't chdir to ~/rpmbuild/SPECS/ ."

		@@ -69,7 +69,7 @@
69	69	ApplyOptionalPatch debrand-rh-i686-cpu.patch
70	70
71	71	+# CaitSith
72		-+tar -zxf %_sourcedir/caitsith-patch-0.2-20210916.tar.gz
	72	++tar -zxf %_sourcedir/caitsith-patch-0.2-20211212.tar.gz
73	73	+sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
74	74	+patch -sp1 < patches/ccs-patch-3.10-centos-7.diff
75	75	# Any further pre-build tree manipulations happen here.

--- trunk/caitsith-patch/specs/build-c8-4.18.sh (revision 361)

+++ trunk/caitsith-patch/specs/build-c8-4.18.sh (revision 362)

		@@ -18,9 +18,9 @@
18	18	rpm -ivh kernel-4.18.0-305.25.1.el8_4.src.rpm \|\| die "Can't install source package."
19	19
20	20	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
21		-if [ ! -r caitsith-patch-0.2-20210916.tar.gz ]
	21	+if [ ! -r caitsith-patch-0.2-20211212.tar.gz ]
22	22	then
23		- wget -O caitsith-patch-0.2-20210916.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20210916.tar.gz' \|\| die "Can't download patch."
	23	+ wget -O caitsith-patch-0.2-20211212.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20211212.tar.gz' \|\| die "Can't download patch."
24	24	fi
25	25
26	26	cd ~/rpmbuild/SPECS/ \|\| die "Can't chdir to ~/rpmbuild/SPECS/ ."

		@@ -42,7 +42,7 @@
42	42	# END OF PATCH APPLICATIONS
43	43
44	44	+# CaitSith
45		-+tar -zxf %_sourcedir/caitsith-patch-0.2-20210916.tar.gz
	45	++tar -zxf %_sourcedir/caitsith-patch-0.2-20211212.tar.gz
46	46	+sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
47	47	+patch -sp1 < patches/ccs-patch-4.18-centos-8.diff
48	48	# Any further pre-build tree manipulations happen here.

--- trunk/caitsith-patch/specs/build-debian_wheezy.sh (revision 361)

+++ trunk/caitsith-patch/specs/build-debian_wheezy.sh (revision 362)

		@@ -23,10 +23,10 @@
23	23	# Download CaitSith patches.
24	24	mkdir -p ~/rpmbuild/SOURCES/
25	25	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
26		-if [ ! -r caitsith-patch-0.2-20210916.tar.gz ]
	26	+if [ ! -r caitsith-patch-0.2-20211212.tar.gz ]
27	27	then
28	28	apt-get -y install wget
29		- wget -O caitsith-patch-0.2-20210916.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20210916.tar.gz' \|\| die "Can't download patch."
	29	+ wget -O caitsith-patch-0.2-20211212.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20211212.tar.gz' \|\| die "Can't download patch."
30	30	fi
31	31
32	32	# Install kernel source packages.

		@@ -38,7 +38,7 @@
38	38
39	39	# Apply patches and create kernel config.
40	40	cd linux-source-3.2 \|\| die "Can't chdir to linux-source-3.2/ ."
41		-tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20210916.tar.gz \|\| die "Can't extract patch."
	41	+tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20211212.tar.gz \|\| die "Can't extract patch."
42	42	sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
43	43	patch -p1 < patches/ccs-patch-3.2-debian-wheezy.diff \|\| die "Can't apply patch."
44	44	cat /boot/config-3.2.0-$ABI_VERSION-$ORIGINAL_FLAVOUR config.caitsith > .config \|\| die "Can't create config."

--- trunk/caitsith-patch/specs/build-ubuntu_12.04.sh (revision 361)

+++ trunk/caitsith-patch/specs/build-ubuntu_12.04.sh (revision 362)

		@@ -29,9 +29,9 @@
29	29	# Download CaitSith patches.
30	30	mkdir -p ~/rpmbuild/SOURCES/
31	31	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32		-if [ ! -r caitsith-patch-0.2-20210916.tar.gz ]
	32	+if [ ! -r caitsith-patch-0.2-20211212.tar.gz ]
33	33	then
34		- wget -O caitsith-patch-0.2-20210916.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20210916.tar.gz' \|\| die "Can't download patch."
	34	+ wget -O caitsith-patch-0.2-20211212.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20211212.tar.gz' \|\| die "Can't download patch."
35	35	fi
36	36
37	37	# Install kernel source packages.

		@@ -44,7 +44,7 @@
44	44	# Apply patches and create kernel config.
45	45	cd linux-3.2.0/ \|\| die "Can't chdir to linux-3.2.0/ ."
46	46	update_maintainer
47		-tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20210916.tar.gz \|\| die "Can't extract patch."
	47	+tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20211212.tar.gz \|\| die "Can't extract patch."
48	48	sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
49	49	patch -p1 < patches/ccs-patch-3.2-ubuntu-12.04.diff \|\| die "Can't apply patch."
50	50	rm -fR patches/ specs/ \|\| die "Can't delete patch."

--- trunk/caitsith-patch/specs/build-ubuntu_14.04.sh (revision 361)

+++ trunk/caitsith-patch/specs/build-ubuntu_14.04.sh (revision 362)

		@@ -29,9 +29,9 @@
29	29	# Download CaitSith patches.
30	30	mkdir -p ~/rpmbuild/SOURCES/
31	31	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32		-if [ ! -r caitsith-patch-0.2-20210916.tar.gz ]
	32	+if [ ! -r caitsith-patch-0.2-20211212.tar.gz ]
33	33	then
34		- wget -O caitsith-patch-0.2-20210916.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20210916.tar.gz' \|\| die "Can't download patch."
	34	+ wget -O caitsith-patch-0.2-20211212.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20211212.tar.gz' \|\| die "Can't download patch."
35	35	fi
36	36
37	37	# Install kernel source packages.

		@@ -44,7 +44,7 @@
44	44	# Apply patches and create kernel config.
45	45	cd linux-3.13.0/ \|\| die "Can't chdir to linux-3.13.0/ ."
46	46	update_maintainer
47		-tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20210916.tar.gz \|\| die "Can't extract patch."
	47	+tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20211212.tar.gz \|\| die "Can't extract patch."
48	48	sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
49	49	patch -p1 < patches/ccs-patch-3.13-ubuntu-14.04.diff \|\| die "Can't apply patch."
50	50	rm -fR patches/ specs/ \|\| die "Can't delete patch."

--- trunk/caitsith-patch/specs/build-vl6-4.4.sh (revision 361)

+++ trunk/caitsith-patch/specs/build-vl6-4.4.sh (revision 362)

		@@ -18,9 +18,9 @@
18	18	rpm -ivh kernel-4.4.110-2vl6.src.rpm \|\| die "Can't install source package."
19	19
20	20	cd ~/rpm/SOURCES/ \|\| die "Can't chdir to ~/rpm/SOURCES/ ."
21		-if [ ! -r caitsith-patch-0.2-20210916.tar.gz ]
	21	+if [ ! -r caitsith-patch-0.2-20211212.tar.gz ]
22	22	then
23		- wget -O caitsith-patch-0.2-20210916.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20210916.tar.gz' \|\| die "Can't download patch."
	23	+ wget -O caitsith-patch-0.2-20211212.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20211212.tar.gz' \|\| die "Can't download patch."
24	24	fi
25	25
26	26	cd /tmp/ \|\| die "Can't chdir to /tmp/ ."

		@@ -61,7 +61,7 @@
61	61	# END OF PATCH APPLICATIONS
62	62
63	63	+# CaitSith
64		-+tar -zxf %_sourcedir/caitsith-patch-0.2-20210916.tar.gz
	64	++tar -zxf %_sourcedir/caitsith-patch-0.2-20211212.tar.gz
65	65	+sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
66	66	+patch -sp1 < patches/ccs-patch-4.4-vine-linux-6.diff
67	67	cp %{SOURCE10} Documentation/

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