OSDN > Buscar Software > System > Operating System Kernels > Linux > TOMOYO > SCM > SVN > Commit

TOMOYO
Fork

R/O
SSH
HTTPS

tomoyo: Commit

Commit MetaInfo

Revisión	6914 (tree)
Tiempo	2022-06-17 23:39:02
Autor	kumaneko

Log Message

(empty log message)

Cambiar Resumen

modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-4.14.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-4.18-centos-8.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-4.19.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-4.9.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-5.10.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-5.15.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-5.17.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-5.18.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-5.19.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-5.4.diff (diff)
modified: trunk/1.8.x/ccs-patch/specs/build-c8-4.18.sh (diff)

Diferencia incremental

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

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

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 4.14.282.
	1	+This is TOMOYO Linux patch for kernel 4.14.284.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.282.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.284.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.282.orig/fs/exec.c
32		-+++ linux-4.14.282/fs/exec.c
	31	+--- linux-4.14.284.orig/fs/exec.c
	32	++++ linux-4.14.284/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.282.orig/fs/open.c
43		-+++ linux-4.14.282/fs/open.c
	42	+--- linux-4.14.284.orig/fs/open.c
	43	++++ linux-4.14.284/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.282.orig/fs/proc/version.c
54		-+++ linux-4.14.282/fs/proc/version.c
	53	+--- linux-4.14.284.orig/fs/proc/version.c
	54	++++ linux-4.14.284/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.282 2022/06/06\n");
	62	++ printk(KERN_INFO "Hook version: 4.14.284 2022/06/17\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-4.14.282.orig/include/linux/init_task.h
67		-+++ linux-4.14.282/include/linux/init_task.h
	66	+--- linux-4.14.284.orig/include/linux/init_task.h
	67	++++ linux-4.14.284/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.282.orig/include/linux/sched.h
92		-+++ linux-4.14.282/include/linux/sched.h
	91	+--- linux-4.14.284.orig/include/linux/sched.h
	92	++++ linux-4.14.284/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.282.orig/include/linux/security.h
113		-+++ linux-4.14.282/include/linux/security.h
	112	+--- linux-4.14.284.orig/include/linux/security.h
	113	++++ linux-4.14.284/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.282.orig/include/net/ip.h
335		-+++ linux-4.14.282/include/net/ip.h
	334	+--- linux-4.14.284.orig/include/net/ip.h
	335	++++ linux-4.14.284/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.282.orig/kernel/kexec.c
355		-+++ linux-4.14.282/kernel/kexec.c
	354	+--- linux-4.14.284.orig/kernel/kexec.c
	355	++++ linux-4.14.284/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.282.orig/kernel/module.c
375		-+++ linux-4.14.282/kernel/module.c
	374	+--- linux-4.14.284.orig/kernel/module.c
	375	++++ linux-4.14.284/kernel/module.c
376	376	@@ -66,6 +66,7 @@
377	377	#include <linux/audit.h>
378	378	#include <uapi/linux/module.h>

		@@ -399,9 +399,9 @@
399	399
400	400	return 0;
401	401	}
402		---- linux-4.14.282.orig/kernel/ptrace.c
403		-+++ linux-4.14.282/kernel/ptrace.c
404		-@@ -1186,6 +1186,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
	402	+--- linux-4.14.284.orig/kernel/ptrace.c
	403	++++ linux-4.14.284/kernel/ptrace.c
	404	+@@ -1185,6 +1185,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
405	405	{
406	406	struct task_struct *child;
407	407	long ret;

		@@ -413,7 +413,7 @@
413	413
414	414	if (request == PTRACE_TRACEME) {
415	415	ret = ptrace_traceme();
416		-@@ -1335,6 +1340,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
	416	+@@ -1334,6 +1339,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
417	417	{
418	418	struct task_struct *child;
419	419	long ret;

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

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

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

		@@ -502,8 +502,8 @@
502	502
503	503	return do_send_specific(tgid, pid, sig, info);
504	504	}
505		---- linux-4.14.282.orig/kernel/sys.c
506		-+++ linux-4.14.282/kernel/sys.c
	505	+--- linux-4.14.284.orig/kernel/sys.c
	506	++++ linux-4.14.284/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.282.orig/kernel/time/ntp.c
537		-+++ linux-4.14.282/kernel/time/ntp.c
	536	+--- linux-4.14.284.orig/kernel/time/ntp.c
	537	++++ linux-4.14.284/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.282.orig/net/ipv4/raw.c
572		-+++ linux-4.14.282/net/ipv4/raw.c
	571	+--- linux-4.14.284.orig/net/ipv4/raw.c
	572	++++ linux-4.14.284/net/ipv4/raw.c
573	573	@@ -771,6 +771,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.282.orig/net/ipv4/udp.c
585		-+++ linux-4.14.282/net/ipv4/udp.c
	584	+--- linux-4.14.284.orig/net/ipv4/udp.c
	585	++++ linux-4.14.284/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.282.orig/net/ipv6/raw.c
596		-+++ linux-4.14.282/net/ipv6/raw.c
	595	+--- linux-4.14.284.orig/net/ipv6/raw.c
	596	++++ linux-4.14.284/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.282.orig/net/ipv6/udp.c
609		-+++ linux-4.14.282/net/ipv6/udp.c
	608	+--- linux-4.14.284.orig/net/ipv6/udp.c
	609	++++ linux-4.14.284/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.282.orig/net/socket.c
620		-+++ linux-4.14.282/net/socket.c
	619	+--- linux-4.14.284.orig/net/socket.c
	620	++++ linux-4.14.284/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.282.orig/net/unix/af_unix.c
633		-+++ linux-4.14.282/net/unix/af_unix.c
	632	+--- linux-4.14.284.orig/net/unix/af_unix.c
	633	++++ linux-4.14.284/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.282.orig/security/Kconfig
654		-+++ linux-4.14.282/security/Kconfig
	653	+--- linux-4.14.284.orig/security/Kconfig
	654	++++ linux-4.14.284/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.282.orig/security/Makefile
664		-+++ linux-4.14.282/security/Makefile
	663	+--- linux-4.14.284.orig/security/Makefile
	664	++++ linux-4.14.284/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.282.orig/security/security.c
673		-+++ linux-4.14.282/security/security.c
	672	+--- linux-4.14.284.orig/security/security.c
	673	++++ linux-4.14.284/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/1.8.x/ccs-patch/patches/ccs-patch-4.18-centos-8.diff (revision 6913)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.18-centos-8.diff (revision 6914)

		@@ -1,6 +1,6 @@
1	1	This is TOMOYO Linux patch for CentOS Stream 8.
2	2
3		-Source code for this patch is https://vault.centos.org/centos/8-stream/BaseOS/Source/SPackages/kernel-4.18.0-383.el8.src.rpm
	3	+Source code for this patch is https://vault.centos.org/centos/8-stream/BaseOS/Source/SPackages/kernel-4.18.0-394.el8.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 \| 5 ++-
29	29	24 files changed, 144 insertions(+), 29 deletions(-)
30	30
31		---- linux-4.18.0-383.el8.orig/fs/exec.c
32		-+++ linux-4.18.0-383.el8/fs/exec.c
	31	+--- linux-4.18.0-394.el8.orig/fs/exec.c
	32	++++ linux-4.18.0-394.el8/fs/exec.c
33	33	@@ -1748,7 +1748,7 @@ static int exec_binprm(struct linux_binp
34	34	old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
35	35	rcu_read_unlock();

		@@ -39,9 +39,9 @@
39	39	if (ret >= 0) {
40	40	audit_bprm(bprm);
41	41	trace_sched_process_exec(current, old_pid, bprm);
42		---- linux-4.18.0-383.el8.orig/fs/open.c
43		-+++ linux-4.18.0-383.el8/fs/open.c
44		-@@ -1237,6 +1237,8 @@ SYSCALL_DEFINE3(close_range, unsigned in
	42	+--- linux-4.18.0-394.el8.orig/fs/open.c
	43	++++ linux-4.18.0-394.el8/fs/open.c
	44	+@@ -1330,6 +1330,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-4.18.0-383.el8.orig/fs/proc/version.c
54		-+++ linux-4.18.0-383.el8/fs/proc/version.c
	53	+--- linux-4.18.0-394.el8.orig/fs/proc/version.c
	54	++++ linux-4.18.0-394.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-383.el8 2022/05/11\n");
	62	++ printk(KERN_INFO "Hook version: 4.18.0-394.el8 2022/06/17\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-4.18.0-383.el8.orig/include/linux/sched.h
67		-+++ linux-4.18.0-383.el8/include/linux/sched.h
	66	+--- linux-4.18.0-394.el8.orig/include/linux/sched.h
	67	++++ linux-4.18.0-394.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;

		@@ -73,7 +73,7 @@
73	73	struct cfs_rq;
74	74	struct fs_struct;
75	75	struct futex_pi_state;
76		-@@ -1408,6 +1409,10 @@ struct task_struct {
	76	+@@ -1432,6 +1433,10 @@ struct task_struct {
77	77	/* Used by LSM modules for access restriction: */
78	78	void *security;
79	79	#endif

		@@ -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-383.el8.orig/include/linux/security.h
88		-+++ linux-4.18.0-383.el8/include/linux/security.h
	87	+--- linux-4.18.0-394.el8.orig/include/linux/security.h
	88	++++ linux-4.18.0-394.el8/include/linux/security.h
89	89	@@ -56,6 +56,7 @@ struct mm_struct;
90	90	struct fs_context;
91	91	struct fs_parameter;

		@@ -306,9 +306,9 @@
306	306	}
307	307	#endif /* CONFIG_SECURITY_PATH */
308	308
309		---- linux-4.18.0-383.el8.orig/include/net/ip.h
310		-+++ linux-4.18.0-383.el8/include/net/ip.h
311		-@@ -282,6 +282,8 @@ void inet_get_local_port_range(struct ne
	309	+--- linux-4.18.0-394.el8.orig/include/net/ip.h
	310	++++ linux-4.18.0-394.el8/include/net/ip.h
	311	+@@ -297,6 +297,8 @@ void inet_get_local_port_range(struct ne
312	312	#ifdef CONFIG_SYSCTL
313	313	static inline bool inet_is_local_reserved_port(struct net *net, int port)
314	314	{

		@@ -317,7 +317,7 @@
317	317	if (!net->ipv4.sysctl_local_reserved_ports)
318	318	return false;
319	319	return test_bit(port, net->ipv4.sysctl_local_reserved_ports);
320		-@@ -300,6 +302,8 @@ static inline bool inet_port_requires_bi
	320	+@@ -315,6 +317,8 @@ static inline bool inet_port_requires_bi
321	321	#else
322	322	static inline bool inet_is_local_reserved_port(struct net *net, int port)
323	323	{

		@@ -326,8 +326,8 @@
326	326	return false;
327	327	}
328	328
329		---- linux-4.18.0-383.el8.orig/init/init_task.c
330		-+++ linux-4.18.0-383.el8/init/init_task.c
	329	+--- linux-4.18.0-394.el8.orig/init/init_task.c
	330	++++ linux-4.18.0-394.el8/init/init_task.c
331	331	@@ -217,6 +217,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-383.el8.orig/kernel/kexec.c
343		-+++ linux-4.18.0-383.el8/kernel/kexec.c
	342	+--- linux-4.18.0-394.el8.orig/kernel/kexec.c
	343	++++ linux-4.18.0-394.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-383.el8.orig/kernel/module.c
363		-+++ linux-4.18.0-383.el8/kernel/module.c
	362	+--- linux-4.18.0-394.el8.orig/kernel/module.c
	363	++++ linux-4.18.0-394.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-383.el8.orig/kernel/ptrace.c
391		-+++ linux-4.18.0-383.el8/kernel/ptrace.c
	390	+--- linux-4.18.0-394.el8.orig/kernel/ptrace.c
	391	++++ linux-4.18.0-394.el8/kernel/ptrace.c
392	392	@@ -1137,6 +1137,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-383.el8.orig/kernel/reboot.c
417		-+++ linux-4.18.0-383.el8/kernel/reboot.c
	416	+--- linux-4.18.0-394.el8.orig/kernel/reboot.c
	417	++++ linux-4.18.0-394.el8/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.18.0-383.el8.orig/kernel/sched/core.c
436		-+++ linux-4.18.0-383.el8/kernel/sched/core.c
437		-@@ -5022,6 +5022,8 @@ int can_nice(const struct task_struct *p
	435	+--- linux-4.18.0-394.el8.orig/kernel/sched/core.c
	436	++++ linux-4.18.0-394.el8/kernel/sched/core.c
	437	+@@ -4996,6 +4996,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.18.0-383.el8.orig/kernel/signal.c
447		-+++ linux-4.18.0-383.el8/kernel/signal.c
448		-@@ -3547,6 +3547,8 @@ SYSCALL_DEFINE2(kill, pid_t, pid, int, s
	446	+--- linux-4.18.0-394.el8.orig/kernel/signal.c
	447	++++ linux-4.18.0-394.el8/kernel/signal.c
	448	+@@ -3562,6 +3562,8 @@ SYSCALL_DEFINE2(kill, pid_t, pid, int, s
449	449	{
450	450	struct kernel_siginfo info;
451	451

		@@ -454,7 +454,7 @@
454	454	prepare_kill_siginfo(sig, &info);
455	455
456	456	return kill_something_info(sig, &info, pid);
457		-@@ -3729,6 +3731,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
	457	+@@ -3744,6 +3746,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		-@@ -3745,6 +3749,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
	466	+@@ -3760,6 +3764,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		-@@ -3758,6 +3764,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
	475	+@@ -3773,6 +3779,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
476	476	(task_pid_vnr(current) != pid))
477	477	return -EPERM;
478	478

		@@ -481,7 +481,7 @@
481	481	/* POSIX.1b doesn't mention process groups. */
482	482	return kill_proc_info(sig, info, pid);
483	483	}
484		-@@ -3805,6 +3813,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
	484	+@@ -3820,6 +3828,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
485	485	(task_pid_vnr(current) != pid))
486	486	return -EPERM;
487	487

		@@ -490,8 +490,8 @@
490	490	return do_send_specific(tgid, pid, sig, info);
491	491	}
492	492
493		---- linux-4.18.0-383.el8.orig/kernel/sys.c
494		-+++ linux-4.18.0-383.el8/kernel/sys.c
	493	+--- linux-4.18.0-394.el8.orig/kernel/sys.c
	494	++++ linux-4.18.0-394.el8/kernel/sys.c
495	495	@@ -210,6 +210,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-383.el8.orig/kernel/time/timekeeping.c
525		-+++ linux-4.18.0-383.el8/kernel/time/timekeeping.c
	524	+--- linux-4.18.0-394.el8.orig/kernel/time/timekeeping.c
	525	++++ linux-4.18.0-394.el8/kernel/time/timekeeping.c
526	526	@@ -26,6 +26,7 @@
527	527	#include <linux/pvclock_gtod.h>
528	528	#include <linux/compiler.h>

		@@ -531,7 +531,7 @@
531	531
532	532	#include "tick-internal.h"
533	533	#include "ntp_internal.h"
534		-@@ -2264,10 +2265,15 @@ static int timekeeping_validate_timex(co
	534	+@@ -2266,10 +2267,15 @@ static int timekeeping_validate_timex(co
535	535	if (!(txc->modes & ADJ_OFFSET_READONLY) &&
536	536	!capable(CAP_SYS_TIME))
537	537	return -EPERM;

		@@ -547,7 +547,7 @@
547	547	/*
548	548	* if the quartz is off by more than 10% then
549	549	* something is VERY wrong!
550		-@@ -2282,6 +2288,8 @@ static int timekeeping_validate_timex(co
	550	+@@ -2284,6 +2290,8 @@ static int timekeeping_validate_timex(co
551	551	/* In order to inject time, you gotta be super-user! */
552	552	if (!capable(CAP_SYS_TIME))
553	553	return -EPERM;

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

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

		@@ -580,8 +580,8 @@
580	580
581	581	ulen = udp_skb_len(skb);
582	582	copied = len;
583		---- linux-4.18.0-383.el8.orig/net/ipv6/raw.c
584		-+++ linux-4.18.0-383.el8/net/ipv6/raw.c
	583	+--- linux-4.18.0-394.el8.orig/net/ipv6/raw.c
	584	++++ linux-4.18.0-394.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-383.el8.orig/net/ipv6/udp.c
597		-+++ linux-4.18.0-383.el8/net/ipv6/udp.c
	596	+--- linux-4.18.0-394.el8.orig/net/ipv6/udp.c
	597	++++ linux-4.18.0-394.el8/net/ipv6/udp.c
598	598	@@ -346,6 +346,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-383.el8.orig/net/socket.c
608		-+++ linux-4.18.0-383.el8/net/socket.c
	607	+--- linux-4.18.0-394.el8.orig/net/socket.c
	608	++++ linux-4.18.0-394.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-383.el8.orig/net/unix/af_unix.c
621		-+++ linux-4.18.0-383.el8/net/unix/af_unix.c
	620	+--- linux-4.18.0-394.el8.orig/net/unix/af_unix.c
	621	++++ linux-4.18.0-394.el8/net/unix/af_unix.c
622	622	@@ -2165,6 +2165,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-383.el8.orig/security/Kconfig
642		-+++ linux-4.18.0-383.el8/security/Kconfig
	641	+--- linux-4.18.0-394.el8.orig/security/Kconfig
	642	++++ linux-4.18.0-394.el8/security/Kconfig
643	643	@@ -326,4 +326,6 @@ config LSM
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-383.el8.orig/security/Makefile
651		-+++ linux-4.18.0-383.el8/security/Makefile
	650	+--- linux-4.18.0-394.el8.orig/security/Makefile
	651	++++ linux-4.18.0-394.el8/security/Makefile
652	652	@@ -35,3 +35,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-383.el8.orig/security/security.c
660		-+++ linux-4.18.0-383.el8/security/security.c
	659	+--- linux-4.18.0-394.el8.orig/security/security.c
	660	++++ linux-4.18.0-394.el8/security/security.c
661	661	@@ -1553,7 +1553,9 @@ int security_task_alloc(struct task_stru
662	662
663	663	if (rc)

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.19.diff (revision 6913)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.19.diff (revision 6914)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 4.19.246.
	1	+This is TOMOYO Linux patch for kernel 4.19.248.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.246.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.248.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.246.orig/fs/exec.c
32		-+++ linux-4.19.246/fs/exec.c
	31	+--- linux-4.19.248.orig/fs/exec.c
	32	++++ linux-4.19.248/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.246.orig/fs/open.c
43		-+++ linux-4.19.246/fs/open.c
	42	+--- linux-4.19.248.orig/fs/open.c
	43	++++ linux-4.19.248/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.246.orig/fs/proc/version.c
54		-+++ linux-4.19.246/fs/proc/version.c
	53	+--- linux-4.19.248.orig/fs/proc/version.c
	54	++++ linux-4.19.248/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.246 2022/06/06\n");
	62	++ printk(KERN_INFO "Hook version: 4.19.248 2022/06/17\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-4.19.246.orig/include/linux/sched.h
67		-+++ linux-4.19.246/include/linux/sched.h
	66	+--- linux-4.19.248.orig/include/linux/sched.h
	67	++++ linux-4.19.248/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.246.orig/include/linux/security.h
88		-+++ linux-4.19.246/include/linux/security.h
	87	+--- linux-4.19.248.orig/include/linux/security.h
	88	++++ linux-4.19.248/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.246.orig/include/net/ip.h
310		-+++ linux-4.19.246/include/net/ip.h
	309	+--- linux-4.19.248.orig/include/net/ip.h
	310	++++ linux-4.19.248/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.246.orig/init/init_task.c
330		-+++ linux-4.19.246/init/init_task.c
	329	+--- linux-4.19.248.orig/init/init_task.c
	330	++++ linux-4.19.248/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.246.orig/kernel/kexec.c
343		-+++ linux-4.19.246/kernel/kexec.c
	342	+--- linux-4.19.248.orig/kernel/kexec.c
	343	++++ linux-4.19.248/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.246.orig/kernel/module.c
363		-+++ linux-4.19.246/kernel/module.c
	362	+--- linux-4.19.248.orig/kernel/module.c
	363	++++ linux-4.19.248/kernel/module.c
364	364	@@ -66,6 +66,7 @@
365	365	#include <linux/audit.h>
366	366	#include <uapi/linux/module.h>

		@@ -387,9 +387,9 @@
387	387
388	388	return 0;
389	389	}
390		---- linux-4.19.246.orig/kernel/ptrace.c
391		-+++ linux-4.19.246/kernel/ptrace.c
392		-@@ -1169,6 +1169,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
	390	+--- linux-4.19.248.orig/kernel/ptrace.c
	391	++++ linux-4.19.248/kernel/ptrace.c
	392	+@@ -1168,6 +1168,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
393	393	{
394	394	struct task_struct *child;
395	395	long ret;

		@@ -401,7 +401,7 @@
401	401
402	402	if (request == PTRACE_TRACEME) {
403	403	ret = ptrace_traceme();
404		-@@ -1317,6 +1322,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
	404	+@@ -1316,6 +1321,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
405	405	{
406	406	struct task_struct *child;
407	407	long ret;

		@@ -413,8 +413,8 @@
413	413
414	414	if (request == PTRACE_TRACEME) {
415	415	ret = ptrace_traceme();
416		---- linux-4.19.246.orig/kernel/reboot.c
417		-+++ linux-4.19.246/kernel/reboot.c
	416	+--- linux-4.19.248.orig/kernel/reboot.c
	417	++++ linux-4.19.248/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.19.246.orig/kernel/sched/core.c
436		-+++ linux-4.19.246/kernel/sched/core.c
	435	+--- linux-4.19.248.orig/kernel/sched/core.c
	436	++++ linux-4.19.248/kernel/sched/core.c
437	437	@@ -3992,6 +3992,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.19.246.orig/kernel/signal.c
447		-+++ linux-4.19.246/kernel/signal.c
	446	+--- linux-4.19.248.orig/kernel/signal.c
	447	++++ linux-4.19.248/kernel/signal.c
448	448	@@ -3276,6 +3276,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait,
449	449	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
450	450	{

		@@ -490,8 +490,8 @@
490	490
491	491	return do_send_specific(tgid, pid, sig, info);
492	492	}
493		---- linux-4.19.246.orig/kernel/sys.c
494		-+++ linux-4.19.246/kernel/sys.c
	493	+--- linux-4.19.248.orig/kernel/sys.c
	494	++++ linux-4.19.248/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.246.orig/kernel/time/timekeeping.c
525		-+++ linux-4.19.246/kernel/time/timekeeping.c
	524	+--- linux-4.19.248.orig/kernel/time/timekeeping.c
	525	++++ linux-4.19.248/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.246.orig/net/ipv4/raw.c
560		-+++ linux-4.19.246/net/ipv4/raw.c
	559	+--- linux-4.19.248.orig/net/ipv4/raw.c
	560	++++ linux-4.19.248/net/ipv4/raw.c
561	561	@@ -775,6 +775,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.246.orig/net/ipv4/udp.c
573		-+++ linux-4.19.246/net/ipv4/udp.c
	572	+--- linux-4.19.248.orig/net/ipv4/udp.c
	573	++++ linux-4.19.248/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.246.orig/net/ipv6/raw.c
584		-+++ linux-4.19.246/net/ipv6/raw.c
	583	+--- linux-4.19.248.orig/net/ipv6/raw.c
	584	++++ linux-4.19.248/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.246.orig/net/ipv6/udp.c
597		-+++ linux-4.19.246/net/ipv6/udp.c
	596	+--- linux-4.19.248.orig/net/ipv6/udp.c
	597	++++ linux-4.19.248/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.246.orig/net/socket.c
608		-+++ linux-4.19.246/net/socket.c
	607	+--- linux-4.19.248.orig/net/socket.c
	608	++++ linux-4.19.248/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.246.orig/net/unix/af_unix.c
621		-+++ linux-4.19.246/net/unix/af_unix.c
	620	+--- linux-4.19.248.orig/net/unix/af_unix.c
	621	++++ linux-4.19.248/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,8 +638,8 @@
638	638	mutex_unlock(&u->iolock);
639	639	out:
640	640	return err;
641		---- linux-4.19.246.orig/security/Kconfig
642		-+++ linux-4.19.246/security/Kconfig
	641	+--- linux-4.19.248.orig/security/Kconfig
	642	++++ linux-4.19.248/security/Kconfig
643	643	@@ -279,5 +279,7 @@ config DEFAULT_SECURITY
644	644	default "apparmor" if DEFAULT_SECURITY_APPARMOR
645	645	default "" if DEFAULT_SECURITY_DAC

		@@ -648,8 +648,8 @@
648	648	+
649	649	endmenu
650	650
651		---- linux-4.19.246.orig/security/Makefile
652		-+++ linux-4.19.246/security/Makefile
	651	+--- linux-4.19.248.orig/security/Makefile
	652	++++ linux-4.19.248/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.246.orig/security/security.c
661		-+++ linux-4.19.246/security/security.c
	660	+--- linux-4.19.248.orig/security/security.c
	661	++++ linux-4.19.248/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/1.8.x/ccs-patch/patches/ccs-patch-4.9.diff (revision 6913)

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

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 4.9.317.
	1	+This is TOMOYO Linux patch for kernel 4.9.319.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.317.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.319.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.317.orig/fs/exec.c
32		-+++ linux-4.9.317/fs/exec.c
	31	+--- linux-4.9.319.orig/fs/exec.c
	32	++++ linux-4.9.319/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.317.orig/fs/open.c
43		-+++ linux-4.9.317/fs/open.c
	42	+--- linux-4.9.319.orig/fs/open.c
	43	++++ linux-4.9.319/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.317.orig/fs/proc/version.c
54		-+++ linux-4.9.317/fs/proc/version.c
	53	+--- linux-4.9.319.orig/fs/proc/version.c
	54	++++ linux-4.9.319/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.317 2022/06/06\n");
	62	++ printk(KERN_INFO "Hook version: 4.9.319 2022/06/17\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-4.9.317.orig/include/linux/init_task.h
67		-+++ linux-4.9.317/include/linux/init_task.h
	66	+--- linux-4.9.319.orig/include/linux/init_task.h
	67	++++ linux-4.9.319/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.317.orig/include/linux/sched.h
92		-+++ linux-4.9.317/include/linux/sched.h
	91	+--- linux-4.9.319.orig/include/linux/sched.h
	92	++++ linux-4.9.319/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.317.orig/include/linux/security.h
114		-+++ linux-4.9.317/include/linux/security.h
	113	+--- linux-4.9.319.orig/include/linux/security.h
	114	++++ linux-4.9.319/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.317.orig/include/net/ip.h
322		-+++ linux-4.9.317/include/net/ip.h
	321	+--- linux-4.9.319.orig/include/net/ip.h
	322	++++ linux-4.9.319/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.317.orig/kernel/fork.c
342		-+++ linux-4.9.317/kernel/fork.c
	341	+--- linux-4.9.319.orig/kernel/fork.c
	342	++++ linux-4.9.319/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.317.orig/kernel/kexec.c
370		-+++ linux-4.9.317/kernel/kexec.c
	369	+--- linux-4.9.319.orig/kernel/kexec.c
	370	++++ linux-4.9.319/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.317.orig/kernel/module.c
390		-+++ linux-4.9.317/kernel/module.c
	389	+--- linux-4.9.319.orig/kernel/module.c
	390	++++ linux-4.9.319/kernel/module.c
391	391	@@ -63,6 +63,7 @@
392	392	#include <linux/dynamic_debug.h>
393	393	#include <uapi/linux/module.h>

		@@ -414,9 +414,9 @@
414	414
415	415	return 0;
416	416	}
417		---- linux-4.9.317.orig/kernel/ptrace.c
418		-+++ linux-4.9.317/kernel/ptrace.c
419		-@@ -1179,6 +1179,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
	417	+--- linux-4.9.319.orig/kernel/ptrace.c
	418	++++ linux-4.9.319/kernel/ptrace.c
	419	+@@ -1178,6 +1178,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
420	420	{
421	421	struct task_struct *child;
422	422	long ret;

		@@ -428,7 +428,7 @@
428	428
429	429	if (request == PTRACE_TRACEME) {
430	430	ret = ptrace_traceme();
431		-@@ -1328,6 +1333,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
	431	+@@ -1327,6 +1332,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
432	432	{
433	433	struct task_struct *child;
434	434	long ret;

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

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

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

		@@ -517,8 +517,8 @@
517	517
518	518	return do_send_specific(tgid, pid, sig, info);
519	519	}
520		---- linux-4.9.317.orig/kernel/sys.c
521		-+++ linux-4.9.317/kernel/sys.c
	520	+--- linux-4.9.319.orig/kernel/sys.c
	521	++++ linux-4.9.319/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.317.orig/kernel/time/ntp.c
552		-+++ linux-4.9.317/kernel/time/ntp.c
	551	+--- linux-4.9.319.orig/kernel/time/ntp.c
	552	++++ linux-4.9.319/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.317.orig/net/ipv4/raw.c
587		-+++ linux-4.9.317/net/ipv4/raw.c
	586	+--- linux-4.9.319.orig/net/ipv4/raw.c
	587	++++ linux-4.9.319/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.9.317.orig/net/ipv4/udp.c
600		-+++ linux-4.9.317/net/ipv4/udp.c
	599	+--- linux-4.9.319.orig/net/ipv4/udp.c
	600	++++ linux-4.9.319/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.317.orig/net/ipv6/raw.c
611		-+++ linux-4.9.317/net/ipv6/raw.c
	610	+--- linux-4.9.319.orig/net/ipv6/raw.c
	611	++++ linux-4.9.319/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.317.orig/net/ipv6/udp.c
624		-+++ linux-4.9.317/net/ipv6/udp.c
	623	+--- linux-4.9.319.orig/net/ipv6/udp.c
	624	++++ linux-4.9.319/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.317.orig/net/socket.c
635		-+++ linux-4.9.317/net/socket.c
	634	+--- linux-4.9.319.orig/net/socket.c
	635	++++ linux-4.9.319/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.317.orig/net/unix/af_unix.c
648		-+++ linux-4.9.317/net/unix/af_unix.c
	647	+--- linux-4.9.319.orig/net/unix/af_unix.c
	648	++++ linux-4.9.319/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.317.orig/security/Kconfig
669		-+++ linux-4.9.317/security/Kconfig
	668	+--- linux-4.9.319.orig/security/Kconfig
	669	++++ linux-4.9.319/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.317.orig/security/Makefile
679		-+++ linux-4.9.317/security/Makefile
	678	+--- linux-4.9.319.orig/security/Makefile
	679	++++ linux-4.9.319/security/Makefile
680	680	@@ -29,3 +29,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
681	681	# Object integrity file lists
682	682	subdir-$(CONFIG_INTEGRITY) += integrity

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-5.10.diff (revision 6913)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-5.10.diff (revision 6914)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 5.10.120.
	1	+This is TOMOYO Linux patch for kernel 5.10.123.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.120.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.123.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.120.orig/fs/exec.c
32		-+++ linux-5.10.120/fs/exec.c
	31	+--- linux-5.10.123.orig/fs/exec.c
	32	++++ linux-5.10.123/fs/exec.c
33	33	@@ -1823,7 +1823,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.120.orig/fs/open.c
43		-+++ linux-5.10.120/fs/open.c
	42	+--- linux-5.10.123.orig/fs/open.c
	43	++++ linux-5.10.123/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.120.orig/fs/proc/version.c
54		-+++ linux-5.10.120/fs/proc/version.c
	53	+--- linux-5.10.123.orig/fs/proc/version.c
	54	++++ linux-5.10.123/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.120 2022/06/06\n");
	62	++ printk(KERN_INFO "Hook version: 5.10.123 2022/06/17\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.10.120.orig/include/linux/sched.h
67		-+++ linux-5.10.120/include/linux/sched.h
	66	+--- linux-5.10.123.orig/include/linux/sched.h
	67	++++ linux-5.10.123/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.120.orig/include/linux/security.h
88		-+++ linux-5.10.120/include/linux/security.h
	87	+--- linux-5.10.123.orig/include/linux/security.h
	88	++++ linux-5.10.123/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		-@@ -1404,7 +1410,7 @@ static inline int security_unix_may_send
	190	+@@ -1405,7 +1411,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		-@@ -1425,19 +1431,19 @@ static inline int security_socket_bind(s
	199	+@@ -1426,19 +1432,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		-@@ -1449,7 +1455,7 @@ static inline int security_socket_accept
	222	+@@ -1450,7 +1456,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		-@@ -1736,42 +1742,42 @@ int security_path_chroot(const struct pa
	231	+@@ -1741,42 +1747,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		-@@ -1780,22 +1786,32 @@ static inline int security_path_rename(c
	281	+@@ -1785,22 +1791,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.120.orig/include/net/ip.h
319		-+++ linux-5.10.120/include/net/ip.h
	318	+--- linux-5.10.123.orig/include/net/ip.h
	319	++++ linux-5.10.123/include/net/ip.h
320	320	@@ -340,6 +340,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.120.orig/init/init_task.c
339		-+++ linux-5.10.120/init/init_task.c
	338	+--- linux-5.10.123.orig/init/init_task.c
	339	++++ linux-5.10.123/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.120.orig/kernel/kexec.c
352		-+++ linux-5.10.120/kernel/kexec.c
	351	+--- linux-5.10.123.orig/kernel/kexec.c
	352	++++ linux-5.10.123/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.120.orig/kernel/module.c
372		-+++ linux-5.10.120/kernel/module.c
	371	+--- linux-5.10.123.orig/kernel/module.c
	372	++++ linux-5.10.123/kernel/module.c
373	373	@@ -59,6 +59,7 @@
374	374	#include <linux/audit.h>
375	375	#include <uapi/linux/module.h>

		@@ -396,9 +396,9 @@
396	396
397	397	return 0;
398	398	}
399		---- linux-5.10.120.orig/kernel/ptrace.c
400		-+++ linux-5.10.120/kernel/ptrace.c
401		-@@ -1271,6 +1271,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
	399	+--- linux-5.10.123.orig/kernel/ptrace.c
	400	++++ linux-5.10.123/kernel/ptrace.c
	401	+@@ -1270,6 +1270,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
402	402	{
403	403	struct task_struct *child;
404	404	long ret;

		@@ -410,7 +410,7 @@
410	410
411	411	if (request == PTRACE_TRACEME) {
412	412	ret = ptrace_traceme();
413		-@@ -1418,6 +1423,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
	413	+@@ -1417,6 +1422,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
414	414	{
415	415	struct task_struct *child;
416	416	long ret;

		@@ -422,8 +422,8 @@
422	422
423	423	if (request == PTRACE_TRACEME) {
424	424	ret = ptrace_traceme();
425		---- linux-5.10.120.orig/kernel/reboot.c
426		-+++ linux-5.10.120/kernel/reboot.c
	425	+--- linux-5.10.123.orig/kernel/reboot.c
	426	++++ linux-5.10.123/kernel/reboot.c
427	427	@@ -17,6 +17,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.10.120.orig/kernel/sched/core.c
445		-+++ linux-5.10.120/kernel/sched/core.c
	444	+--- linux-5.10.123.orig/kernel/sched/core.c
	445	++++ linux-5.10.123/kernel/sched/core.c
446	446	@@ -5057,6 +5057,8 @@ int can_nice(const struct task_struct *p
447	447	SYSCALL_DEFINE1(nice, int, increment)
448	448	{

		@@ -452,8 +452,8 @@
452	452
453	453	/*
454	454	* Setpriority might change our priority at the same moment.
455		---- linux-5.10.120.orig/kernel/signal.c
456		-+++ linux-5.10.120/kernel/signal.c
	455	+--- linux-5.10.123.orig/kernel/signal.c
	456	++++ linux-5.10.123/kernel/signal.c
457	457	@@ -3648,6 +3648,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.120.orig/kernel/sys.c
525		-+++ linux-5.10.120/kernel/sys.c
	524	+--- linux-5.10.123.orig/kernel/sys.c
	525	++++ linux-5.10.123/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.120.orig/kernel/time/timekeeping.c
556		-+++ linux-5.10.120/kernel/time/timekeeping.c
	555	+--- linux-5.10.123.orig/kernel/time/timekeeping.c
	556	++++ linux-5.10.123/kernel/time/timekeeping.c
557	557	@@ -23,6 +23,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.120.orig/net/ipv4/raw.c
591		-+++ linux-5.10.120/net/ipv4/raw.c
	590	+--- linux-5.10.123.orig/net/ipv4/raw.c
	591	++++ linux-5.10.123/net/ipv4/raw.c
592	592	@@ -771,6 +771,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.120.orig/net/ipv4/udp.c
604		-+++ linux-5.10.120/net/ipv4/udp.c
	603	+--- linux-5.10.123.orig/net/ipv4/udp.c
	604	++++ linux-5.10.123/net/ipv4/udp.c
605	605	@@ -1808,6 +1808,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.120.orig/net/ipv6/raw.c
615		-+++ linux-5.10.120/net/ipv6/raw.c
	614	+--- linux-5.10.123.orig/net/ipv6/raw.c
	615	++++ linux-5.10.123/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.120.orig/net/ipv6/udp.c
628		-+++ linux-5.10.120/net/ipv6/udp.c
	627	+--- linux-5.10.123.orig/net/ipv6/udp.c
	628	++++ linux-5.10.123/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.120.orig/net/socket.c
639		-+++ linux-5.10.120/net/socket.c
	638	+--- linux-5.10.123.orig/net/socket.c
	639	++++ linux-5.10.123/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.120.orig/net/unix/af_unix.c
652		-+++ linux-5.10.120/net/unix/af_unix.c
	651	+--- linux-5.10.123.orig/net/unix/af_unix.c
	652	++++ linux-5.10.123/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,8 +669,8 @@
669	669	mutex_unlock(&u->iolock);
670	670	out:
671	671	return err;
672		---- linux-5.10.120.orig/security/Kconfig
673		-+++ linux-5.10.120/security/Kconfig
	672	+--- linux-5.10.123.orig/security/Kconfig
	673	++++ linux-5.10.123/security/Kconfig
674	674	@@ -294,5 +294,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.120.orig/security/Makefile
683		-+++ linux-5.10.120/security/Makefile
	682	+--- linux-5.10.123.orig/security/Makefile
	683	++++ linux-5.10.123/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.120.orig/security/security.c
692		-+++ linux-5.10.120/security/security.c
	691	+--- linux-5.10.123.orig/security/security.c
	692	++++ linux-5.10.123/security/security.c
693	693	@@ -1601,7 +1601,9 @@ int security_task_alloc(struct task_stru
694	694
695	695	if (rc)

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-5.15.diff (revision 6913)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-5.15.diff (revision 6914)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 5.15.45.
	1	+This is TOMOYO Linux patch for kernel 5.15.48.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.45.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.48.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.45.orig/fs/exec.c
32		-+++ linux-5.15.45/fs/exec.c
	31	+--- linux-5.15.48.orig/fs/exec.c
	32	++++ linux-5.15.48/fs/exec.c
33	33	@@ -1838,7 +1838,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.15.45.orig/fs/open.c
43		-+++ linux-5.15.45/fs/open.c
	42	+--- linux-5.15.48.orig/fs/open.c
	43	++++ linux-5.15.48/fs/open.c
44	44	@@ -1371,6 +1371,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.15.45.orig/fs/proc/version.c
54		-+++ linux-5.15.45/fs/proc/version.c
	53	+--- linux-5.15.48.orig/fs/proc/version.c
	54	++++ linux-5.15.48/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.45 2022/06/06\n");
	62	++ printk(KERN_INFO "Hook version: 5.15.48 2022/06/17\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.15.45.orig/include/linux/sched.h
67		-+++ linux-5.15.45/include/linux/sched.h
	66	+--- linux-5.15.48.orig/include/linux/sched.h
	67	++++ linux-5.15.48/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.45.orig/include/linux/security.h
88		-+++ linux-5.15.45/include/linux/security.h
	87	+--- linux-5.15.48.orig/include/linux/security.h
	88	++++ linux-5.15.48/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.45.orig/include/net/ip.h
319		-+++ linux-5.15.45/include/net/ip.h
	318	+--- linux-5.15.48.orig/include/net/ip.h
	319	++++ linux-5.15.48/include/net/ip.h
320	320	@@ -340,6 +340,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.45.orig/init/init_task.c
339		-+++ linux-5.15.45/init/init_task.c
	338	+--- linux-5.15.48.orig/init/init_task.c
	339	++++ linux-5.15.48/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.45.orig/kernel/kexec.c
352		-+++ linux-5.15.45/kernel/kexec.c
	351	+--- linux-5.15.48.orig/kernel/kexec.c
	352	++++ linux-5.15.48/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.45.orig/kernel/module.c
372		-+++ linux-5.15.45/kernel/module.c
	371	+--- linux-5.15.48.orig/kernel/module.c
	372	++++ linux-5.15.48/kernel/module.c
373	373	@@ -59,6 +59,7 @@
374	374	#include <linux/audit.h>
375	375	#include <uapi/linux/module.h>

		@@ -396,9 +396,9 @@
396	396
397	397	return 0;
398	398	}
399		---- linux-5.15.45.orig/kernel/ptrace.c
400		-+++ linux-5.15.45/kernel/ptrace.c
401		-@@ -1296,6 +1296,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
	399	+--- linux-5.15.48.orig/kernel/ptrace.c
	400	++++ linux-5.15.48/kernel/ptrace.c
	401	+@@ -1295,6 +1295,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
402	402	{
403	403	struct task_struct *child;
404	404	long ret;

		@@ -410,7 +410,7 @@
410	410
411	411	if (request == PTRACE_TRACEME) {
412	412	ret = ptrace_traceme();
413		-@@ -1443,6 +1448,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
	413	+@@ -1442,6 +1447,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
414	414	{
415	415	struct task_struct *child;
416	416	long ret;

		@@ -422,8 +422,8 @@
422	422
423	423	if (request == PTRACE_TRACEME) {
424	424	ret = ptrace_traceme();
425		---- linux-5.15.45.orig/kernel/reboot.c
426		-+++ linux-5.15.45/kernel/reboot.c
	425	+--- linux-5.15.48.orig/kernel/reboot.c
	426	++++ linux-5.15.48/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.15.45.orig/kernel/sched/core.c
445		-+++ linux-5.15.45/kernel/sched/core.c
	444	+--- linux-5.15.48.orig/kernel/sched/core.c
	445	++++ linux-5.15.48/kernel/sched/core.c
446	446	@@ -6958,6 +6958,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.15.45.orig/kernel/signal.c
456		-+++ linux-5.15.45/kernel/signal.c
457		-@@ -3787,6 +3787,8 @@ static inline void prepare_kill_siginfo(
	455	+--- linux-5.15.48.orig/kernel/signal.c
	456	++++ linux-5.15.48/kernel/signal.c
	457	+@@ -3800,6 +3800,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		-@@ -3886,6 +3888,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int,
	466	+@@ -3899,6 +3901,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		-@@ -3970,6 +3987,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
	488	+@@ -3983,6 +4000,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		-@@ -3986,6 +4005,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
	497	+@@ -3999,6 +4018,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		-@@ -3998,6 +4019,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
	506	+@@ -4011,6 +4032,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		-@@ -4045,6 +4068,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
	515	+@@ -4058,6 +4081,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.45.orig/kernel/sys.c
525		-+++ linux-5.15.45/kernel/sys.c
	524	+--- linux-5.15.48.orig/kernel/sys.c
	525	++++ linux-5.15.48/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.45.orig/kernel/time/timekeeping.c
556		-+++ linux-5.15.45/kernel/time/timekeeping.c
	555	+--- linux-5.15.48.orig/kernel/time/timekeeping.c
	556	++++ linux-5.15.48/kernel/time/timekeeping.c
557	557	@@ -23,6 +23,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.45.orig/net/ipv4/raw.c
591		-+++ linux-5.15.45/net/ipv4/raw.c
	590	+--- linux-5.15.48.orig/net/ipv4/raw.c
	591	++++ linux-5.15.48/net/ipv4/raw.c
592	592	@@ -771,6 +771,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.15.45.orig/net/ipv4/udp.c
604		-+++ linux-5.15.45/net/ipv4/udp.c
	603	+--- linux-5.15.48.orig/net/ipv4/udp.c
	604	++++ linux-5.15.48/net/ipv4/udp.c
605	605	@@ -1862,6 +1862,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.15.45.orig/net/ipv6/raw.c
615		-+++ linux-5.15.45/net/ipv6/raw.c
	614	+--- linux-5.15.48.orig/net/ipv6/raw.c
	615	++++ linux-5.15.48/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.45.orig/net/ipv6/udp.c
628		-+++ linux-5.15.45/net/ipv6/udp.c
	627	+--- linux-5.15.48.orig/net/ipv6/udp.c
	628	++++ linux-5.15.48/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.15.45.orig/net/socket.c
639		-+++ linux-5.15.45/net/socket.c
	638	+--- linux-5.15.48.orig/net/socket.c
	639	++++ linux-5.15.48/net/socket.c
640	640	@@ -1778,6 +1778,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.45.orig/net/unix/af_unix.c
652		-+++ linux-5.15.45/net/unix/af_unix.c
	651	+--- linux-5.15.48.orig/net/unix/af_unix.c
	652	++++ linux-5.15.48/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.15.45.orig/security/Kconfig
673		-+++ linux-5.15.45/security/Kconfig
	672	+--- linux-5.15.48.orig/security/Kconfig
	673	++++ linux-5.15.48/security/Kconfig
674	674	@@ -295,5 +295,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.15.45.orig/security/Makefile
683		-+++ linux-5.15.45/security/Makefile
	682	+--- linux-5.15.48.orig/security/Makefile
	683	++++ linux-5.15.48/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.45.orig/security/security.c
692		-+++ linux-5.15.45/security/security.c
	691	+--- linux-5.15.48.orig/security/security.c
	692	++++ linux-5.15.48/security/security.c
693	693	@@ -1659,7 +1659,9 @@ int security_task_alloc(struct task_stru
694	694
695	695	if (rc)

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-5.17.diff (revision 6913)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-5.17.diff (revision 6914)

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

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

		@@ -39,8 +39,8 @@
39	39	if (retval < 0)
40	40	goto out;
41	41
42		---- linux-5.17.13.orig/fs/open.c
43		-+++ linux-5.17.13/fs/open.c
	42	+--- linux-5.17.15.orig/fs/open.c
	43	++++ linux-5.17.15/fs/open.c
44	44	@@ -1375,6 +1375,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.17.13.orig/fs/proc/version.c
54		-+++ linux-5.17.13/fs/proc/version.c
	53	+--- linux-5.17.15.orig/fs/proc/version.c
	54	++++ linux-5.17.15/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.17.13 2022/06/06\n");
	62	++ printk(KERN_INFO "Hook version: 5.17.15 2022/06/17\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.17.13.orig/include/linux/sched.h
67		-+++ linux-5.17.13/include/linux/sched.h
	66	+--- linux-5.17.15.orig/include/linux/sched.h
	67	++++ linux-5.17.15/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.17.13.orig/include/linux/security.h
88		-+++ linux-5.17.13/include/linux/security.h
	87	+--- linux-5.17.15.orig/include/linux/security.h
	88	++++ linux-5.17.15/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.17.13.orig/include/net/ip.h
319		-+++ linux-5.17.13/include/net/ip.h
	318	+--- linux-5.17.15.orig/include/net/ip.h
	319	++++ linux-5.17.15/include/net/ip.h
320	320	@@ -345,6 +345,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.17.13.orig/init/init_task.c
339		-+++ linux-5.17.13/init/init_task.c
	338	+--- linux-5.17.15.orig/init/init_task.c
	339	++++ linux-5.17.15/init/init_task.c
340	340	@@ -209,6 +209,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.17.13.orig/kernel/kexec.c
352		-+++ linux-5.17.13/kernel/kexec.c
	351	+--- linux-5.17.15.orig/kernel/kexec.c
	352	++++ linux-5.17.15/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.17.13.orig/kernel/module.c
372		-+++ linux-5.17.13/kernel/module.c
	371	+--- linux-5.17.15.orig/kernel/module.c
	372	++++ linux-5.17.15/kernel/module.c
373	373	@@ -59,6 +59,7 @@
374	374	#include <linux/audit.h>
375	375	#include <uapi/linux/module.h>

		@@ -387,7 +387,7 @@
387	387
388	388	if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0)
389	389	return -EFAULT;
390		-@@ -3822,6 +3825,8 @@ static int may_init_module(void)
	390	+@@ -3826,6 +3829,8 @@ static int may_init_module(void)
391	391	{
392	392	if (!capable(CAP_SYS_MODULE) \|\| modules_disabled)
393	393	return -EPERM;

		@@ -396,9 +396,9 @@
396	396
397	397	return 0;
398	398	}
399		---- linux-5.17.13.orig/kernel/ptrace.c
400		-+++ linux-5.17.13/kernel/ptrace.c
401		-@@ -1294,6 +1294,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
	399	+--- linux-5.17.15.orig/kernel/ptrace.c
	400	++++ linux-5.17.15/kernel/ptrace.c
	401	+@@ -1293,6 +1293,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
402	402	{
403	403	struct task_struct *child;
404	404	long ret;

		@@ -410,7 +410,7 @@
410	410
411	411	if (request == PTRACE_TRACEME) {
412	412	ret = ptrace_traceme();
413		-@@ -1441,6 +1446,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
	413	+@@ -1440,6 +1445,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
414	414	{
415	415	struct task_struct *child;
416	416	long ret;

		@@ -422,8 +422,8 @@
422	422
423	423	if (request == PTRACE_TRACEME) {
424	424	ret = ptrace_traceme();
425		---- linux-5.17.13.orig/kernel/reboot.c
426		-+++ linux-5.17.13/kernel/reboot.c
	425	+--- linux-5.17.15.orig/kernel/reboot.c
	426	++++ linux-5.17.15/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.17.13.orig/kernel/sched/core.c
445		-+++ linux-5.17.13/kernel/sched/core.c
	444	+--- linux-5.17.15.orig/kernel/sched/core.c
	445	++++ linux-5.17.15/kernel/sched/core.c
446	446	@@ -6983,6 +6983,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.17.13.orig/kernel/signal.c
456		-+++ linux-5.17.13/kernel/signal.c
457		-@@ -3773,6 +3773,8 @@ static inline void prepare_kill_siginfo(
	455	+--- linux-5.17.15.orig/kernel/signal.c
	456	++++ linux-5.17.15/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		-@@ -3872,6 +3874,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		-@@ -3956,6 +3973,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		-@@ -3972,6 +3991,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		-@@ -3984,6 +4005,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		-@@ -4031,6 +4054,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.17.13.orig/kernel/sys.c
525		-+++ linux-5.17.13/kernel/sys.c
	524	+--- linux-5.17.15.orig/kernel/sys.c
	525	++++ linux-5.17.15/kernel/sys.c
526	526	@@ -212,6 +212,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.17.13.orig/kernel/time/timekeeping.c
556		-+++ linux-5.17.13/kernel/time/timekeeping.c
	555	+--- linux-5.17.15.orig/kernel/time/timekeeping.c
	556	++++ linux-5.17.15/kernel/time/timekeeping.c
557	557	@@ -23,6 +23,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.17.13.orig/net/ipv4/raw.c
591		-+++ linux-5.17.13/net/ipv4/raw.c
	590	+--- linux-5.17.15.orig/net/ipv4/raw.c
	591	++++ linux-5.17.15/net/ipv4/raw.c
592	592	@@ -772,6 +772,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.17.13.orig/net/ipv4/udp.c
604		-+++ linux-5.17.13/net/ipv4/udp.c
	603	+--- linux-5.17.15.orig/net/ipv4/udp.c
	604	++++ linux-5.17.15/net/ipv4/udp.c
605	605	@@ -1862,6 +1862,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.17.13.orig/net/ipv6/raw.c
615		-+++ linux-5.17.13/net/ipv6/raw.c
	614	+--- linux-5.17.15.orig/net/ipv6/raw.c
	615	++++ linux-5.17.15/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.17.13.orig/net/ipv6/udp.c
628		-+++ linux-5.17.13/net/ipv6/udp.c
	627	+--- linux-5.17.15.orig/net/ipv6/udp.c
	628	++++ linux-5.17.15/net/ipv6/udp.c
629	629	@@ -345,6 +345,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.17.13.orig/net/socket.c
639		-+++ linux-5.17.13/net/socket.c
	638	+--- linux-5.17.15.orig/net/socket.c
	639	++++ linux-5.17.15/net/socket.c
640	640	@@ -1779,6 +1779,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.17.13.orig/net/unix/af_unix.c
652		-+++ linux-5.17.13/net/unix/af_unix.c
	651	+--- linux-5.17.15.orig/net/unix/af_unix.c
	652	++++ linux-5.17.15/net/unix/af_unix.c
653	653	@@ -2419,6 +2419,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.17.13.orig/security/Kconfig
673		-+++ linux-5.17.13/security/Kconfig
	672	+--- linux-5.17.15.orig/security/Kconfig
	673	++++ linux-5.17.15/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.17.13.orig/security/Makefile
683		-+++ linux-5.17.13/security/Makefile
	682	+--- linux-5.17.15.orig/security/Makefile
	683	++++ linux-5.17.15/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.17.13.orig/security/security.c
692		-+++ linux-5.17.13/security/security.c
	691	+--- linux-5.17.15.orig/security/security.c
	692	++++ linux-5.17.15/security/security.c
693	693	@@ -1663,7 +1663,9 @@ int security_task_alloc(struct task_stru
694	694
695	695	if (rc)

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-5.18.diff (revision 6913)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-5.18.diff (revision 6914)

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

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

		@@ -39,8 +39,8 @@
39	39	if (retval < 0)
40	40	goto out;
41	41
42		---- linux-5.18.2.orig/fs/open.c
43		-+++ linux-5.18.2/fs/open.c
	42	+--- linux-5.18.5.orig/fs/open.c
	43	++++ linux-5.18.5/fs/open.c
44	44	@@ -1374,6 +1374,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.18.2.orig/fs/proc/version.c
54		-+++ linux-5.18.2/fs/proc/version.c
	53	+--- linux-5.18.5.orig/fs/proc/version.c
	54	++++ linux-5.18.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.18.2 2022/06/06\n");
	62	++ printk(KERN_INFO "Hook version: 5.18.5 2022/06/17\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.18.2.orig/include/linux/sched.h
67		-+++ linux-5.18.2/include/linux/sched.h
	66	+--- linux-5.18.5.orig/include/linux/sched.h
	67	++++ linux-5.18.5/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.18.2.orig/include/linux/security.h
88		-+++ linux-5.18.2/include/linux/security.h
	87	+--- linux-5.18.5.orig/include/linux/security.h
	88	++++ linux-5.18.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.18.2.orig/include/net/ip.h
319		-+++ linux-5.18.2/include/net/ip.h
	318	+--- linux-5.18.5.orig/include/net/ip.h
	319	++++ linux-5.18.5/include/net/ip.h
320	320	@@ -345,6 +345,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.18.2.orig/init/init_task.c
339		-+++ linux-5.18.2/init/init_task.c
	338	+--- linux-5.18.5.orig/init/init_task.c
	339	++++ linux-5.18.5/init/init_task.c
340	340	@@ -209,6 +209,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.18.2.orig/kernel/kexec.c
352		-+++ linux-5.18.2/kernel/kexec.c
	351	+--- linux-5.18.5.orig/kernel/kexec.c
	352	++++ linux-5.18.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.18.2.orig/kernel/module.c
372		-+++ linux-5.18.2/kernel/module.c
	371	+--- linux-5.18.5.orig/kernel/module.c
	372	++++ linux-5.18.5/kernel/module.c
373	373	@@ -59,6 +59,7 @@
374	374	#include <linux/audit.h>
375	375	#include <uapi/linux/module.h>

		@@ -387,7 +387,7 @@
387	387
388	388	if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0)
389	389	return -EFAULT;
390		-@@ -3822,6 +3825,8 @@ static int may_init_module(void)
	390	+@@ -3826,6 +3829,8 @@ static int may_init_module(void)
391	391	{
392	392	if (!capable(CAP_SYS_MODULE) \|\| modules_disabled)
393	393	return -EPERM;

		@@ -396,9 +396,9 @@
396	396
397	397	return 0;
398	398	}
399		---- linux-5.18.2.orig/kernel/ptrace.c
400		-+++ linux-5.18.2/kernel/ptrace.c
401		-@@ -1294,6 +1294,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
	399	+--- linux-5.18.5.orig/kernel/ptrace.c
	400	++++ linux-5.18.5/kernel/ptrace.c
	401	+@@ -1293,6 +1293,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
402	402	{
403	403	struct task_struct *child;
404	404	long ret;

		@@ -410,7 +410,7 @@
410	410
411	411	if (request == PTRACE_TRACEME) {
412	412	ret = ptrace_traceme();
413		-@@ -1441,6 +1446,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
	413	+@@ -1440,6 +1445,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
414	414	{
415	415	struct task_struct *child;
416	416	long ret;

		@@ -422,8 +422,8 @@
422	422
423	423	if (request == PTRACE_TRACEME) {
424	424	ret = ptrace_traceme();
425		---- linux-5.18.2.orig/kernel/reboot.c
426		-+++ linux-5.18.2/kernel/reboot.c
	425	+--- linux-5.18.5.orig/kernel/reboot.c
	426	++++ linux-5.18.5/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.18.2.orig/kernel/sched/core.c
445		-+++ linux-5.18.2/kernel/sched/core.c
	444	+--- linux-5.18.5.orig/kernel/sched/core.c
	445	++++ linux-5.18.5/kernel/sched/core.c
446	446	@@ -6953,6 +6953,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.18.2.orig/kernel/signal.c
456		-+++ linux-5.18.2/kernel/signal.c
457		-@@ -3775,6 +3775,8 @@ static inline void prepare_kill_siginfo(
	455	+--- linux-5.18.5.orig/kernel/signal.c
	456	++++ linux-5.18.5/kernel/signal.c
	457	+@@ -3788,6 +3788,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		-@@ -3874,6 +3876,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int,
	466	+@@ -3887,6 +3889,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		-@@ -3958,6 +3975,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
	488	+@@ -3971,6 +3988,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		-@@ -3974,6 +3993,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
	497	+@@ -3987,6 +4006,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		-@@ -3986,6 +4007,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
	506	+@@ -3999,6 +4020,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		-@@ -4033,6 +4056,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
	515	+@@ -4046,6 +4069,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.18.2.orig/kernel/sys.c
525		-+++ linux-5.18.2/kernel/sys.c
	524	+--- linux-5.18.5.orig/kernel/sys.c
	525	++++ linux-5.18.5/kernel/sys.c
526	526	@@ -212,6 +212,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.18.2.orig/kernel/time/timekeeping.c
556		-+++ linux-5.18.2/kernel/time/timekeeping.c
	555	+--- linux-5.18.5.orig/kernel/time/timekeeping.c
	556	++++ linux-5.18.5/kernel/time/timekeeping.c
557	557	@@ -23,6 +23,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.18.2.orig/net/ipv4/raw.c
591		-+++ linux-5.18.2/net/ipv4/raw.c
	590	+--- linux-5.18.5.orig/net/ipv4/raw.c
	591	++++ linux-5.18.5/net/ipv4/raw.c
592	592	@@ -772,6 +772,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.18.2.orig/net/ipv4/udp.c
604		-+++ linux-5.18.2/net/ipv4/udp.c
	603	+--- linux-5.18.5.orig/net/ipv4/udp.c
	604	++++ linux-5.18.5/net/ipv4/udp.c
605	605	@@ -1862,6 +1862,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.18.2.orig/net/ipv6/raw.c
615		-+++ linux-5.18.2/net/ipv6/raw.c
	614	+--- linux-5.18.5.orig/net/ipv6/raw.c
	615	++++ linux-5.18.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,9 +624,9 @@
624	624
625	625	copied = skb->len;
626	626	if (copied > len) {
627		---- linux-5.18.2.orig/net/ipv6/udp.c
628		-+++ linux-5.18.2/net/ipv6/udp.c
629		-@@ -345,6 +345,8 @@ try_again:
	627	+--- linux-5.18.5.orig/net/ipv6/udp.c
	628	++++ linux-5.18.5/net/ipv6/udp.c
	629	+@@ -346,6 +346,8 @@ try_again:
630	630	skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
631	631	if (!skb)
632	632	return err;

		@@ -635,8 +635,8 @@
635	635
636	636	ulen = udp6_skb_len(skb);
637	637	copied = len;
638		---- linux-5.18.2.orig/net/socket.c
639		-+++ linux-5.18.2/net/socket.c
	638	+--- linux-5.18.5.orig/net/socket.c
	639	++++ linux-5.18.5/net/socket.c
640	640	@@ -1779,6 +1779,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.18.2.orig/net/unix/af_unix.c
652		-+++ linux-5.18.2/net/unix/af_unix.c
	651	+--- linux-5.18.5.orig/net/unix/af_unix.c
	652	++++ linux-5.18.5/net/unix/af_unix.c
653	653	@@ -2419,6 +2419,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.18.2.orig/security/Kconfig
673		-+++ linux-5.18.2/security/Kconfig
	672	+--- linux-5.18.5.orig/security/Kconfig
	673	++++ linux-5.18.5/security/Kconfig
674	674	@@ -282,5 +282,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.18.2.orig/security/Makefile
683		-+++ linux-5.18.2/security/Makefile
	682	+--- linux-5.18.5.orig/security/Makefile
	683	++++ linux-5.18.5/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.18.2.orig/security/security.c
692		-+++ linux-5.18.2/security/security.c
	691	+--- linux-5.18.5.orig/security/security.c
	692	++++ linux-5.18.5/security/security.c
693	693	@@ -1663,7 +1663,9 @@ int security_task_alloc(struct task_stru
694	694
695	695	if (rc)

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-5.19.diff (revision 6913)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-5.19.diff (revision 6914)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 5.19-rc1.
	1	+This is TOMOYO Linux patch for kernel 5.19-rc2.
2	2
3		-Source code for this patch is https://git.kernel.org/torvalds/t/linux-5.19-rc1.tar.gz
	3	+Source code for this patch is https://git.kernel.org/torvalds/t/linux-5.19-rc2.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, 150 insertions(+), 30 deletions(-)
30	30
31		---- linux-5.19-rc1.orig/fs/exec.c
32		-+++ linux-5.19-rc1/fs/exec.c
	31	+--- linux-5.19-rc2.orig/fs/exec.c
	32	++++ linux-5.19-rc2/fs/exec.c
33	33	@@ -1835,7 +1835,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.19-rc1.orig/fs/open.c
43		-+++ linux-5.19-rc1/fs/open.c
	42	+--- linux-5.19-rc2.orig/fs/open.c
	43	++++ linux-5.19-rc2/fs/open.c
44	44	@@ -1439,6 +1439,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.19-rc1.orig/fs/proc/version.c
54		-+++ linux-5.19-rc1/fs/proc/version.c
	53	+--- linux-5.19-rc2.orig/fs/proc/version.c
	54	++++ linux-5.19-rc2/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.19-rc1 2022/06/06\n");
	62	++ printk(KERN_INFO "Hook version: 5.19-rc2 2022/06/17\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.19-rc1.orig/include/linux/sched.h
67		-+++ linux-5.19-rc1/include/linux/sched.h
	66	+--- linux-5.19-rc2.orig/include/linux/sched.h
	67	++++ linux-5.19-rc2/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.19-rc1.orig/include/linux/security.h
88		-+++ linux-5.19-rc1/include/linux/security.h
	87	+--- linux-5.19-rc2.orig/include/linux/security.h
	88	++++ linux-5.19-rc2/include/linux/security.h
89	89	@@ -59,6 +59,7 @@ struct fs_parameter;
90	90	enum fs_value_type;
91	91	struct watch;

		@@ -305,8 +305,8 @@
305	305	}
306	306	#endif /* CONFIG_SECURITY_PATH */
307	307
308		---- linux-5.19-rc1.orig/include/net/ip.h
309		-+++ linux-5.19-rc1/include/net/ip.h
	308	+--- linux-5.19-rc2.orig/include/net/ip.h
	309	++++ linux-5.19-rc2/include/net/ip.h
310	310	@@ -345,6 +345,8 @@ void inet_get_local_port_range(struct ne
311	311	#ifdef CONFIG_SYSCTL
312	312	static inline bool inet_is_local_reserved_port(struct net *net, unsigned short port)

		@@ -325,8 +325,8 @@
325	325	return false;
326	326	}
327	327
328		---- linux-5.19-rc1.orig/init/init_task.c
329		-+++ linux-5.19-rc1/init/init_task.c
	328	+--- linux-5.19-rc2.orig/init/init_task.c
	329	++++ linux-5.19-rc2/init/init_task.c
330	330	@@ -209,6 +209,10 @@ struct task_struct init_task
331	331	#ifdef CONFIG_SECCOMP_FILTER
332	332	.seccomp = { .filter_count = ATOMIC_INIT(0) },

		@@ -338,8 +338,8 @@
338	338	};
339	339	EXPORT_SYMBOL(init_task);
340	340
341		---- linux-5.19-rc1.orig/kernel/kexec.c
342		-+++ linux-5.19-rc1/kernel/kexec.c
	341	+--- linux-5.19-rc2.orig/kernel/kexec.c
	342	++++ linux-5.19-rc2/kernel/kexec.c
343	343	@@ -16,7 +16,7 @@
344	344	#include <linux/syscalls.h>
345	345	#include <linux/vmalloc.h>

		@@ -358,8 +358,8 @@
358	358
359	359	/* Permit LSMs and IMA to fail the kexec */
360	360	result = security_kernel_load_data(LOADING_KEXEC_IMAGE, false);
361		---- linux-5.19-rc1.orig/kernel/module/main.c
362		-+++ linux-5.19-rc1/kernel/module/main.c
	361	+--- linux-5.19-rc2.orig/kernel/module/main.c
	362	++++ linux-5.19-rc2/kernel/module/main.c
363	363	@@ -58,6 +58,7 @@
364	364
365	365	#define CREATE_TRACE_POINTS

		@@ -386,8 +386,8 @@
386	386
387	387	return 0;
388	388	}
389		---- linux-5.19-rc1.orig/kernel/ptrace.c
390		-+++ linux-5.19-rc1/kernel/ptrace.c
	389	+--- linux-5.19-rc2.orig/kernel/ptrace.c
	390	++++ linux-5.19-rc2/kernel/ptrace.c
391	391	@@ -1271,6 +1271,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
392	392	{
393	393	struct task_struct *child;

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

		@@ -422,7 +422,7 @@
422	422
423	423	/*
424	424	* this indicates whether you can reboot with ctrl-alt-del: the default is yes
425		-@@ -645,6 +646,8 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
	425	+@@ -698,6 +699,8 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
426	426	magic2 != LINUX_REBOOT_MAGIC2B &&
427	427	magic2 != LINUX_REBOOT_MAGIC2C))
428	428	return -EINVAL;

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

		@@ -442,8 +442,8 @@
442	442
443	443	/*
444	444	* Setpriority might change our priority at the same moment.
445		---- linux-5.19-rc1.orig/kernel/signal.c
446		-+++ linux-5.19-rc1/kernel/signal.c
	445	+--- linux-5.19-rc2.orig/kernel/signal.c
	446	++++ linux-5.19-rc2/kernel/signal.c
447	447	@@ -3770,6 +3770,8 @@ static inline void prepare_kill_siginfo(
448	448	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
449	449	{

		@@ -511,8 +511,8 @@
511	511
512	512	return do_send_specific(tgid, pid, sig, info);
513	513	}
514		---- linux-5.19-rc1.orig/kernel/sys.c
515		-+++ linux-5.19-rc1/kernel/sys.c
	514	+--- linux-5.19-rc2.orig/kernel/sys.c
	515	++++ linux-5.19-rc2/kernel/sys.c
516	516	@@ -218,6 +218,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
517	517
518	518	if (which > PRIO_USER \|\| which < PRIO_PROCESS)

		@@ -542,8 +542,8 @@
542	542
543	543	errno = -EFAULT;
544	544	if (!copy_from_user(tmp, name, len)) {
545		---- linux-5.19-rc1.orig/kernel/time/timekeeping.c
546		-+++ linux-5.19-rc1/kernel/time/timekeeping.c
	545	+--- linux-5.19-rc2.orig/kernel/time/timekeeping.c
	546	++++ linux-5.19-rc2/kernel/time/timekeeping.c
547	547	@@ -23,6 +23,7 @@
548	548	#include <linux/pvclock_gtod.h>
549	549	#include <linux/compiler.h>

		@@ -577,8 +577,8 @@
577	577
578	578	/*
579	579	* Validate if a timespec/timeval used to inject a time
580		---- linux-5.19-rc1.orig/net/ipv4/raw.c
581		-+++ linux-5.19-rc1/net/ipv4/raw.c
	580	+--- linux-5.19-rc2.orig/net/ipv4/raw.c
	581	++++ linux-5.19-rc2/net/ipv4/raw.c
582	582	@@ -772,6 +772,10 @@ static int raw_recvmsg(struct sock *sk,
583	583	skb = skb_recv_datagram(sk, flags, &err);
584	584	if (!skb)

		@@ -590,8 +590,8 @@
590	590
591	591	copied = skb->len;
592	592	if (len < copied) {
593		---- linux-5.19-rc1.orig/net/ipv4/udp.c
594		-+++ linux-5.19-rc1/net/ipv4/udp.c
	593	+--- linux-5.19-rc2.orig/net/ipv4/udp.c
	594	++++ linux-5.19-rc2/net/ipv4/udp.c
595	595	@@ -1861,6 +1861,8 @@ try_again:
596	596	skb = __skb_recv_udp(sk, flags, &off, &err);
597	597	if (!skb)

		@@ -601,8 +601,8 @@
601	601
602	602	ulen = udp_skb_len(skb);
603	603	copied = len;
604		---- linux-5.19-rc1.orig/net/ipv6/raw.c
605		-+++ linux-5.19-rc1/net/ipv6/raw.c
	604	+--- linux-5.19-rc2.orig/net/ipv6/raw.c
	605	++++ linux-5.19-rc2/net/ipv6/raw.c
606	606	@@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk
607	607	skb = skb_recv_datagram(sk, flags, &err);
608	608	if (!skb)

		@@ -614,8 +614,8 @@
614	614
615	615	copied = skb->len;
616	616	if (copied > len) {
617		---- linux-5.19-rc1.orig/net/ipv6/udp.c
618		-+++ linux-5.19-rc1/net/ipv6/udp.c
	617	+--- linux-5.19-rc2.orig/net/ipv6/udp.c
	618	++++ linux-5.19-rc2/net/ipv6/udp.c
619	619	@@ -346,6 +346,8 @@ try_again:
620	620	skb = __skb_recv_udp(sk, flags, &off, &err);
621	621	if (!skb)

		@@ -625,8 +625,8 @@
625	625
626	626	ulen = udp6_skb_len(skb);
627	627	copied = len;
628		---- linux-5.19-rc1.orig/net/socket.c
629		-+++ linux-5.19-rc1/net/socket.c
	628	+--- linux-5.19-rc2.orig/net/socket.c
	629	++++ linux-5.19-rc2/net/socket.c
630	630	@@ -1858,6 +1858,10 @@ struct file do_accept(struct file file
631	631	if (err < 0)
632	632	goto out_fd;

		@@ -638,8 +638,8 @@
638	638	if (upeer_sockaddr) {
639	639	len = newsock->ops->getname(newsock,
640	640	(struct sockaddr *)&address, 2);
641		---- linux-5.19-rc1.orig/net/unix/af_unix.c
642		-+++ linux-5.19-rc1/net/unix/af_unix.c
	641	+--- linux-5.19-rc2.orig/net/unix/af_unix.c
	642	++++ linux-5.19-rc2/net/unix/af_unix.c
643	643	@@ -2418,6 +2418,10 @@ int __unix_dgram_recvmsg(struct sock *sk
644	644	EPOLLOUT \| EPOLLWRNORM \|
645	645	EPOLLWRBAND);

		@@ -659,8 +659,8 @@
659	659	mutex_unlock(&u->iolock);
660	660	out:
661	661	return err;
662		---- linux-5.19-rc1.orig/security/Kconfig
663		-+++ linux-5.19-rc1/security/Kconfig
	662	+--- linux-5.19-rc2.orig/security/Kconfig
	663	++++ linux-5.19-rc2/security/Kconfig
664	664	@@ -271,5 +271,7 @@ config LSM
665	665
666	666	source "security/Kconfig.hardening"

		@@ -669,8 +669,8 @@
669	669	+
670	670	endmenu
671	671
672		---- linux-5.19-rc1.orig/security/Makefile
673		-+++ linux-5.19-rc1/security/Makefile
	672	+--- linux-5.19-rc2.orig/security/Makefile
	673	++++ linux-5.19-rc2/security/Makefile
674	674	@@ -27,3 +27,6 @@ obj-$(CONFIG_SECURITY_LANDLOCK) += land
675	675
676	676	# Object integrity file lists

		@@ -678,8 +678,8 @@
678	678	+
679	679	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
680	680	+obj-$(CONFIG_CCSECURITY) += ccsecurity/
681		---- linux-5.19-rc1.orig/security/security.c
682		-+++ linux-5.19-rc1/security/security.c
	681	+--- linux-5.19-rc2.orig/security/security.c
	682	++++ linux-5.19-rc2/security/security.c
683	683	@@ -1655,7 +1655,9 @@ int security_task_alloc(struct task_stru
684	684
685	685	if (rc)

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-5.4.diff (revision 6913)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-5.4.diff (revision 6914)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 5.4.197.
	1	+This is TOMOYO Linux patch for kernel 5.4.199.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.197.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.199.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.197.orig/fs/exec.c
32		-+++ linux-5.4.197/fs/exec.c
	31	+--- linux-5.4.199.orig/fs/exec.c
	32	++++ linux-5.4.199/fs/exec.c
33	33	@@ -1739,7 +1739,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.197.orig/fs/open.c
43		-+++ linux-5.4.197/fs/open.c
	42	+--- linux-5.4.199.orig/fs/open.c
	43	++++ linux-5.4.199/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.197.orig/fs/proc/version.c
54		-+++ linux-5.4.197/fs/proc/version.c
	53	+--- linux-5.4.199.orig/fs/proc/version.c
	54	++++ linux-5.4.199/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.197 2022/06/06\n");
	62	++ printk(KERN_INFO "Hook version: 5.4.199 2022/06/17\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.4.197.orig/include/linux/sched.h
67		-+++ linux-5.4.197/include/linux/sched.h
	66	+--- linux-5.4.199.orig/include/linux/sched.h
	67	++++ linux-5.4.199/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.197.orig/include/linux/security.h
88		-+++ linux-5.4.197/include/linux/security.h
	87	+--- linux-5.4.199.orig/include/linux/security.h
	88	++++ linux-5.4.199/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.197.orig/include/net/ip.h
319		-+++ linux-5.4.197/include/net/ip.h
	318	+--- linux-5.4.199.orig/include/net/ip.h
	319	++++ linux-5.4.199/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.197.orig/init/init_task.c
339		-+++ linux-5.4.197/init/init_task.c
	338	+--- linux-5.4.199.orig/init/init_task.c
	339	++++ linux-5.4.199/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.197.orig/kernel/kexec.c
352		-+++ linux-5.4.197/kernel/kexec.c
	351	+--- linux-5.4.199.orig/kernel/kexec.c
	352	++++ linux-5.4.199/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.197.orig/kernel/module.c
372		-+++ linux-5.4.197/kernel/module.c
	371	+--- linux-5.4.199.orig/kernel/module.c
	372	++++ linux-5.4.199/kernel/module.c
373	373	@@ -55,6 +55,7 @@
374	374	#include <linux/audit.h>
375	375	#include <uapi/linux/module.h>

		@@ -396,9 +396,9 @@
396	396
397	397	return 0;
398	398	}
399		---- linux-5.4.197.orig/kernel/ptrace.c
400		-+++ linux-5.4.197/kernel/ptrace.c
401		-@@ -1271,6 +1271,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
	399	+--- linux-5.4.199.orig/kernel/ptrace.c
	400	++++ linux-5.4.199/kernel/ptrace.c
	401	+@@ -1270,6 +1270,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
402	402	{
403	403	struct task_struct *child;
404	404	long ret;

		@@ -410,7 +410,7 @@
410	410
411	411	if (request == PTRACE_TRACEME) {
412	412	ret = ptrace_traceme();
413		-@@ -1418,6 +1423,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
	413	+@@ -1417,6 +1422,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
414	414	{
415	415	struct task_struct *child;
416	416	long ret;

		@@ -422,8 +422,8 @@
422	422
423	423	if (request == PTRACE_TRACEME) {
424	424	ret = ptrace_traceme();
425		---- linux-5.4.197.orig/kernel/reboot.c
426		-+++ linux-5.4.197/kernel/reboot.c
	425	+--- linux-5.4.199.orig/kernel/reboot.c
	426	++++ linux-5.4.199/kernel/reboot.c
427	427	@@ -17,6 +17,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.4.197.orig/kernel/sched/core.c
445		-+++ linux-5.4.197/kernel/sched/core.c
	444	+--- linux-5.4.199.orig/kernel/sched/core.c
	445	++++ linux-5.4.199/kernel/sched/core.c
446	446	@@ -4677,6 +4677,8 @@ int can_nice(const struct task_struct *p
447	447	SYSCALL_DEFINE1(nice, int, increment)
448	448	{

		@@ -452,8 +452,8 @@
452	452
453	453	/*
454	454	* Setpriority might change our priority at the same moment.
455		---- linux-5.4.197.orig/kernel/signal.c
456		-+++ linux-5.4.197/kernel/signal.c
	455	+--- linux-5.4.199.orig/kernel/signal.c
	456	++++ linux-5.4.199/kernel/signal.c
457	457	@@ -3634,6 +3634,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.197.orig/kernel/sys.c
525		-+++ linux-5.4.197/kernel/sys.c
	524	+--- linux-5.4.199.orig/kernel/sys.c
	525	++++ linux-5.4.199/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.197.orig/kernel/time/timekeeping.c
556		-+++ linux-5.4.197/kernel/time/timekeeping.c
	555	+--- linux-5.4.199.orig/kernel/time/timekeeping.c
	556	++++ linux-5.4.199/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.197.orig/net/ipv4/raw.c
591		-+++ linux-5.4.197/net/ipv4/raw.c
	590	+--- linux-5.4.199.orig/net/ipv4/raw.c
	591	++++ linux-5.4.199/net/ipv4/raw.c
592	592	@@ -770,6 +770,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.197.orig/net/ipv4/udp.c
604		-+++ linux-5.4.197/net/ipv4/udp.c
	603	+--- linux-5.4.199.orig/net/ipv4/udp.c
	604	++++ linux-5.4.199/net/ipv4/udp.c
605	605	@@ -1751,6 +1751,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.197.orig/net/ipv6/raw.c
615		-+++ linux-5.4.197/net/ipv6/raw.c
	614	+--- linux-5.4.199.orig/net/ipv6/raw.c
	615	++++ linux-5.4.199/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.197.orig/net/ipv6/udp.c
628		-+++ linux-5.4.197/net/ipv6/udp.c
	627	+--- linux-5.4.199.orig/net/ipv6/udp.c
	628	++++ linux-5.4.199/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.197.orig/net/socket.c
639		-+++ linux-5.4.197/net/socket.c
	638	+--- linux-5.4.199.orig/net/socket.c
	639	++++ linux-5.4.199/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.197.orig/net/unix/af_unix.c
652		-+++ linux-5.4.197/net/unix/af_unix.c
	651	+--- linux-5.4.199.orig/net/unix/af_unix.c
	652	++++ linux-5.4.199/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,8 +669,8 @@
669	669	mutex_unlock(&u->iolock);
670	670	out:
671	671	return err;
672		---- linux-5.4.197.orig/security/Kconfig
673		-+++ linux-5.4.197/security/Kconfig
	672	+--- linux-5.4.199.orig/security/Kconfig
	673	++++ linux-5.4.199/security/Kconfig
674	674	@@ -294,5 +294,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.197.orig/security/Makefile
683		-+++ linux-5.4.197/security/Makefile
	682	+--- linux-5.4.199.orig/security/Makefile
	683	++++ linux-5.4.199/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.197.orig/security/security.c
692		-+++ linux-5.4.197/security/security.c
	691	+--- linux-5.4.199.orig/security/security.c
	692	++++ linux-5.4.199/security/security.c
693	693	@@ -1520,7 +1520,9 @@ int security_task_alloc(struct task_stru
694	694
695	695	if (rc)

--- trunk/1.8.x/ccs-patch/specs/build-c8-4.18.sh (revision 6913)

+++ trunk/1.8.x/ccs-patch/specs/build-c8-4.18.sh (revision 6914)

		@@ -10,12 +10,12 @@
10	10
11	11	cd /tmp/ \|\| die "Can't chdir to /tmp/ ."
12	12
13		-if [ ! -r kernel-4.18.0-383.el8.src.rpm ]
	13	+if [ ! -r kernel-4.18.0-394.el8.src.rpm ]
14	14	then
15		- wget https://vault.centos.org/centos/8-stream/BaseOS/Source/SPackages/kernel-4.18.0-383.el8.src.rpm \|\| die "Can't download source package."
	15	+ wget https://vault.centos.org/centos/8-stream/BaseOS/Source/SPackages/kernel-4.18.0-394.el8.src.rpm \|\| die "Can't download source package."
16	16	fi
17		-LANG=C rpm --checksig kernel-4.18.0-383.el8.src.rpm \| grep -F ': digests signatures OK' \|\| die "Can't verify signature."
18		-rpm -ivh kernel-4.18.0-383.el8.src.rpm \|\| die "Can't install source package."
	17	+LANG=C rpm --checksig kernel-4.18.0-394.el8.src.rpm \| grep -F ': digests signatures OK' \|\| die "Can't verify signature."
	18	+rpm -ivh kernel-4.18.0-394.el8.src.rpm \|\| die "Can't install source package."
19	19
20	20	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
21	21	if [ ! -r ccs-patch-1.8.9-20220512.tar.gz ]

		@@ -36,7 +36,7 @@
36	36	+%define buildid _tomoyo_1.8.9
37	37
38	38	%define rpmversion 4.18.0
39		- %define pkgrelease 383.el8
	39	+ %define pkgrelease 394.el8
40	40	@@ -1102,6 +1102,10 @@
41	41
42	42	# END OF PATCH APPLICATIONS

Show on old repository browser