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

TOMOYO
Fork

R/O
SSH
HTTPS

tomoyo: Commit

Commit MetaInfo

Revision	6922 (tree)
Zeit	2022-10-04 20:22:07
Autor	kumaneko

Log Message

(empty log message)

Ändern Zusammenfassung

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.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.19.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-5.4.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-6.0.diff (diff)

Diff

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

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

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

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

		@@ -425,8 +425,8 @@
425	425
426	426	if (request == PTRACE_TRACEME) {
427	427	ret = ptrace_traceme();
428		---- linux-4.14.294.orig/kernel/reboot.c
429		-+++ linux-4.14.294/kernel/reboot.c
	428	+--- linux-4.14.295.orig/kernel/reboot.c
	429	++++ linux-4.14.295/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.294.orig/kernel/sched/core.c
448		-+++ linux-4.14.294/kernel/sched/core.c
	447	+--- linux-4.14.295.orig/kernel/sched/core.c
	448	++++ linux-4.14.295/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.294.orig/kernel/signal.c
459		-+++ linux-4.14.294/kernel/signal.c
	458	+--- linux-4.14.295.orig/kernel/signal.c
	459	++++ linux-4.14.295/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.294.orig/kernel/sys.c
506		-+++ linux-4.14.294/kernel/sys.c
	505	+--- linux-4.14.295.orig/kernel/sys.c
	506	++++ linux-4.14.295/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.294.orig/kernel/time/ntp.c
537		-+++ linux-4.14.294/kernel/time/ntp.c
	536	+--- linux-4.14.295.orig/kernel/time/ntp.c
	537	++++ linux-4.14.295/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.294.orig/net/ipv4/raw.c
572		-+++ linux-4.14.294/net/ipv4/raw.c
	571	+--- linux-4.14.295.orig/net/ipv4/raw.c
	572	++++ linux-4.14.295/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.294.orig/net/ipv4/udp.c
585		-+++ linux-4.14.294/net/ipv4/udp.c
	584	+--- linux-4.14.295.orig/net/ipv4/udp.c
	585	++++ linux-4.14.295/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.294.orig/net/ipv6/raw.c
596		-+++ linux-4.14.294/net/ipv6/raw.c
	595	+--- linux-4.14.295.orig/net/ipv6/raw.c
	596	++++ linux-4.14.295/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.294.orig/net/ipv6/udp.c
609		-+++ linux-4.14.294/net/ipv6/udp.c
	608	+--- linux-4.14.295.orig/net/ipv6/udp.c
	609	++++ linux-4.14.295/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.294.orig/net/socket.c
620		-+++ linux-4.14.294/net/socket.c
	619	+--- linux-4.14.295.orig/net/socket.c
	620	++++ linux-4.14.295/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.294.orig/net/unix/af_unix.c
633		-+++ linux-4.14.294/net/unix/af_unix.c
	632	+--- linux-4.14.295.orig/net/unix/af_unix.c
	633	++++ linux-4.14.295/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.294.orig/security/Kconfig
654		-+++ linux-4.14.294/security/Kconfig
	653	+--- linux-4.14.295.orig/security/Kconfig
	654	++++ linux-4.14.295/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.294.orig/security/Makefile
664		-+++ linux-4.14.294/security/Makefile
	663	+--- linux-4.14.295.orig/security/Makefile
	664	++++ linux-4.14.295/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.294.orig/security/security.c
673		-+++ linux-4.14.294/security/security.c
	672	+--- linux-4.14.295.orig/security/security.c
	673	++++ linux-4.14.295/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.19.diff (revision 6921)

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

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

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

		@@ -413,8 +413,8 @@
413	413
414	414	if (request == PTRACE_TRACEME) {
415	415	ret = ptrace_traceme();
416		---- linux-4.19.259.orig/kernel/reboot.c
417		-+++ linux-4.19.259/kernel/reboot.c
	416	+--- linux-4.19.260.orig/kernel/reboot.c
	417	++++ linux-4.19.260/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.259.orig/kernel/sched/core.c
436		-+++ linux-4.19.259/kernel/sched/core.c
	435	+--- linux-4.19.260.orig/kernel/sched/core.c
	436	++++ linux-4.19.260/kernel/sched/core.c
437	437	@@ -3993,6 +3993,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.259.orig/kernel/signal.c
447		-+++ linux-4.19.259/kernel/signal.c
	446	+--- linux-4.19.260.orig/kernel/signal.c
	447	++++ linux-4.19.260/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.259.orig/kernel/sys.c
494		-+++ linux-4.19.259/kernel/sys.c
	493	+--- linux-4.19.260.orig/kernel/sys.c
	494	++++ linux-4.19.260/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.259.orig/kernel/time/timekeeping.c
525		-+++ linux-4.19.259/kernel/time/timekeeping.c
	524	+--- linux-4.19.260.orig/kernel/time/timekeeping.c
	525	++++ linux-4.19.260/kernel/time/timekeeping.c
526	526	@@ -27,6 +27,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.259.orig/net/ipv4/raw.c
560		-+++ linux-4.19.259/net/ipv4/raw.c
	559	+--- linux-4.19.260.orig/net/ipv4/raw.c
	560	++++ linux-4.19.260/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.259.orig/net/ipv4/udp.c
573		-+++ linux-4.19.259/net/ipv4/udp.c
	572	+--- linux-4.19.260.orig/net/ipv4/udp.c
	573	++++ linux-4.19.260/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.259.orig/net/ipv6/raw.c
584		-+++ linux-4.19.259/net/ipv6/raw.c
	583	+--- linux-4.19.260.orig/net/ipv6/raw.c
	584	++++ linux-4.19.260/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.259.orig/net/ipv6/udp.c
597		-+++ linux-4.19.259/net/ipv6/udp.c
	596	+--- linux-4.19.260.orig/net/ipv6/udp.c
	597	++++ linux-4.19.260/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.259.orig/net/socket.c
608		-+++ linux-4.19.259/net/socket.c
	607	+--- linux-4.19.260.orig/net/socket.c
	608	++++ linux-4.19.260/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.259.orig/net/unix/af_unix.c
621		-+++ linux-4.19.259/net/unix/af_unix.c
	620	+--- linux-4.19.260.orig/net/unix/af_unix.c
	621	++++ linux-4.19.260/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.259.orig/security/Kconfig
642		-+++ linux-4.19.259/security/Kconfig
	641	+--- linux-4.19.260.orig/security/Kconfig
	642	++++ linux-4.19.260/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.259.orig/security/Makefile
652		-+++ linux-4.19.259/security/Makefile
	651	+--- linux-4.19.260.orig/security/Makefile
	652	++++ linux-4.19.260/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.259.orig/security/security.c
661		-+++ linux-4.19.259/security/security.c
	660	+--- linux-4.19.260.orig/security/security.c
	661	++++ linux-4.19.260/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 6921)

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

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

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

		@@ -440,8 +440,8 @@
440	440
441	441	if (request == PTRACE_TRACEME) {
442	442	ret = ptrace_traceme();
443		---- linux-4.9.329.orig/kernel/reboot.c
444		-+++ linux-4.9.329/kernel/reboot.c
	443	+--- linux-4.9.330.orig/kernel/reboot.c
	444	++++ linux-4.9.330/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.329.orig/kernel/sched/core.c
463		-+++ linux-4.9.329/kernel/sched/core.c
	462	+--- linux-4.9.330.orig/kernel/sched/core.c
	463	++++ linux-4.9.330/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.329.orig/kernel/signal.c
474		-+++ linux-4.9.329/kernel/signal.c
	473	+--- linux-4.9.330.orig/kernel/signal.c
	474	++++ linux-4.9.330/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.329.orig/kernel/sys.c
521		-+++ linux-4.9.329/kernel/sys.c
	520	+--- linux-4.9.330.orig/kernel/sys.c
	521	++++ linux-4.9.330/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.329.orig/kernel/time/ntp.c
552		-+++ linux-4.9.329/kernel/time/ntp.c
	551	+--- linux-4.9.330.orig/kernel/time/ntp.c
	552	++++ linux-4.9.330/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.329.orig/net/ipv4/raw.c
587		-+++ linux-4.9.329/net/ipv4/raw.c
	586	+--- linux-4.9.330.orig/net/ipv4/raw.c
	587	++++ linux-4.9.330/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.329.orig/net/ipv4/udp.c
600		-+++ linux-4.9.329/net/ipv4/udp.c
	599	+--- linux-4.9.330.orig/net/ipv4/udp.c
	600	++++ linux-4.9.330/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.329.orig/net/ipv6/raw.c
611		-+++ linux-4.9.329/net/ipv6/raw.c
	610	+--- linux-4.9.330.orig/net/ipv6/raw.c
	611	++++ linux-4.9.330/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.329.orig/net/ipv6/udp.c
624		-+++ linux-4.9.329/net/ipv6/udp.c
	623	+--- linux-4.9.330.orig/net/ipv6/udp.c
	624	++++ linux-4.9.330/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.329.orig/net/socket.c
635		-+++ linux-4.9.329/net/socket.c
	634	+--- linux-4.9.330.orig/net/socket.c
	635	++++ linux-4.9.330/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.329.orig/net/unix/af_unix.c
648		-+++ linux-4.9.329/net/unix/af_unix.c
	647	+--- linux-4.9.330.orig/net/unix/af_unix.c
	648	++++ linux-4.9.330/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.329.orig/security/Kconfig
669		-+++ linux-4.9.329/security/Kconfig
	668	+--- linux-4.9.330.orig/security/Kconfig
	669	++++ linux-4.9.330/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.329.orig/security/Makefile
679		-+++ linux-4.9.329/security/Makefile
	678	+--- linux-4.9.330.orig/security/Makefile
	679	++++ linux-4.9.330/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 6921)

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

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 5.10.144.
	1	+This is TOMOYO Linux patch for kernel 5.10.146.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.144.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.146.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.144.orig/fs/exec.c
32		-+++ linux-5.10.144/fs/exec.c
	31	+--- linux-5.10.146.orig/fs/exec.c
	32	++++ linux-5.10.146/fs/exec.c
33	33	@@ -1826,7 +1826,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.144.orig/fs/open.c
43		-+++ linux-5.10.144/fs/open.c
	42	+--- linux-5.10.146.orig/fs/open.c
	43	++++ linux-5.10.146/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.144.orig/fs/proc/version.c
54		-+++ linux-5.10.144/fs/proc/version.c
	53	+--- linux-5.10.146.orig/fs/proc/version.c
	54	++++ linux-5.10.146/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.144 2022/09/23\n");
	62	++ printk(KERN_INFO "Hook version: 5.10.146 2022/10/04\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.10.144.orig/include/linux/sched.h
67		-+++ linux-5.10.144/include/linux/sched.h
	66	+--- linux-5.10.146.orig/include/linux/sched.h
	67	++++ linux-5.10.146/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.144.orig/include/linux/security.h
88		-+++ linux-5.10.144/include/linux/security.h
	87	+--- linux-5.10.146.orig/include/linux/security.h
	88	++++ linux-5.10.146/include/linux/security.h
89	89	@@ -59,6 +59,7 @@ struct fs_parameter;
90	90	enum fs_value_type;
91	91	struct watch;

		@@ -315,8 +315,8 @@
315	315	}
316	316	#endif /* CONFIG_SECURITY_PATH */
317	317
318		---- linux-5.10.144.orig/include/net/ip.h
319		-+++ linux-5.10.144/include/net/ip.h
	318	+--- linux-5.10.146.orig/include/net/ip.h
	319	++++ linux-5.10.146/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.144.orig/init/init_task.c
339		-+++ linux-5.10.144/init/init_task.c
	338	+--- linux-5.10.146.orig/init/init_task.c
	339	++++ linux-5.10.146/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.144.orig/kernel/kexec.c
352		-+++ linux-5.10.144/kernel/kexec.c
	351	+--- linux-5.10.146.orig/kernel/kexec.c
	352	++++ linux-5.10.146/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.144.orig/kernel/module.c
372		-+++ linux-5.10.144/kernel/module.c
	371	+--- linux-5.10.146.orig/kernel/module.c
	372	++++ linux-5.10.146/kernel/module.c
373	373	@@ -59,6 +59,7 @@
374	374	#include <linux/audit.h>
375	375	#include <uapi/linux/module.h>

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

		@@ -422,8 +422,8 @@
422	422
423	423	if (request == PTRACE_TRACEME) {
424	424	ret = ptrace_traceme();
425		---- linux-5.10.144.orig/kernel/reboot.c
426		-+++ linux-5.10.144/kernel/reboot.c
	425	+--- linux-5.10.146.orig/kernel/reboot.c
	426	++++ linux-5.10.146/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.144.orig/kernel/sched/core.c
445		-+++ linux-5.10.144/kernel/sched/core.c
	444	+--- linux-5.10.146.orig/kernel/sched/core.c
	445	++++ linux-5.10.146/kernel/sched/core.c
446	446	@@ -5062,6 +5062,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.144.orig/kernel/signal.c
456		-+++ linux-5.10.144/kernel/signal.c
	455	+--- linux-5.10.146.orig/kernel/signal.c
	456	++++ linux-5.10.146/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.144.orig/kernel/sys.c
525		-+++ linux-5.10.144/kernel/sys.c
	524	+--- linux-5.10.146.orig/kernel/sys.c
	525	++++ linux-5.10.146/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.144.orig/kernel/time/timekeeping.c
556		-+++ linux-5.10.144/kernel/time/timekeeping.c
	555	+--- linux-5.10.146.orig/kernel/time/timekeeping.c
	556	++++ linux-5.10.146/kernel/time/timekeeping.c
557	557	@@ -24,6 +24,7 @@
558	558	#include <linux/compiler.h>
559	559	#include <linux/audit.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.144.orig/net/ipv4/raw.c
591		-+++ linux-5.10.144/net/ipv4/raw.c
	590	+--- linux-5.10.146.orig/net/ipv4/raw.c
	591	++++ linux-5.10.146/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.144.orig/net/ipv4/udp.c
604		-+++ linux-5.10.144/net/ipv4/udp.c
	603	+--- linux-5.10.146.orig/net/ipv4/udp.c
	604	++++ linux-5.10.146/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.144.orig/net/ipv6/raw.c
615		-+++ linux-5.10.144/net/ipv6/raw.c
	614	+--- linux-5.10.146.orig/net/ipv6/raw.c
	615	++++ linux-5.10.146/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.144.orig/net/ipv6/udp.c
628		-+++ linux-5.10.144/net/ipv6/udp.c
	627	+--- linux-5.10.146.orig/net/ipv6/udp.c
	628	++++ linux-5.10.146/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.144.orig/net/socket.c
639		-+++ linux-5.10.144/net/socket.c
	638	+--- linux-5.10.146.orig/net/socket.c
	639	++++ linux-5.10.146/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.144.orig/net/unix/af_unix.c
652		-+++ linux-5.10.144/net/unix/af_unix.c
	651	+--- linux-5.10.146.orig/net/unix/af_unix.c
	652	++++ linux-5.10.146/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.144.orig/security/Kconfig
673		-+++ linux-5.10.144/security/Kconfig
	672	+--- linux-5.10.146.orig/security/Kconfig
	673	++++ linux-5.10.146/security/Kconfig
674	674	@@ -283,5 +283,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.144.orig/security/Makefile
683		-+++ linux-5.10.144/security/Makefile
	682	+--- linux-5.10.146.orig/security/Makefile
	683	++++ linux-5.10.146/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.144.orig/security/security.c
692		-+++ linux-5.10.144/security/security.c
	691	+--- linux-5.10.146.orig/security/security.c
	692	++++ linux-5.10.146/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 6921)

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

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 5.15.69.
	1	+This is TOMOYO Linux patch for kernel 5.15.71.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.69.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.71.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.69.orig/fs/exec.c
32		-+++ linux-5.15.69/fs/exec.c
	31	+--- linux-5.15.71.orig/fs/exec.c
	32	++++ linux-5.15.71/fs/exec.c
33	33	@@ -1841,7 +1841,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.69.orig/fs/open.c
43		-+++ linux-5.15.69/fs/open.c
	42	+--- linux-5.15.71.orig/fs/open.c
	43	++++ linux-5.15.71/fs/open.c
44	44	@@ -1373,6 +1373,8 @@ SYSCALL_DEFINE3(close_range, unsigned in
45	45	*/
46	46	SYSCALL_DEFINE0(vhangup)

		@@ -50,8 +50,8 @@
50	50	if (capable(CAP_SYS_TTY_CONFIG)) {
51	51	tty_vhangup_self();
52	52	return 0;
53		---- linux-5.15.69.orig/fs/proc/version.c
54		-+++ linux-5.15.69/fs/proc/version.c
	53	+--- linux-5.15.71.orig/fs/proc/version.c
	54	++++ linux-5.15.71/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.69 2022/09/23\n");
	62	++ printk(KERN_INFO "Hook version: 5.15.71 2022/10/04\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.15.69.orig/include/linux/sched.h
67		-+++ linux-5.15.69/include/linux/sched.h
	66	+--- linux-5.15.71.orig/include/linux/sched.h
	67	++++ linux-5.15.71/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.69.orig/include/linux/security.h
88		-+++ linux-5.15.69/include/linux/security.h
	87	+--- linux-5.15.71.orig/include/linux/security.h
	88	++++ linux-5.15.71/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.69.orig/include/net/ip.h
319		-+++ linux-5.15.69/include/net/ip.h
	318	+--- linux-5.15.71.orig/include/net/ip.h
	319	++++ linux-5.15.71/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.69.orig/init/init_task.c
339		-+++ linux-5.15.69/init/init_task.c
	338	+--- linux-5.15.71.orig/init/init_task.c
	339	++++ linux-5.15.71/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.69.orig/kernel/kexec.c
352		-+++ linux-5.15.69/kernel/kexec.c
	351	+--- linux-5.15.71.orig/kernel/kexec.c
	352	++++ linux-5.15.71/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.69.orig/kernel/module.c
372		-+++ linux-5.15.69/kernel/module.c
	371	+--- linux-5.15.71.orig/kernel/module.c
	372	++++ linux-5.15.71/kernel/module.c
373	373	@@ -59,6 +59,7 @@
374	374	#include <linux/audit.h>
375	375	#include <uapi/linux/module.h>

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

		@@ -422,8 +422,8 @@
422	422
423	423	if (request == PTRACE_TRACEME) {
424	424	ret = ptrace_traceme();
425		---- linux-5.15.69.orig/kernel/reboot.c
426		-+++ linux-5.15.69/kernel/reboot.c
	425	+--- linux-5.15.71.orig/kernel/reboot.c
	426	++++ linux-5.15.71/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.69.orig/kernel/sched/core.c
445		-+++ linux-5.15.69/kernel/sched/core.c
	444	+--- linux-5.15.71.orig/kernel/sched/core.c
	445	++++ linux-5.15.71/kernel/sched/core.c
446	446	@@ -7002,6 +7002,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.15.69.orig/kernel/signal.c
456		-+++ linux-5.15.69/kernel/signal.c
	455	+--- linux-5.15.71.orig/kernel/signal.c
	456	++++ linux-5.15.71/kernel/signal.c
457	457	@@ -3800,6 +3800,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.15.69.orig/kernel/sys.c
525		-+++ linux-5.15.69/kernel/sys.c
	524	+--- linux-5.15.71.orig/kernel/sys.c
	525	++++ linux-5.15.71/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.69.orig/kernel/time/timekeeping.c
556		-+++ linux-5.15.69/kernel/time/timekeeping.c
	555	+--- linux-5.15.71.orig/kernel/time/timekeeping.c
	556	++++ linux-5.15.71/kernel/time/timekeeping.c
557	557	@@ -24,6 +24,7 @@
558	558	#include <linux/compiler.h>
559	559	#include <linux/audit.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.69.orig/net/ipv4/raw.c
591		-+++ linux-5.15.69/net/ipv4/raw.c
	590	+--- linux-5.15.71.orig/net/ipv4/raw.c
	591	++++ linux-5.15.71/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.69.orig/net/ipv4/udp.c
604		-+++ linux-5.15.69/net/ipv4/udp.c
	603	+--- linux-5.15.71.orig/net/ipv4/udp.c
	604	++++ linux-5.15.71/net/ipv4/udp.c
605	605	@@ -1864,6 +1864,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.69.orig/net/ipv6/raw.c
615		-+++ linux-5.15.69/net/ipv6/raw.c
	614	+--- linux-5.15.71.orig/net/ipv6/raw.c
	615	++++ linux-5.15.71/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.69.orig/net/ipv6/udp.c
628		-+++ linux-5.15.69/net/ipv6/udp.c
	627	+--- linux-5.15.71.orig/net/ipv6/udp.c
	628	++++ linux-5.15.71/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.69.orig/net/socket.c
639		-+++ linux-5.15.69/net/socket.c
	638	+--- linux-5.15.71.orig/net/socket.c
	639	++++ linux-5.15.71/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.69.orig/net/unix/af_unix.c
652		-+++ linux-5.15.69/net/unix/af_unix.c
	651	+--- linux-5.15.71.orig/net/unix/af_unix.c
	652	++++ linux-5.15.71/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.69.orig/security/Kconfig
673		-+++ linux-5.15.69/security/Kconfig
	672	+--- linux-5.15.71.orig/security/Kconfig
	673	++++ linux-5.15.71/security/Kconfig
674	674	@@ -284,5 +284,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.69.orig/security/Makefile
683		-+++ linux-5.15.69/security/Makefile
	682	+--- linux-5.15.71.orig/security/Makefile
	683	++++ linux-5.15.71/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.69.orig/security/security.c
692		-+++ linux-5.15.69/security/security.c
	691	+--- linux-5.15.71.orig/security/security.c
	692	++++ linux-5.15.71/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.19.diff (revision 6921)

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

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 5.19.10.
	1	+This is TOMOYO Linux patch for kernel 5.19.12.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.19.10.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.19.12.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, 150 insertions(+), 30 deletions(-)
30	30
31		---- linux-5.19.10.orig/fs/exec.c
32		-+++ linux-5.19.10/fs/exec.c
	31	+--- linux-5.19.12.orig/fs/exec.c
	32	++++ linux-5.19.12/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.19.10.orig/fs/open.c
43		-+++ linux-5.19.10/fs/open.c
	42	+--- linux-5.19.12.orig/fs/open.c
	43	++++ linux-5.19.12/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.10.orig/fs/proc/version.c
54		-+++ linux-5.19.10/fs/proc/version.c
	53	+--- linux-5.19.12.orig/fs/proc/version.c
	54	++++ linux-5.19.12/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.10 2022/09/23\n");
	62	++ printk(KERN_INFO "Hook version: 5.19.12 2022/10/04\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.19.10.orig/include/linux/sched.h
67		-+++ linux-5.19.10/include/linux/sched.h
	66	+--- linux-5.19.12.orig/include/linux/sched.h
	67	++++ linux-5.19.12/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.10.orig/include/linux/security.h
88		-+++ linux-5.19.10/include/linux/security.h
	87	+--- linux-5.19.12.orig/include/linux/security.h
	88	++++ linux-5.19.12/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.10.orig/include/net/ip.h
309		-+++ linux-5.19.10/include/net/ip.h
	308	+--- linux-5.19.12.orig/include/net/ip.h
	309	++++ linux-5.19.12/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.10.orig/init/init_task.c
329		-+++ linux-5.19.10/init/init_task.c
	328	+--- linux-5.19.12.orig/init/init_task.c
	329	++++ linux-5.19.12/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.10.orig/kernel/kexec.c
342		-+++ linux-5.19.10/kernel/kexec.c
	341	+--- linux-5.19.12.orig/kernel/kexec.c
	342	++++ linux-5.19.12/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.10.orig/kernel/module/main.c
362		-+++ linux-5.19.10/kernel/module/main.c
	361	+--- linux-5.19.12.orig/kernel/module/main.c
	362	++++ linux-5.19.12/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.10.orig/kernel/ptrace.c
390		-+++ linux-5.19.10/kernel/ptrace.c
	389	+--- linux-5.19.12.orig/kernel/ptrace.c
	390	++++ linux-5.19.12/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.10.orig/kernel/reboot.c
416		-+++ linux-5.19.10/kernel/reboot.c
	415	+--- linux-5.19.12.orig/kernel/reboot.c
	416	++++ linux-5.19.12/kernel/reboot.c
417	417	@@ -18,6 +18,7 @@
418	418	#include <linux/syscalls.h>
419	419	#include <linux/syscore_ops.h>

		@@ -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.10.orig/kernel/sched/core.c
435		-+++ linux-5.19.10/kernel/sched/core.c
	434	+--- linux-5.19.12.orig/kernel/sched/core.c
	435	++++ linux-5.19.12/kernel/sched/core.c
436	436	@@ -7049,6 +7049,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.10.orig/kernel/signal.c
446		-+++ linux-5.19.10/kernel/signal.c
	445	+--- linux-5.19.12.orig/kernel/signal.c
	446	++++ linux-5.19.12/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.10.orig/kernel/sys.c
515		-+++ linux-5.19.10/kernel/sys.c
	514	+--- linux-5.19.12.orig/kernel/sys.c
	515	++++ linux-5.19.12/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.10.orig/kernel/time/timekeeping.c
546		-+++ linux-5.19.10/kernel/time/timekeeping.c
	545	+--- linux-5.19.12.orig/kernel/time/timekeeping.c
	546	++++ linux-5.19.12/kernel/time/timekeeping.c
547	547	@@ -24,6 +24,7 @@
548	548	#include <linux/compiler.h>
549	549	#include <linux/audit.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.10.orig/net/ipv4/raw.c
581		-+++ linux-5.19.10/net/ipv4/raw.c
	580	+--- linux-5.19.12.orig/net/ipv4/raw.c
	581	++++ linux-5.19.12/net/ipv4/raw.c
582	582	@@ -744,6 +744,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.10.orig/net/ipv4/udp.c
594		-+++ linux-5.19.10/net/ipv4/udp.c
	593	+--- linux-5.19.12.orig/net/ipv4/udp.c
	594	++++ linux-5.19.12/net/ipv4/udp.c
595	595	@@ -1863,6 +1863,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.10.orig/net/ipv6/raw.c
605		-+++ linux-5.19.10/net/ipv6/raw.c
	604	+--- linux-5.19.12.orig/net/ipv6/raw.c
	605	++++ linux-5.19.12/net/ipv6/raw.c
606	606	@@ -446,6 +446,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.10.orig/net/ipv6/udp.c
618		-+++ linux-5.19.10/net/ipv6/udp.c
	617	+--- linux-5.19.12.orig/net/ipv6/udp.c
	618	++++ linux-5.19.12/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.10.orig/net/socket.c
629		-+++ linux-5.19.10/net/socket.c
	628	+--- linux-5.19.12.orig/net/socket.c
	629	++++ linux-5.19.12/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.10.orig/net/unix/af_unix.c
642		-+++ linux-5.19.10/net/unix/af_unix.c
	641	+--- linux-5.19.12.orig/net/unix/af_unix.c
	642	++++ linux-5.19.12/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.10.orig/security/Kconfig
663		-+++ linux-5.19.10/security/Kconfig
	662	+--- linux-5.19.12.orig/security/Kconfig
	663	++++ linux-5.19.12/security/Kconfig
664	664	@@ -260,5 +260,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.10.orig/security/Makefile
673		-+++ linux-5.19.10/security/Makefile
	672	+--- linux-5.19.12.orig/security/Makefile
	673	++++ linux-5.19.12/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.10.orig/security/security.c
682		-+++ linux-5.19.10/security/security.c
	681	+--- linux-5.19.12.orig/security/security.c
	682	++++ linux-5.19.12/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 6921)

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

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

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

		@@ -422,8 +422,8 @@
422	422
423	423	if (request == PTRACE_TRACEME) {
424	424	ret = ptrace_traceme();
425		---- linux-5.4.214.orig/kernel/reboot.c
426		-+++ linux-5.4.214/kernel/reboot.c
	425	+--- linux-5.4.215.orig/kernel/reboot.c
	426	++++ linux-5.4.215/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.214.orig/kernel/sched/core.c
445		-+++ linux-5.4.214/kernel/sched/core.c
	444	+--- linux-5.4.215.orig/kernel/sched/core.c
	445	++++ linux-5.4.215/kernel/sched/core.c
446	446	@@ -4678,6 +4678,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.214.orig/kernel/signal.c
456		-+++ linux-5.4.214/kernel/signal.c
	455	+--- linux-5.4.215.orig/kernel/signal.c
	456	++++ linux-5.4.215/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.214.orig/kernel/sys.c
525		-+++ linux-5.4.214/kernel/sys.c
	524	+--- linux-5.4.215.orig/kernel/sys.c
	525	++++ linux-5.4.215/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.214.orig/kernel/time/timekeeping.c
556		-+++ linux-5.4.214/kernel/time/timekeeping.c
	555	+--- linux-5.4.215.orig/kernel/time/timekeeping.c
	556	++++ linux-5.4.215/kernel/time/timekeeping.c
557	557	@@ -24,6 +24,7 @@
558	558	#include <linux/compiler.h>
559	559	#include <linux/audit.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.214.orig/net/ipv4/raw.c
591		-+++ linux-5.4.214/net/ipv4/raw.c
	590	+--- linux-5.4.215.orig/net/ipv4/raw.c
	591	++++ linux-5.4.215/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.214.orig/net/ipv4/udp.c
604		-+++ linux-5.4.214/net/ipv4/udp.c
	603	+--- linux-5.4.215.orig/net/ipv4/udp.c
	604	++++ linux-5.4.215/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.214.orig/net/ipv6/raw.c
615		-+++ linux-5.4.214/net/ipv6/raw.c
	614	+--- linux-5.4.215.orig/net/ipv6/raw.c
	615	++++ linux-5.4.215/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.214.orig/net/ipv6/udp.c
628		-+++ linux-5.4.214/net/ipv6/udp.c
	627	+--- linux-5.4.215.orig/net/ipv6/udp.c
	628	++++ linux-5.4.215/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.214.orig/net/socket.c
639		-+++ linux-5.4.214/net/socket.c
	638	+--- linux-5.4.215.orig/net/socket.c
	639	++++ linux-5.4.215/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.214.orig/net/unix/af_unix.c
652		-+++ linux-5.4.214/net/unix/af_unix.c
	651	+--- linux-5.4.215.orig/net/unix/af_unix.c
	652	++++ linux-5.4.215/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.214.orig/security/Kconfig
673		-+++ linux-5.4.214/security/Kconfig
	672	+--- linux-5.4.215.orig/security/Kconfig
	673	++++ linux-5.4.215/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.214.orig/security/Makefile
683		-+++ linux-5.4.214/security/Makefile
	682	+--- linux-5.4.215.orig/security/Makefile
	683	++++ linux-5.4.215/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.214.orig/security/security.c
692		-+++ linux-5.4.214/security/security.c
	691	+--- linux-5.4.215.orig/security/security.c
	692	++++ linux-5.4.215/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/patches/ccs-patch-6.0.diff (revision 6921)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-6.0.diff (revision 6922)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 6.0-rc6.
	1	+This is TOMOYO Linux patch for kernel 6.0.
2	2
3		-Source code for this patch is https://git.kernel.org/torvalds/t/linux-6.0-rc6.tar.gz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.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, 150 insertions(+), 30 deletions(-)
30	30
31		---- linux-6.0-rc6.orig/fs/exec.c
32		-+++ linux-6.0-rc6/fs/exec.c
33		-@@ -1841,7 +1841,7 @@ static int bprm_execve(struct linux_binp
	31	+--- linux-6.0.orig/fs/exec.c
	32	++++ linux-6.0/fs/exec.c
	33	+@@ -1834,7 +1834,7 @@ static int bprm_execve(struct linux_binp
34	34	if (retval)
35	35	goto out;
36	36

		@@ -39,9 +39,9 @@
39	39	if (retval < 0)
40	40	goto out;
41	41
42		---- linux-6.0-rc6.orig/fs/open.c
43		-+++ linux-6.0-rc6/fs/open.c
44		-@@ -1472,6 +1472,8 @@ SYSCALL_DEFINE3(close_range, unsigned in
	42	+--- linux-6.0.orig/fs/open.c
	43	++++ linux-6.0/fs/open.c
	44	+@@ -1474,6 +1474,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-6.0-rc6.orig/fs/proc/version.c
54		-+++ linux-6.0-rc6/fs/proc/version.c
	53	+--- linux-6.0.orig/fs/proc/version.c
	54	++++ linux-6.0/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: 6.0-rc6 2022/09/23\n");
	62	++ printk(KERN_INFO "Hook version: 6.0 2022/10/04\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-6.0-rc6.orig/include/linux/sched.h
67		-+++ linux-6.0-rc6/include/linux/sched.h
	66	+--- linux-6.0.orig/include/linux/sched.h
	67	++++ linux-6.0/include/linux/sched.h
68	68	@@ -45,6 +45,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-6.0-rc6.orig/include/linux/security.h
88		-+++ linux-6.0-rc6/include/linux/security.h
	87	+--- linux-6.0.orig/include/linux/security.h
	88	++++ linux-6.0/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-6.0-rc6.orig/include/net/ip.h
309		-+++ linux-6.0-rc6/include/net/ip.h
	308	+--- linux-6.0.orig/include/net/ip.h
	309	++++ linux-6.0/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-6.0-rc6.orig/init/init_task.c
329		-+++ linux-6.0-rc6/init/init_task.c
	328	+--- linux-6.0.orig/init/init_task.c
	329	++++ linux-6.0/init/init_task.c
330	330	@@ -210,6 +210,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-6.0-rc6.orig/kernel/kexec.c
342		-+++ linux-6.0-rc6/kernel/kexec.c
	341	+--- linux-6.0.orig/kernel/kexec.c
	342	++++ linux-6.0/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-6.0-rc6.orig/kernel/module/main.c
362		-+++ linux-6.0-rc6/kernel/module/main.c
	361	+--- linux-6.0.orig/kernel/module/main.c
	362	++++ linux-6.0/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-6.0-rc6.orig/kernel/ptrace.c
390		-+++ linux-6.0-rc6/kernel/ptrace.c
	389	+--- linux-6.0.orig/kernel/ptrace.c
	390	++++ linux-6.0/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-6.0-rc6.orig/kernel/reboot.c
416		-+++ linux-6.0-rc6/kernel/reboot.c
	415	+--- linux-6.0.orig/kernel/reboot.c
	416	++++ linux-6.0/kernel/reboot.c
417	417	@@ -18,6 +18,7 @@
418	418	#include <linux/syscalls.h>
419	419	#include <linux/syscore_ops.h>

		@@ -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-6.0-rc6.orig/kernel/sched/core.c
435		-+++ linux-6.0-rc6/kernel/sched/core.c
	434	+--- linux-6.0.orig/kernel/sched/core.c
	435	++++ linux-6.0/kernel/sched/core.c
436	436	@@ -7075,6 +7075,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-6.0-rc6.orig/kernel/signal.c
446		-+++ linux-6.0-rc6/kernel/signal.c
	445	+--- linux-6.0.orig/kernel/signal.c
	446	++++ linux-6.0/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-6.0-rc6.orig/kernel/sys.c
515		-+++ linux-6.0-rc6/kernel/sys.c
	514	+--- linux-6.0.orig/kernel/sys.c
	515	++++ linux-6.0/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-6.0-rc6.orig/kernel/time/timekeeping.c
546		-+++ linux-6.0-rc6/kernel/time/timekeeping.c
	545	+--- linux-6.0.orig/kernel/time/timekeeping.c
	546	++++ linux-6.0/kernel/time/timekeeping.c
547	547	@@ -24,6 +24,7 @@
548	548	#include <linux/compiler.h>
549	549	#include <linux/audit.h>

		@@ -577,8 +577,8 @@
577	577
578	578	/*
579	579	* Validate if a timespec/timeval used to inject a time
580		---- linux-6.0-rc6.orig/net/ipv4/raw.c
581		-+++ linux-6.0-rc6/net/ipv4/raw.c
	580	+--- linux-6.0.orig/net/ipv4/raw.c
	581	++++ linux-6.0/net/ipv4/raw.c
582	582	@@ -744,6 +744,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-6.0-rc6.orig/net/ipv4/udp.c
594		-+++ linux-6.0-rc6/net/ipv4/udp.c
	593	+--- linux-6.0.orig/net/ipv4/udp.c
	594	++++ linux-6.0/net/ipv4/udp.c
595	595	@@ -1864,6 +1864,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-6.0-rc6.orig/net/ipv6/raw.c
605		-+++ linux-6.0-rc6/net/ipv6/raw.c
	604	+--- linux-6.0.orig/net/ipv6/raw.c
	605	++++ linux-6.0/net/ipv6/raw.c
606	606	@@ -446,6 +446,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-6.0-rc6.orig/net/ipv6/udp.c
618		-+++ linux-6.0-rc6/net/ipv6/udp.c
	617	+--- linux-6.0.orig/net/ipv6/udp.c
	618	++++ linux-6.0/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-6.0-rc6.orig/net/socket.c
629		-+++ linux-6.0-rc6/net/socket.c
	628	+--- linux-6.0.orig/net/socket.c
	629	++++ linux-6.0/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-6.0-rc6.orig/net/unix/af_unix.c
642		-+++ linux-6.0-rc6/net/unix/af_unix.c
	641	+--- linux-6.0.orig/net/unix/af_unix.c
	642	++++ linux-6.0/net/unix/af_unix.c
643	643	@@ -2435,6 +2435,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-6.0-rc6.orig/security/Kconfig
663		-+++ linux-6.0-rc6/security/Kconfig
	662	+--- linux-6.0.orig/security/Kconfig
	663	++++ linux-6.0/security/Kconfig
664	664	@@ -260,5 +260,7 @@ config LSM
665	665
666	666	source "security/Kconfig.hardening"

		@@ -669,8 +669,8 @@
669	669	+
670	670	endmenu
671	671
672		---- linux-6.0-rc6.orig/security/Makefile
673		-+++ linux-6.0-rc6/security/Makefile
	672	+--- linux-6.0.orig/security/Makefile
	673	++++ linux-6.0/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-6.0-rc6.orig/security/security.c
682		-+++ linux-6.0-rc6/security/security.c
	681	+--- linux-6.0.orig/security/security.c
	682	++++ linux-6.0/security/security.c
683	683	@@ -1656,7 +1656,9 @@ int security_task_alloc(struct task_stru
684	684
685	685	if (rc)

Show on old repository browser