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

CaitSith

R/O
SSH
HTTPS

caitsith: コミット

コミットメタ情報

リビジョン	360 (tree)
日時	2021-09-16 22:19:38
作者	kumaneko

ログメッセージ

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

変更サマリ

modified: tags/htdocs/index.html (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-4.18-centos-8.diff (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-5.10.diff (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-5.13.diff (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-5.14.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 359)

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

		@@ -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-20210606.tar.gz 'https://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20210606.tar.gz'
308		-# wget -O caitsith-patch-0.2-20210606.tar.gz.asc 'https://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20210606.tar.gz.asc'
	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'
309	309	# wget https://tomoyo.osdn.jp/kumaneko-key
310	310	# gpg --import kumaneko-key
311		-# gpg caitsith-patch-0.2-20210606.tar.gz.asc
312		-# tar -zxf caitsith-patch-0.2-20210606.tar.gz
	311	+# gpg caitsith-patch-0.2-20210916.tar.gz.asc
	312	+# tar -zxf caitsith-patch-0.2-20210916.tar.gz
313	313	</pre>
314	314
315	315	<hr>

		@@ -645,12 +645,12 @@
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-20210606.tar.gz 'https://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20210606.tar.gz'
649		-$ wget -O caitsith-patch-0.2-20210606.tar.gz.asc 'https://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20210606.tar.gz.asc'
	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'
650	650	$ wget https://tomoyo.osdn.jp/kumaneko-key
651	651	$ gpg --import kumaneko-key
652		-$ gpg caitsith-patch-0.2-20210606.tar.gz.asc
653		-$ tar -zxf caitsith-patch-0.2-20210606.tar.gz
	652	+$ gpg caitsith-patch-0.2-20210916.tar.gz.asc
	653	+$ tar -zxf caitsith-patch-0.2-20210916.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-4.18-centos-8.diff (revision 359)

+++ trunk/caitsith-patch/patches/ccs-patch-4.18-centos-8.diff (revision 360)

		@@ -1,6 +1,6 @@
1	1	This is TOMOYO Linux patch for CentOS 8.
2	2
3		-Source code for this patch is https://vault.centos.org/8.4.2105/BaseOS/Source/SPackages/kernel-4.18.0-305.17.1.el8_4.src.rpm
	3	+Source code for this patch is https://vault.centos.org/8.4.2105/BaseOS/Source/SPackages/kernel-4.18.0-305.19.1.el8_4.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 \| 9 +++++-
29	29	24 files changed, 148 insertions(+), 29 deletions(-)
30	30
31		---- linux-4.18.0-305.17.1.el8.orig/fs/exec.c
32		-+++ linux-4.18.0-305.17.1.el8/fs/exec.c
	31	+--- linux-4.18.0-305.19.1.el8.orig/fs/exec.c
	32	++++ linux-4.18.0-305.19.1.el8/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.18.0-305.17.1.el8.orig/fs/open.c
43		-+++ linux-4.18.0-305.17.1.el8/fs/open.c
	42	+--- linux-4.18.0-305.19.1.el8.orig/fs/open.c
	43	++++ linux-4.18.0-305.19.1.el8/fs/open.c
44	44	@@ -1237,6 +1237,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-4.18.0-305.17.1.el8.orig/fs/proc/version.c
54		-+++ linux-4.18.0-305.17.1.el8/fs/proc/version.c
	53	+--- linux-4.18.0-305.19.1.el8.orig/fs/proc/version.c
	54	++++ linux-4.18.0-305.19.1.el8/fs/proc/version.c
55	55	@@ -21,3 +21,10 @@ static int __init proc_version_init(void
56	56	return 0;
57	57	}

		@@ -59,12 +59,12 @@
59	59	+
60	60	+static int __init ccs_show_version(void)
61	61	+{
62		-+ printk(KERN_INFO "Hook version: 4.18.0-305.17.1.el8_4 2021/09/10\n");
	62	++ printk(KERN_INFO "Hook version: 4.18.0-305.19.1.el8_4 2021/09/16\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-4.18.0-305.17.1.el8.orig/include/linux/sched.h
67		-+++ linux-4.18.0-305.17.1.el8/include/linux/sched.h
	66	+--- linux-4.18.0-305.19.1.el8.orig/include/linux/sched.h
	67	++++ linux-4.18.0-305.19.1.el8/include/linux/sched.h
68	68	@@ -41,6 +41,7 @@ struct audit_context;
69	69	struct backing_dev_info;
70	70	struct bio_list;

		@@ -84,8 +84,8 @@
84	84
85	85	/*
86	86	* New fields for task_struct should be added above here, so that
87		---- linux-4.18.0-305.17.1.el8.orig/include/linux/security.h
88		-+++ linux-4.18.0-305.17.1.el8/include/linux/security.h
	87	+--- linux-4.18.0-305.19.1.el8.orig/include/linux/security.h
	88	++++ linux-4.18.0-305.19.1.el8/include/linux/security.h
89	89	@@ -57,6 +57,7 @@ struct mm_struct;
90	90	struct fs_context;
91	91	struct fs_parameter;

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

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

		@@ -339,8 +339,8 @@
339	339	};
340	340	EXPORT_SYMBOL(init_task);
341	341
342		---- linux-4.18.0-305.17.1.el8.orig/kernel/kexec.c
343		-+++ linux-4.18.0-305.17.1.el8/kernel/kexec.c
	342	+--- linux-4.18.0-305.19.1.el8.orig/kernel/kexec.c
	343	++++ linux-4.18.0-305.19.1.el8/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.18.0-305.17.1.el8.orig/kernel/module.c
363		-+++ linux-4.18.0-305.17.1.el8/kernel/module.c
	362	+--- linux-4.18.0-305.19.1.el8.orig/kernel/module.c
	363	++++ linux-4.18.0-305.19.1.el8/kernel/module.c
364	364	@@ -67,6 +67,7 @@
365	365	#include <linux/audit.h>
366	366	#include <uapi/linux/module.h>

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

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

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

		@@ -443,8 +443,8 @@
443	443
444	444	/*
445	445	* Setpriority might change our priority at the same moment.
446		---- linux-4.18.0-305.17.1.el8.orig/kernel/signal.c
447		-+++ linux-4.18.0-305.17.1.el8/kernel/signal.c
	446	+--- linux-4.18.0-305.19.1.el8.orig/kernel/signal.c
	447	++++ linux-4.18.0-305.19.1.el8/kernel/signal.c
448	448	@@ -3533,6 +3533,8 @@ SYSCALL_DEFINE2(kill, pid_t, pid, int, s
449	449	{
450	450	struct kernel_siginfo info;

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

		@@ -521,8 +521,8 @@
521	521
522	522	down_write(&uts_sem);
523	523	errno = -EFAULT;
524		---- linux-4.18.0-305.17.1.el8.orig/kernel/time/timekeeping.c
525		-+++ linux-4.18.0-305.17.1.el8/kernel/time/timekeeping.c
	524	+--- linux-4.18.0-305.19.1.el8.orig/kernel/time/timekeeping.c
	525	++++ linux-4.18.0-305.19.1.el8/kernel/time/timekeeping.c
526	526	@@ -26,6 +26,7 @@
527	527	#include <linux/pvclock_gtod.h>
528	528	#include <linux/compiler.h>

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

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

		@@ -580,8 +580,8 @@
580	580
581	581	ulen = udp_skb_len(skb);
582	582	copied = len;
583		---- linux-4.18.0-305.17.1.el8.orig/net/ipv6/raw.c
584		-+++ linux-4.18.0-305.17.1.el8/net/ipv6/raw.c
	583	+--- linux-4.18.0-305.19.1.el8.orig/net/ipv6/raw.c
	584	++++ linux-4.18.0-305.19.1.el8/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.18.0-305.17.1.el8.orig/net/ipv6/udp.c
597		-+++ linux-4.18.0-305.17.1.el8/net/ipv6/udp.c
	596	+--- linux-4.18.0-305.19.1.el8.orig/net/ipv6/udp.c
	597	++++ linux-4.18.0-305.19.1.el8/net/ipv6/udp.c
598	598	@@ -345,6 +345,8 @@ try_again:
599	599	skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
600	600	if (!skb)

		@@ -604,8 +604,8 @@
604	604
605	605	ulen = udp6_skb_len(skb);
606	606	copied = len;
607		---- linux-4.18.0-305.17.1.el8.orig/net/socket.c
608		-+++ linux-4.18.0-305.17.1.el8/net/socket.c
	607	+--- linux-4.18.0-305.19.1.el8.orig/net/socket.c
	608	++++ linux-4.18.0-305.19.1.el8/net/socket.c
609	609	@@ -1715,6 +1715,10 @@ int __sys_accept4_file(struct file *file
610	610	if (err < 0)
611	611	goto out_fd;

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

		@@ -638,8 +638,8 @@
638	638	mutex_unlock(&u->iolock);
639	639	out:
640	640	return err;
641		---- linux-4.18.0-305.17.1.el8.orig/security/Kconfig
642		-+++ linux-4.18.0-305.17.1.el8/security/Kconfig
	641	+--- linux-4.18.0-305.19.1.el8.orig/security/Kconfig
	642	++++ linux-4.18.0-305.19.1.el8/security/Kconfig
643	643	@@ -315,4 +315,6 @@ config DEFAULT_SECURITY
644	644
645	645	source "security/Kconfig.hardening"

		@@ -647,8 +647,8 @@
647	647	+source security/ccsecurity/Kconfig
648	648	+
649	649	endmenu
650		---- linux-4.18.0-305.17.1.el8.orig/security/Makefile
651		-+++ linux-4.18.0-305.17.1.el8/security/Makefile
	650	+--- linux-4.18.0-305.19.1.el8.orig/security/Makefile
	651	++++ linux-4.18.0-305.19.1.el8/security/Makefile
652	652	@@ -33,3 +33,6 @@ obj-$(CONFIG_INTEGRITY) += integrity/
653	653
654	654	# Allow the kernel to be locked down

		@@ -656,8 +656,8 @@
656	656	+
657	657	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
658	658	+obj-$(CONFIG_CCSECURITY) += ccsecurity/
659		---- linux-4.18.0-305.17.1.el8.orig/security/security.c
660		-+++ linux-4.18.0-305.17.1.el8/security/security.c
	659	+--- linux-4.18.0-305.19.1.el8.orig/security/security.c
	660	++++ linux-4.18.0-305.19.1.el8/security/security.c
661	661	@@ -1016,12 +1016,19 @@ int security_file_open(struct file *file
662	662
663	663	int security_task_alloc(struct task_struct *task, unsigned long clone_flags)

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

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

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 5.10.64.
	1	+This is TOMOYO Linux patch for kernel 5.10.66.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.64.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.66.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.64.orig/fs/exec.c
32		-+++ linux-5.10.64/fs/exec.c
	31	+--- linux-5.10.66.orig/fs/exec.c
	32	++++ linux-5.10.66/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.64.orig/fs/open.c
43		-+++ linux-5.10.64/fs/open.c
	42	+--- linux-5.10.66.orig/fs/open.c
	43	++++ linux-5.10.66/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.64.orig/fs/proc/version.c
54		-+++ linux-5.10.64/fs/proc/version.c
	53	+--- linux-5.10.66.orig/fs/proc/version.c
	54	++++ linux-5.10.66/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.64 2021/09/13\n");
	62	++ printk(KERN_INFO "Hook version: 5.10.66 2021/09/16\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.10.64.orig/include/linux/sched.h
67		-+++ linux-5.10.64/include/linux/sched.h
	66	+--- linux-5.10.66.orig/include/linux/sched.h
	67	++++ linux-5.10.66/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.64.orig/include/linux/security.h
88		-+++ linux-5.10.64/include/linux/security.h
	87	+--- linux-5.10.66.orig/include/linux/security.h
	88	++++ linux-5.10.66/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.10.64.orig/include/net/ip.h
319		-+++ linux-5.10.64/include/net/ip.h
	318	+--- linux-5.10.66.orig/include/net/ip.h
	319	++++ linux-5.10.66/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.64.orig/init/init_task.c
339		-+++ linux-5.10.64/init/init_task.c
	338	+--- linux-5.10.66.orig/init/init_task.c
	339	++++ linux-5.10.66/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.64.orig/kernel/kexec.c
352		-+++ linux-5.10.64/kernel/kexec.c
	351	+--- linux-5.10.66.orig/kernel/kexec.c
	352	++++ linux-5.10.66/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.64.orig/kernel/module.c
372		-+++ linux-5.10.64/kernel/module.c
	371	+--- linux-5.10.66.orig/kernel/module.c
	372	++++ linux-5.10.66/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.64.orig/kernel/ptrace.c
400		-+++ linux-5.10.64/kernel/ptrace.c
	399	+--- linux-5.10.66.orig/kernel/ptrace.c
	400	++++ linux-5.10.66/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.64.orig/kernel/reboot.c
426		-+++ linux-5.10.64/kernel/reboot.c
	425	+--- linux-5.10.66.orig/kernel/reboot.c
	426	++++ linux-5.10.66/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.64.orig/kernel/sched/core.c
445		-+++ linux-5.10.64/kernel/sched/core.c
446		-@@ -5039,6 +5039,8 @@ int can_nice(const struct task_struct *p
	444	+--- linux-5.10.66.orig/kernel/sched/core.c
	445	++++ linux-5.10.66/kernel/sched/core.c
	446	+@@ -5052,6 +5052,8 @@ int can_nice(const struct task_struct *p
447	447	SYSCALL_DEFINE1(nice, int, increment)
448	448	{
449	449	long nice, retval;

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

		@@ -521,8 +521,8 @@
521	521
522	522	return do_send_specific(tgid, pid, sig, info);
523	523	}
524		---- linux-5.10.64.orig/kernel/sys.c
525		-+++ linux-5.10.64/kernel/sys.c
	524	+--- linux-5.10.66.orig/kernel/sys.c
	525	++++ linux-5.10.66/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.64.orig/kernel/time/timekeeping.c
556		-+++ linux-5.10.64/kernel/time/timekeeping.c
	555	+--- linux-5.10.66.orig/kernel/time/timekeeping.c
	556	++++ linux-5.10.66/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.64.orig/net/ipv4/raw.c
591		-+++ linux-5.10.64/net/ipv4/raw.c
	590	+--- linux-5.10.66.orig/net/ipv4/raw.c
	591	++++ linux-5.10.66/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.64.orig/net/ipv4/udp.c
604		-+++ linux-5.10.64/net/ipv4/udp.c
	603	+--- linux-5.10.66.orig/net/ipv4/udp.c
	604	++++ linux-5.10.66/net/ipv4/udp.c
605	605	@@ -1801,6 +1801,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.64.orig/net/ipv6/raw.c
615		-+++ linux-5.10.64/net/ipv6/raw.c
	614	+--- linux-5.10.66.orig/net/ipv6/raw.c
	615	++++ linux-5.10.66/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.64.orig/net/ipv6/udp.c
628		-+++ linux-5.10.64/net/ipv6/udp.c
	627	+--- linux-5.10.66.orig/net/ipv6/udp.c
	628	++++ linux-5.10.66/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.10.64.orig/net/socket.c
639		-+++ linux-5.10.64/net/socket.c
	638	+--- linux-5.10.66.orig/net/socket.c
	639	++++ linux-5.10.66/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.64.orig/net/unix/af_unix.c
652		-+++ linux-5.10.64/net/unix/af_unix.c
	651	+--- linux-5.10.66.orig/net/unix/af_unix.c
	652	++++ linux-5.10.66/net/unix/af_unix.c
653	653	@@ -2175,6 +2175,10 @@ static int unix_dgram_recvmsg(struct soc
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.10.64.orig/security/Kconfig
673		-+++ linux-5.10.64/security/Kconfig
	672	+--- linux-5.10.66.orig/security/Kconfig
	673	++++ linux-5.10.66/security/Kconfig
674	674	@@ -291,5 +291,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.10.64.orig/security/Makefile
683		-+++ linux-5.10.64/security/Makefile
	682	+--- linux-5.10.66.orig/security/Makefile
	683	++++ linux-5.10.66/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.64.orig/security/security.c
692		-+++ linux-5.10.64/security/security.c
	691	+--- linux-5.10.66.orig/security/security.c
	692	++++ linux-5.10.66/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.13.diff (revision 359)

+++ trunk/caitsith-patch/patches/ccs-patch-5.13.diff (revision 360)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 5.13.16.
	1	+This is TOMOYO Linux patch for kernel 5.13.18.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.16.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.18.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.13.16.orig/fs/exec.c
32		-+++ linux-5.13.16/fs/exec.c
	31	+--- linux-5.13.18.orig/fs/exec.c
	32	++++ linux-5.13.18/fs/exec.c
33	33	@@ -1831,7 +1831,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.13.16.orig/fs/open.c
43		-+++ linux-5.13.16/fs/open.c
	42	+--- linux-5.13.18.orig/fs/open.c
	43	++++ linux-5.13.18/fs/open.c
44	44	@@ -1354,6 +1354,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.13.16.orig/fs/proc/version.c
54		-+++ linux-5.13.16/fs/proc/version.c
	53	+--- linux-5.13.18.orig/fs/proc/version.c
	54	++++ linux-5.13.18/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.13.16 2021/09/13\n");
	62	++ printk(KERN_INFO "Hook version: 5.13.18 2021/09/16\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.13.16.orig/include/linux/sched.h
67		-+++ linux-5.13.16/include/linux/sched.h
	66	+--- linux-5.13.18.orig/include/linux/sched.h
	67	++++ linux-5.13.18/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.13.16.orig/include/linux/security.h
88		-+++ linux-5.13.16/include/linux/security.h
	87	+--- linux-5.13.18.orig/include/linux/security.h
	88	++++ linux-5.13.18/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.13.16.orig/include/net/ip.h
319		-+++ linux-5.13.16/include/net/ip.h
	318	+--- linux-5.13.18.orig/include/net/ip.h
	319	++++ linux-5.13.18/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.13.16.orig/init/init_task.c
339		-+++ linux-5.13.16/init/init_task.c
	338	+--- linux-5.13.18.orig/init/init_task.c
	339	++++ linux-5.13.18/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.13.16.orig/kernel/kexec.c
352		-+++ linux-5.13.16/kernel/kexec.c
	351	+--- linux-5.13.18.orig/kernel/kexec.c
	352	++++ linux-5.13.18/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.13.16.orig/kernel/module.c
372		-+++ linux-5.13.16/kernel/module.c
	371	+--- linux-5.13.18.orig/kernel/module.c
	372	++++ linux-5.13.18/kernel/module.c
373	373	@@ -58,6 +58,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.13.16.orig/kernel/ptrace.c
400		-+++ linux-5.13.16/kernel/ptrace.c
	399	+--- linux-5.13.18.orig/kernel/ptrace.c
	400	++++ linux-5.13.18/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.13.16.orig/kernel/reboot.c
426		-+++ linux-5.13.16/kernel/reboot.c
	425	+--- linux-5.13.18.orig/kernel/reboot.c
	426	++++ linux-5.13.18/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.13.16.orig/kernel/sched/core.c
445		-+++ linux-5.13.16/kernel/sched/core.c
446		-@@ -5794,6 +5794,8 @@ int can_nice(const struct task_struct *p
	444	+--- linux-5.13.18.orig/kernel/sched/core.c
	445	++++ linux-5.13.18/kernel/sched/core.c
	446	+@@ -5807,6 +5807,8 @@ int can_nice(const struct task_struct *p
447	447	SYSCALL_DEFINE1(nice, int, increment)
448	448	{
449	449	long nice, retval;

		@@ -452,8 +452,8 @@
452	452
453	453	/*
454	454	* Setpriority might change our priority at the same moment.
455		---- linux-5.13.16.orig/kernel/signal.c
456		-+++ linux-5.13.16/kernel/signal.c
	455	+--- linux-5.13.18.orig/kernel/signal.c
	456	++++ linux-5.13.18/kernel/signal.c
457	457	@@ -3699,6 +3699,8 @@ static inline void prepare_kill_siginfo(
458	458	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
459	459	{

		@@ -521,8 +521,8 @@
521	521
522	522	return do_send_specific(tgid, pid, sig, info);
523	523	}
524		---- linux-5.13.16.orig/kernel/sys.c
525		-+++ linux-5.13.16/kernel/sys.c
	524	+--- linux-5.13.18.orig/kernel/sys.c
	525	++++ linux-5.13.18/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.13.16.orig/kernel/time/timekeeping.c
556		-+++ linux-5.13.16/kernel/time/timekeeping.c
	555	+--- linux-5.13.18.orig/kernel/time/timekeeping.c
	556	++++ linux-5.13.18/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.13.16.orig/net/ipv4/raw.c
591		-+++ linux-5.13.16/net/ipv4/raw.c
	590	+--- linux-5.13.18.orig/net/ipv4/raw.c
	591	++++ linux-5.13.18/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.13.16.orig/net/ipv4/udp.c
604		-+++ linux-5.13.16/net/ipv4/udp.c
	603	+--- linux-5.13.18.orig/net/ipv4/udp.c
	604	++++ linux-5.13.18/net/ipv4/udp.c
605	605	@@ -1850,6 +1850,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.13.16.orig/net/ipv6/raw.c
615		-+++ linux-5.13.16/net/ipv6/raw.c
	614	+--- linux-5.13.18.orig/net/ipv6/raw.c
	615	++++ linux-5.13.18/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.13.16.orig/net/ipv6/udp.c
628		-+++ linux-5.13.16/net/ipv6/udp.c
	627	+--- linux-5.13.18.orig/net/ipv6/udp.c
	628	++++ linux-5.13.18/net/ipv6/udp.c
629	629	@@ -342,6 +342,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.13.16.orig/net/socket.c
639		-+++ linux-5.13.16/net/socket.c
	638	+--- linux-5.13.18.orig/net/socket.c
	639	++++ linux-5.13.18/net/socket.c
640	640	@@ -1727,6 +1727,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.13.16.orig/net/unix/af_unix.c
652		-+++ linux-5.13.16/net/unix/af_unix.c
	651	+--- linux-5.13.18.orig/net/unix/af_unix.c
	652	++++ linux-5.13.18/net/unix/af_unix.c
653	653	@@ -2176,6 +2176,10 @@ static int unix_dgram_recvmsg(struct soc
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.13.16.orig/security/Kconfig
673		-+++ linux-5.13.16/security/Kconfig
	672	+--- linux-5.13.18.orig/security/Kconfig
	673	++++ linux-5.13.18/security/Kconfig
674	674	@@ -292,5 +292,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.13.16.orig/security/Makefile
683		-+++ linux-5.13.16/security/Makefile
	682	+--- linux-5.13.18.orig/security/Makefile
	683	++++ linux-5.13.18/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.13.16.orig/security/security.c
692		-+++ linux-5.13.16/security/security.c
	691	+--- linux-5.13.18.orig/security/security.c
	692	++++ linux-5.13.18/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.14.diff (revision 359)

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

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 5.14.3.
	1	+This is TOMOYO Linux patch for kernel 5.14.5.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.3.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.5.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.3.orig/fs/exec.c
32		-+++ linux-5.14.3/fs/exec.c
	31	+--- linux-5.14.5.orig/fs/exec.c
	32	++++ linux-5.14.5/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.3.orig/fs/open.c
43		-+++ linux-5.14.3/fs/open.c
	42	+--- linux-5.14.5.orig/fs/open.c
	43	++++ linux-5.14.5/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.3.orig/fs/proc/version.c
54		-+++ linux-5.14.3/fs/proc/version.c
	53	+--- linux-5.14.5.orig/fs/proc/version.c
	54	++++ linux-5.14.5/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.3 2021/09/13\n");
	62	++ printk(KERN_INFO "Hook version: 5.14.5 2021/09/16\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.14.3.orig/include/linux/sched.h
67		-+++ linux-5.14.3/include/linux/sched.h
	66	+--- linux-5.14.5.orig/include/linux/sched.h
	67	++++ linux-5.14.5/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.3.orig/include/linux/security.h
88		-+++ linux-5.14.3/include/linux/security.h
	87	+--- linux-5.14.5.orig/include/linux/security.h
	88	++++ linux-5.14.5/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.3.orig/include/net/ip.h
319		-+++ linux-5.14.3/include/net/ip.h
	318	+--- linux-5.14.5.orig/include/net/ip.h
	319	++++ linux-5.14.5/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.3.orig/init/init_task.c
339		-+++ linux-5.14.3/init/init_task.c
	338	+--- linux-5.14.5.orig/init/init_task.c
	339	++++ linux-5.14.5/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.3.orig/kernel/kexec.c
352		-+++ linux-5.14.3/kernel/kexec.c
	351	+--- linux-5.14.5.orig/kernel/kexec.c
	352	++++ linux-5.14.5/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.3.orig/kernel/module.c
372		-+++ linux-5.14.3/kernel/module.c
	371	+--- linux-5.14.5.orig/kernel/module.c
	372	++++ linux-5.14.5/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.3.orig/kernel/ptrace.c
400		-+++ linux-5.14.3/kernel/ptrace.c
	399	+--- linux-5.14.5.orig/kernel/ptrace.c
	400	++++ linux-5.14.5/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.3.orig/kernel/reboot.c
426		-+++ linux-5.14.3/kernel/reboot.c
	425	+--- linux-5.14.5.orig/kernel/reboot.c
	426	++++ linux-5.14.5/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.3.orig/kernel/sched/core.c
445		-+++ linux-5.14.3/kernel/sched/core.c
446		-@@ -6671,6 +6671,8 @@ int can_nice(const struct task_struct *p
	444	+--- linux-5.14.5.orig/kernel/sched/core.c
	445	++++ linux-5.14.5/kernel/sched/core.c
	446	+@@ -6684,6 +6684,8 @@ int can_nice(const struct task_struct *p
447	447	SYSCALL_DEFINE1(nice, int, increment)
448	448	{
449	449	long nice, retval;

		@@ -452,8 +452,8 @@
452	452
453	453	/*
454	454	* Setpriority might change our priority at the same moment.
455		---- linux-5.14.3.orig/kernel/signal.c
456		-+++ linux-5.14.3/kernel/signal.c
	455	+--- linux-5.14.5.orig/kernel/signal.c
	456	++++ linux-5.14.5/kernel/signal.c
457	457	@@ -3714,6 +3714,8 @@ static inline void prepare_kill_siginfo(
458	458	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
459	459	{

		@@ -521,8 +521,8 @@
521	521
522	522	return do_send_specific(tgid, pid, sig, info);
523	523	}
524		---- linux-5.14.3.orig/kernel/sys.c
525		-+++ linux-5.14.3/kernel/sys.c
	524	+--- linux-5.14.5.orig/kernel/sys.c
	525	++++ linux-5.14.5/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.3.orig/kernel/time/timekeeping.c
556		-+++ linux-5.14.3/kernel/time/timekeeping.c
	555	+--- linux-5.14.5.orig/kernel/time/timekeeping.c
	556	++++ linux-5.14.5/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.3.orig/net/ipv4/raw.c
591		-+++ linux-5.14.3/net/ipv4/raw.c
	590	+--- linux-5.14.5.orig/net/ipv4/raw.c
	591	++++ linux-5.14.5/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.3.orig/net/ipv4/udp.c
604		-+++ linux-5.14.3/net/ipv4/udp.c
	603	+--- linux-5.14.5.orig/net/ipv4/udp.c
	604	++++ linux-5.14.5/net/ipv4/udp.c
605	605	@@ -1850,6 +1850,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.3.orig/net/ipv6/raw.c
615		-+++ linux-5.14.3/net/ipv6/raw.c
	614	+--- linux-5.14.5.orig/net/ipv6/raw.c
	615	++++ linux-5.14.5/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.3.orig/net/ipv6/udp.c
628		-+++ linux-5.14.3/net/ipv6/udp.c
	627	+--- linux-5.14.5.orig/net/ipv6/udp.c
	628	++++ linux-5.14.5/net/ipv6/udp.c
629	629	@@ -342,6 +342,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.3.orig/net/socket.c
639		-+++ linux-5.14.3/net/socket.c
	638	+--- linux-5.14.5.orig/net/socket.c
	639	++++ linux-5.14.5/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.3.orig/net/unix/af_unix.c
652		-+++ linux-5.14.3/net/unix/af_unix.c
	651	+--- linux-5.14.5.orig/net/unix/af_unix.c
	652	++++ linux-5.14.5/net/unix/af_unix.c
653	653	@@ -2180,6 +2180,10 @@ static int unix_dgram_recvmsg(struct soc
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.14.3.orig/security/Kconfig
673		-+++ linux-5.14.3/security/Kconfig
	672	+--- linux-5.14.5.orig/security/Kconfig
	673	++++ linux-5.14.5/security/Kconfig
674	674	@@ -292,5 +292,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.14.3.orig/security/Makefile
683		-+++ linux-5.14.3/security/Makefile
	682	+--- linux-5.14.5.orig/security/Makefile
	683	++++ linux-5.14.5/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.3.orig/security/security.c
692		-+++ linux-5.14.3/security/security.c
	691	+--- linux-5.14.5.orig/security/security.c
	692	++++ linux-5.14.5/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.4.diff (revision 359)

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

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 5.4.145.
	1	+This is TOMOYO Linux patch for kernel 5.4.147.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.145.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.147.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.145.orig/fs/exec.c
32		-+++ linux-5.4.145/fs/exec.c
	31	+--- linux-5.4.147.orig/fs/exec.c
	32	++++ linux-5.4.147/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.145.orig/fs/open.c
43		-+++ linux-5.4.145/fs/open.c
	42	+--- linux-5.4.147.orig/fs/open.c
	43	++++ linux-5.4.147/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.145.orig/fs/proc/version.c
54		-+++ linux-5.4.145/fs/proc/version.c
	53	+--- linux-5.4.147.orig/fs/proc/version.c
	54	++++ linux-5.4.147/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.145 2021/09/13\n");
	62	++ printk(KERN_INFO "Hook version: 5.4.147 2021/09/16\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.4.145.orig/include/linux/sched.h
67		-+++ linux-5.4.145/include/linux/sched.h
	66	+--- linux-5.4.147.orig/include/linux/sched.h
	67	++++ linux-5.4.147/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.145.orig/include/linux/security.h
88		-+++ linux-5.4.145/include/linux/security.h
	87	+--- linux-5.4.147.orig/include/linux/security.h
	88	++++ linux-5.4.147/include/linux/security.h
89	89	@@ -57,6 +57,7 @@ struct mm_struct;
90	90	struct fs_context;
91	91	struct fs_parameter;

		@@ -315,8 +315,8 @@
315	315	}
316	316	#endif /* CONFIG_SECURITY_PATH */
317	317
318		---- linux-5.4.145.orig/include/net/ip.h
319		-+++ linux-5.4.145/include/net/ip.h
	318	+--- linux-5.4.147.orig/include/net/ip.h
	319	++++ linux-5.4.147/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.145.orig/init/init_task.c
339		-+++ linux-5.4.145/init/init_task.c
	338	+--- linux-5.4.147.orig/init/init_task.c
	339	++++ linux-5.4.147/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.145.orig/kernel/kexec.c
352		-+++ linux-5.4.145/kernel/kexec.c
	351	+--- linux-5.4.147.orig/kernel/kexec.c
	352	++++ linux-5.4.147/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.145.orig/kernel/module.c
372		-+++ linux-5.4.145/kernel/module.c
	371	+--- linux-5.4.147.orig/kernel/module.c
	372	++++ linux-5.4.147/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.145.orig/kernel/ptrace.c
400		-+++ linux-5.4.145/kernel/ptrace.c
	399	+--- linux-5.4.147.orig/kernel/ptrace.c
	400	++++ linux-5.4.147/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.145.orig/kernel/reboot.c
426		-+++ linux-5.4.145/kernel/reboot.c
	425	+--- linux-5.4.147.orig/kernel/reboot.c
	426	++++ linux-5.4.147/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.145.orig/kernel/sched/core.c
445		-+++ linux-5.4.145/kernel/sched/core.c
446		-@@ -4661,6 +4661,8 @@ int can_nice(const struct task_struct *p
	444	+--- linux-5.4.147.orig/kernel/sched/core.c
	445	++++ linux-5.4.147/kernel/sched/core.c
	446	+@@ -4674,6 +4674,8 @@ int can_nice(const struct task_struct *p
447	447	SYSCALL_DEFINE1(nice, int, increment)
448	448	{
449	449	long nice, retval;

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

		@@ -521,8 +521,8 @@
521	521
522	522	return do_send_specific(tgid, pid, sig, info);
523	523	}
524		---- linux-5.4.145.orig/kernel/sys.c
525		-+++ linux-5.4.145/kernel/sys.c
	524	+--- linux-5.4.147.orig/kernel/sys.c
	525	++++ linux-5.4.147/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.145.orig/kernel/time/timekeeping.c
556		-+++ linux-5.4.145/kernel/time/timekeeping.c
	555	+--- linux-5.4.147.orig/kernel/time/timekeeping.c
	556	++++ linux-5.4.147/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.145.orig/net/ipv4/raw.c
591		-+++ linux-5.4.145/net/ipv4/raw.c
	590	+--- linux-5.4.147.orig/net/ipv4/raw.c
	591	++++ linux-5.4.147/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.145.orig/net/ipv4/udp.c
604		-+++ linux-5.4.145/net/ipv4/udp.c
	603	+--- linux-5.4.147.orig/net/ipv4/udp.c
	604	++++ linux-5.4.147/net/ipv4/udp.c
605	605	@@ -1744,6 +1744,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.145.orig/net/ipv6/raw.c
615		-+++ linux-5.4.145/net/ipv6/raw.c
	614	+--- linux-5.4.147.orig/net/ipv6/raw.c
	615	++++ linux-5.4.147/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.145.orig/net/ipv6/udp.c
628		-+++ linux-5.4.145/net/ipv6/udp.c
	627	+--- linux-5.4.147.orig/net/ipv6/udp.c
	628	++++ linux-5.4.147/net/ipv6/udp.c
629	629	@@ -291,6 +291,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.145.orig/net/socket.c
639		-+++ linux-5.4.145/net/socket.c
	638	+--- linux-5.4.147.orig/net/socket.c
	639	++++ linux-5.4.147/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.145.orig/net/unix/af_unix.c
652		-+++ linux-5.4.145/net/unix/af_unix.c
	651	+--- linux-5.4.147.orig/net/unix/af_unix.c
	652	++++ linux-5.4.147/net/unix/af_unix.c
653	653	@@ -2142,6 +2142,10 @@ static int unix_dgram_recvmsg(struct soc
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.4.145.orig/security/Kconfig
673		-+++ linux-5.4.145/security/Kconfig
	672	+--- linux-5.4.147.orig/security/Kconfig
	673	++++ linux-5.4.147/security/Kconfig
674	674	@@ -291,5 +291,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.4.145.orig/security/Makefile
683		-+++ linux-5.4.145/security/Makefile
	682	+--- linux-5.4.147.orig/security/Makefile
	683	++++ linux-5.4.147/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.145.orig/security/security.c
692		-+++ linux-5.4.145/security/security.c
	691	+--- linux-5.4.147.orig/security/security.c
	692	++++ linux-5.4.147/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 359)

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

		@@ -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-20210606.tar.gz ]
	21	+if [ ! -r caitsith-patch-0.2-20210916.tar.gz ]
22	22	then
23		- wget -O caitsith-patch-0.2-20210606.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20210606.tar.gz' \|\| die "Can't download patch."
	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."
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-20210606.tar.gz
	72	++tar -zxf %_sourcedir/caitsith-patch-0.2-20210916.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 359)

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

		@@ -18,9 +18,9 @@
18	18	rpm -ivh kernel-3.10.0-1160.42.2.el7.src.rpm \|\| die "Can't install source package."
19	19
20	20	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
21		-if [ ! -r caitsith-patch-0.2-20210606.tar.gz ]
	21	+if [ ! -r caitsith-patch-0.2-20210916.tar.gz ]
22	22	then
23		- wget -O caitsith-patch-0.2-20210606.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20210606.tar.gz' \|\| die "Can't download patch."
	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."
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-20210606.tar.gz
	72	++tar -zxf %_sourcedir/caitsith-patch-0.2-20210916.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 359)

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

		@@ -10,17 +10,17 @@
10	10
11	11	cd /tmp/ \|\| die "Can't chdir to /tmp/ ."
12	12
13		-if [ ! -r kernel-4.18.0-305.17.1.el8_4.src.rpm ]
	13	+if [ ! -r kernel-4.18.0-305.19.1.el8_4.src.rpm ]
14	14	then
15		- wget https://vault.centos.org/8.4.2105/BaseOS/Source/SPackages/kernel-4.18.0-305.17.1.el8_4.src.rpm \|\| die "Can't download source package."
	15	+ wget https://vault.centos.org/8.4.2105/BaseOS/Source/SPackages/kernel-4.18.0-305.19.1.el8_4.src.rpm \|\| die "Can't download source package."
16	16	fi
17		-LANG=C rpm --checksig kernel-4.18.0-305.17.1.el8_4.src.rpm \| grep -F ': digests signatures OK' \|\| die "Can't verify signature."
18		-rpm -ivh kernel-4.18.0-305.17.1.el8_4.src.rpm \|\| die "Can't install source package."
	17	+LANG=C rpm --checksig kernel-4.18.0-305.19.1.el8_4.src.rpm \| grep -F ': digests signatures OK' \|\| die "Can't verify signature."
	18	+rpm -ivh kernel-4.18.0-305.19.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-20210606.tar.gz ]
	21	+if [ ! -r caitsith-patch-0.2-20210916.tar.gz ]
22	22	then
23		- wget -O caitsith-patch-0.2-20210606.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20210606.tar.gz' \|\| die "Can't download patch."
	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."
24	24	fi
25	25
26	26	cd ~/rpmbuild/SPECS/ \|\| die "Can't chdir to ~/rpmbuild/SPECS/ ."

		@@ -36,13 +36,13 @@
36	36	+%define buildid _caitsith_0.2.10
37	37
38	38	%define rpmversion 4.18.0
39		- %define pkgrelease 305.17.1.el8_4
	39	+ %define pkgrelease 305.19.1.el8_4
40	40	@@ -1097,6 +1097,10 @@
41	41
42	42	# END OF PATCH APPLICATIONS
43	43
44	44	+# CaitSith
45		-+tar -zxf %_sourcedir/caitsith-patch-0.2-20210606.tar.gz
	45	++tar -zxf %_sourcedir/caitsith-patch-0.2-20210916.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 359)

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

		@@ -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-20210606.tar.gz ]
	26	+if [ ! -r caitsith-patch-0.2-20210916.tar.gz ]
27	27	then
28	28	apt-get -y install wget
29		- wget -O caitsith-patch-0.2-20210606.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20210606.tar.gz' \|\| die "Can't download patch."
	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."
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-20210606.tar.gz \|\| die "Can't extract patch."
	41	+tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20210916.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 359)

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

		@@ -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-20210606.tar.gz ]
	32	+if [ ! -r caitsith-patch-0.2-20210916.tar.gz ]
33	33	then
34		- wget -O caitsith-patch-0.2-20210606.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20210606.tar.gz' \|\| die "Can't download patch."
	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."
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-20210606.tar.gz \|\| die "Can't extract patch."
	47	+tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20210916.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 359)

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

		@@ -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-20210606.tar.gz ]
	32	+if [ ! -r caitsith-patch-0.2-20210916.tar.gz ]
33	33	then
34		- wget -O caitsith-patch-0.2-20210606.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20210606.tar.gz' \|\| die "Can't download patch."
	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."
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-20210606.tar.gz \|\| die "Can't extract patch."
	47	+tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20210916.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 359)

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

		@@ -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-20210606.tar.gz ]
	21	+if [ ! -r caitsith-patch-0.2-20210916.tar.gz ]
22	22	then
23		- wget -O caitsith-patch-0.2-20210606.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20210606.tar.gz' \|\| die "Can't download patch."
	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."
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-20210606.tar.gz
	64	++tar -zxf %_sourcedir/caitsith-patch-0.2-20210916.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/

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