OSDN > 軟體搜索 > System > Operating System Kernels > Linux > TOMOYO > SCM > SVN > 提交

TOMOYO
Fork

R/O
SSH
HTTPS

tomoyo: 提交

Commit MetaInfo

修訂	6908 (tree)
時間	2022-05-11 23:58:12
作者	kumaneko

Log Message

(empty log message)

Change Summary

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.4.diff (diff)

差異

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

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

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 5.10.113.
	1	+This is TOMOYO Linux patch for kernel 5.10.114.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.113.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.114.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.113.orig/fs/exec.c
32		-+++ linux-5.10.113/fs/exec.c
	31	+--- linux-5.10.114.orig/fs/exec.c
	32	++++ linux-5.10.114/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.113.orig/fs/open.c
43		-+++ linux-5.10.113/fs/open.c
	42	+--- linux-5.10.114.orig/fs/open.c
	43	++++ linux-5.10.114/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.113.orig/fs/proc/version.c
54		-+++ linux-5.10.113/fs/proc/version.c
	53	+--- linux-5.10.114.orig/fs/proc/version.c
	54	++++ linux-5.10.114/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.113 2022/05/02\n");
	62	++ printk(KERN_INFO "Hook version: 5.10.114 2022/05/11\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.10.113.orig/include/linux/sched.h
67		-+++ linux-5.10.113/include/linux/sched.h
	66	+--- linux-5.10.114.orig/include/linux/sched.h
	67	++++ linux-5.10.114/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.113.orig/include/linux/security.h
88		-+++ linux-5.10.113/include/linux/security.h
	87	+--- linux-5.10.114.orig/include/linux/security.h
	88	++++ linux-5.10.114/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.113.orig/include/net/ip.h
319		-+++ linux-5.10.113/include/net/ip.h
	318	+--- linux-5.10.114.orig/include/net/ip.h
	319	++++ linux-5.10.114/include/net/ip.h
320	320	@@ -339,6 +339,8 @@ void inet_get_local_port_range(struct ne
321	321	#ifdef CONFIG_SYSCTL
322	322	static inline bool inet_is_local_reserved_port(struct net *net, unsigned short port)

		@@ -335,8 +335,8 @@
335	335	return false;
336	336	}
337	337
338		---- linux-5.10.113.orig/init/init_task.c
339		-+++ linux-5.10.113/init/init_task.c
	338	+--- linux-5.10.114.orig/init/init_task.c
	339	++++ linux-5.10.114/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.113.orig/kernel/kexec.c
352		-+++ linux-5.10.113/kernel/kexec.c
	351	+--- linux-5.10.114.orig/kernel/kexec.c
	352	++++ linux-5.10.114/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.113.orig/kernel/module.c
372		-+++ linux-5.10.113/kernel/module.c
	371	+--- linux-5.10.114.orig/kernel/module.c
	372	++++ linux-5.10.114/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.113.orig/kernel/ptrace.c
400		-+++ linux-5.10.113/kernel/ptrace.c
	399	+--- linux-5.10.114.orig/kernel/ptrace.c
	400	++++ linux-5.10.114/kernel/ptrace.c
401	401	@@ -1271,6 +1271,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.113.orig/kernel/reboot.c
426		-+++ linux-5.10.113/kernel/reboot.c
	425	+--- linux-5.10.114.orig/kernel/reboot.c
	426	++++ linux-5.10.114/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.113.orig/kernel/sched/core.c
445		-+++ linux-5.10.113/kernel/sched/core.c
	444	+--- linux-5.10.114.orig/kernel/sched/core.c
	445	++++ linux-5.10.114/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.113.orig/kernel/signal.c
456		-+++ linux-5.10.113/kernel/signal.c
	455	+--- linux-5.10.114.orig/kernel/signal.c
	456	++++ linux-5.10.114/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.113.orig/kernel/sys.c
525		-+++ linux-5.10.113/kernel/sys.c
	524	+--- linux-5.10.114.orig/kernel/sys.c
	525	++++ linux-5.10.114/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.113.orig/kernel/time/timekeeping.c
556		-+++ linux-5.10.113/kernel/time/timekeeping.c
	555	+--- linux-5.10.114.orig/kernel/time/timekeeping.c
	556	++++ linux-5.10.114/kernel/time/timekeeping.c
557	557	@@ -22,6 +22,7 @@
558	558	#include <linux/pvclock_gtod.h>
559	559	#include <linux/compiler.h>

		@@ -587,8 +587,8 @@
587	587
588	588	/*
589	589	* Validate if a timespec/timeval used to inject a time
590		---- linux-5.10.113.orig/net/ipv4/raw.c
591		-+++ linux-5.10.113/net/ipv4/raw.c
	590	+--- linux-5.10.114.orig/net/ipv4/raw.c
	591	++++ linux-5.10.114/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.113.orig/net/ipv4/udp.c
604		-+++ linux-5.10.113/net/ipv4/udp.c
	603	+--- linux-5.10.114.orig/net/ipv4/udp.c
	604	++++ linux-5.10.114/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.113.orig/net/ipv6/raw.c
615		-+++ linux-5.10.113/net/ipv6/raw.c
	614	+--- linux-5.10.114.orig/net/ipv6/raw.c
	615	++++ linux-5.10.114/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.113.orig/net/ipv6/udp.c
628		-+++ linux-5.10.113/net/ipv6/udp.c
	627	+--- linux-5.10.114.orig/net/ipv6/udp.c
	628	++++ linux-5.10.114/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.113.orig/net/socket.c
639		-+++ linux-5.10.113/net/socket.c
	638	+--- linux-5.10.114.orig/net/socket.c
	639	++++ linux-5.10.114/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.113.orig/net/unix/af_unix.c
652		-+++ linux-5.10.113/net/unix/af_unix.c
	651	+--- linux-5.10.114.orig/net/unix/af_unix.c
	652	++++ linux-5.10.114/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.113.orig/security/Kconfig
673		-+++ linux-5.10.113/security/Kconfig
	672	+--- linux-5.10.114.orig/security/Kconfig
	673	++++ linux-5.10.114/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.113.orig/security/Makefile
683		-+++ linux-5.10.113/security/Makefile
	682	+--- linux-5.10.114.orig/security/Makefile
	683	++++ linux-5.10.114/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.113.orig/security/security.c
692		-+++ linux-5.10.113/security/security.c
	691	+--- linux-5.10.114.orig/security/security.c
	692	++++ linux-5.10.114/security/security.c
693	693	@@ -1599,7 +1599,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 6907)

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

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 5.15.37.
	1	+This is TOMOYO Linux patch for kernel 5.15.38.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.37.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.38.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.37.orig/fs/exec.c
32		-+++ linux-5.15.37/fs/exec.c
	31	+--- linux-5.15.38.orig/fs/exec.c
	32	++++ linux-5.15.38/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.37.orig/fs/open.c
43		-+++ linux-5.15.37/fs/open.c
	42	+--- linux-5.15.38.orig/fs/open.c
	43	++++ linux-5.15.38/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.37.orig/fs/proc/version.c
54		-+++ linux-5.15.37/fs/proc/version.c
	53	+--- linux-5.15.38.orig/fs/proc/version.c
	54	++++ linux-5.15.38/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.37 2022/05/02\n");
	62	++ printk(KERN_INFO "Hook version: 5.15.38 2022/05/11\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.15.37.orig/include/linux/sched.h
67		-+++ linux-5.15.37/include/linux/sched.h
	66	+--- linux-5.15.38.orig/include/linux/sched.h
	67	++++ linux-5.15.38/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.37.orig/include/linux/security.h
88		-+++ linux-5.15.37/include/linux/security.h
	87	+--- linux-5.15.38.orig/include/linux/security.h
	88	++++ linux-5.15.38/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.37.orig/include/net/ip.h
319		-+++ linux-5.15.37/include/net/ip.h
	318	+--- linux-5.15.38.orig/include/net/ip.h
	319	++++ linux-5.15.38/include/net/ip.h
320	320	@@ -339,6 +339,8 @@ void inet_get_local_port_range(struct ne
321	321	#ifdef CONFIG_SYSCTL
322	322	static inline bool inet_is_local_reserved_port(struct net *net, unsigned short port)

		@@ -335,8 +335,8 @@
335	335	return false;
336	336	}
337	337
338		---- linux-5.15.37.orig/init/init_task.c
339		-+++ linux-5.15.37/init/init_task.c
	338	+--- linux-5.15.38.orig/init/init_task.c
	339	++++ linux-5.15.38/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.37.orig/kernel/kexec.c
352		-+++ linux-5.15.37/kernel/kexec.c
	351	+--- linux-5.15.38.orig/kernel/kexec.c
	352	++++ linux-5.15.38/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.37.orig/kernel/module.c
372		-+++ linux-5.15.37/kernel/module.c
	371	+--- linux-5.15.38.orig/kernel/module.c
	372	++++ linux-5.15.38/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.37.orig/kernel/ptrace.c
400		-+++ linux-5.15.37/kernel/ptrace.c
	399	+--- linux-5.15.38.orig/kernel/ptrace.c
	400	++++ linux-5.15.38/kernel/ptrace.c
401	401	@@ -1296,6 +1296,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.37.orig/kernel/reboot.c
426		-+++ linux-5.15.37/kernel/reboot.c
	425	+--- linux-5.15.38.orig/kernel/reboot.c
	426	++++ linux-5.15.38/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.37.orig/kernel/sched/core.c
445		-+++ linux-5.15.37/kernel/sched/core.c
	444	+--- linux-5.15.38.orig/kernel/sched/core.c
	445	++++ linux-5.15.38/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,8 +452,8 @@
452	452
453	453	/*
454	454	* Setpriority might change our priority at the same moment.
455		---- linux-5.15.37.orig/kernel/signal.c
456		-+++ linux-5.15.37/kernel/signal.c
	455	+--- linux-5.15.38.orig/kernel/signal.c
	456	++++ linux-5.15.38/kernel/signal.c
457	457	@@ -3787,6 +3787,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.37.orig/kernel/sys.c
525		-+++ linux-5.15.37/kernel/sys.c
	524	+--- linux-5.15.38.orig/kernel/sys.c
	525	++++ linux-5.15.38/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.37.orig/kernel/time/timekeeping.c
556		-+++ linux-5.15.37/kernel/time/timekeeping.c
	555	+--- linux-5.15.38.orig/kernel/time/timekeeping.c
	556	++++ linux-5.15.38/kernel/time/timekeeping.c
557	557	@@ -22,6 +22,7 @@
558	558	#include <linux/pvclock_gtod.h>
559	559	#include <linux/compiler.h>

		@@ -587,8 +587,8 @@
587	587
588	588	/*
589	589	* Validate if a timespec/timeval used to inject a time
590		---- linux-5.15.37.orig/net/ipv4/raw.c
591		-+++ linux-5.15.37/net/ipv4/raw.c
	590	+--- linux-5.15.38.orig/net/ipv4/raw.c
	591	++++ linux-5.15.38/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.37.orig/net/ipv4/udp.c
604		-+++ linux-5.15.37/net/ipv4/udp.c
	603	+--- linux-5.15.38.orig/net/ipv4/udp.c
	604	++++ linux-5.15.38/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.37.orig/net/ipv6/raw.c
615		-+++ linux-5.15.37/net/ipv6/raw.c
	614	+--- linux-5.15.38.orig/net/ipv6/raw.c
	615	++++ linux-5.15.38/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.37.orig/net/ipv6/udp.c
628		-+++ linux-5.15.37/net/ipv6/udp.c
	627	+--- linux-5.15.38.orig/net/ipv6/udp.c
	628	++++ linux-5.15.38/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.37.orig/net/socket.c
639		-+++ linux-5.15.37/net/socket.c
	638	+--- linux-5.15.38.orig/net/socket.c
	639	++++ linux-5.15.38/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.37.orig/net/unix/af_unix.c
652		-+++ linux-5.15.37/net/unix/af_unix.c
	651	+--- linux-5.15.38.orig/net/unix/af_unix.c
	652	++++ linux-5.15.38/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.37.orig/security/Kconfig
673		-+++ linux-5.15.37/security/Kconfig
	672	+--- linux-5.15.38.orig/security/Kconfig
	673	++++ linux-5.15.38/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.37.orig/security/Makefile
683		-+++ linux-5.15.37/security/Makefile
	682	+--- linux-5.15.38.orig/security/Makefile
	683	++++ linux-5.15.38/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.37.orig/security/security.c
692		-+++ linux-5.15.37/security/security.c
	691	+--- linux-5.15.38.orig/security/security.c
	692	++++ linux-5.15.38/security/security.c
693	693	@@ -1657,7 +1657,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 6907)

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

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 5.17.5.
	1	+This is TOMOYO Linux patch for kernel 5.17.6.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.17.5.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.17.6.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.17.5.orig/fs/exec.c
32		-+++ linux-5.17.5/fs/exec.c
	31	+--- linux-5.17.6.orig/fs/exec.c
	32	++++ linux-5.17.6/fs/exec.c
33	33	@@ -1840,7 +1840,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.17.5.orig/fs/open.c
43		-+++ linux-5.17.5/fs/open.c
	42	+--- linux-5.17.6.orig/fs/open.c
	43	++++ linux-5.17.6/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.5.orig/fs/proc/version.c
54		-+++ linux-5.17.5/fs/proc/version.c
	53	+--- linux-5.17.6.orig/fs/proc/version.c
	54	++++ linux-5.17.6/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.5 2022/05/02\n");
	62	++ printk(KERN_INFO "Hook version: 5.17.6 2022/05/11\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.17.5.orig/include/linux/sched.h
67		-+++ linux-5.17.5/include/linux/sched.h
	66	+--- linux-5.17.6.orig/include/linux/sched.h
	67	++++ linux-5.17.6/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.5.orig/include/linux/security.h
88		-+++ linux-5.17.5/include/linux/security.h
	87	+--- linux-5.17.6.orig/include/linux/security.h
	88	++++ linux-5.17.6/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.5.orig/include/net/ip.h
319		-+++ linux-5.17.5/include/net/ip.h
	318	+--- linux-5.17.6.orig/include/net/ip.h
	319	++++ linux-5.17.6/include/net/ip.h
320	320	@@ -344,6 +344,8 @@ void inet_get_local_port_range(struct ne
321	321	#ifdef CONFIG_SYSCTL
322	322	static inline bool inet_is_local_reserved_port(struct net *net, unsigned short port)

		@@ -335,8 +335,8 @@
335	335	return false;
336	336	}
337	337
338		---- linux-5.17.5.orig/init/init_task.c
339		-+++ linux-5.17.5/init/init_task.c
	338	+--- linux-5.17.6.orig/init/init_task.c
	339	++++ linux-5.17.6/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.5.orig/kernel/kexec.c
352		-+++ linux-5.17.5/kernel/kexec.c
	351	+--- linux-5.17.6.orig/kernel/kexec.c
	352	++++ linux-5.17.6/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.5.orig/kernel/module.c
372		-+++ linux-5.17.5/kernel/module.c
	371	+--- linux-5.17.6.orig/kernel/module.c
	372	++++ linux-5.17.6/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.17.5.orig/kernel/ptrace.c
400		-+++ linux-5.17.5/kernel/ptrace.c
	399	+--- linux-5.17.6.orig/kernel/ptrace.c
	400	++++ linux-5.17.6/kernel/ptrace.c
401	401	@@ -1294,6 +1294,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.17.5.orig/kernel/reboot.c
426		-+++ linux-5.17.5/kernel/reboot.c
	425	+--- linux-5.17.6.orig/kernel/reboot.c
	426	++++ linux-5.17.6/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.5.orig/kernel/sched/core.c
445		-+++ linux-5.17.5/kernel/sched/core.c
	444	+--- linux-5.17.6.orig/kernel/sched/core.c
	445	++++ linux-5.17.6/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,8 +452,8 @@
452	452
453	453	/*
454	454	* Setpriority might change our priority at the same moment.
455		---- linux-5.17.5.orig/kernel/signal.c
456		-+++ linux-5.17.5/kernel/signal.c
	455	+--- linux-5.17.6.orig/kernel/signal.c
	456	++++ linux-5.17.6/kernel/signal.c
457	457	@@ -3773,6 +3773,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.17.5.orig/kernel/sys.c
525		-+++ linux-5.17.5/kernel/sys.c
	524	+--- linux-5.17.6.orig/kernel/sys.c
	525	++++ linux-5.17.6/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.5.orig/kernel/time/timekeeping.c
556		-+++ linux-5.17.5/kernel/time/timekeeping.c
	555	+--- linux-5.17.6.orig/kernel/time/timekeeping.c
	556	++++ linux-5.17.6/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.17.5.orig/net/ipv4/raw.c
591		-+++ linux-5.17.5/net/ipv4/raw.c
	590	+--- linux-5.17.6.orig/net/ipv4/raw.c
	591	++++ linux-5.17.6/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.5.orig/net/ipv4/udp.c
604		-+++ linux-5.17.5/net/ipv4/udp.c
	603	+--- linux-5.17.6.orig/net/ipv4/udp.c
	604	++++ linux-5.17.6/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.5.orig/net/ipv6/raw.c
615		-+++ linux-5.17.5/net/ipv6/raw.c
	614	+--- linux-5.17.6.orig/net/ipv6/raw.c
	615	++++ linux-5.17.6/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.5.orig/net/ipv6/udp.c
628		-+++ linux-5.17.5/net/ipv6/udp.c
	627	+--- linux-5.17.6.orig/net/ipv6/udp.c
	628	++++ linux-5.17.6/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.5.orig/net/socket.c
639		-+++ linux-5.17.5/net/socket.c
	638	+--- linux-5.17.6.orig/net/socket.c
	639	++++ linux-5.17.6/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.5.orig/net/unix/af_unix.c
652		-+++ linux-5.17.5/net/unix/af_unix.c
	651	+--- linux-5.17.6.orig/net/unix/af_unix.c
	652	++++ linux-5.17.6/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.5.orig/security/Kconfig
673		-+++ linux-5.17.5/security/Kconfig
	672	+--- linux-5.17.6.orig/security/Kconfig
	673	++++ linux-5.17.6/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.5.orig/security/Makefile
683		-+++ linux-5.17.5/security/Makefile
	682	+--- linux-5.17.6.orig/security/Makefile
	683	++++ linux-5.17.6/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.5.orig/security/security.c
692		-+++ linux-5.17.5/security/security.c
	691	+--- linux-5.17.6.orig/security/security.c
	692	++++ linux-5.17.6/security/security.c
693	693	@@ -1661,7 +1661,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 6907)

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

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

		@@ -28,8 +28,8 @@
28	28	security/security.c \| 5 ++-
29	29	24 files changed, 160 insertions(+), 30 deletions(-)
30	30
31		---- linux-5.18-rc5.orig/fs/exec.c
32		-+++ linux-5.18-rc5/fs/exec.c
	31	+--- linux-5.18-rc6.orig/fs/exec.c
	32	++++ linux-5.18-rc6/fs/exec.c
33	33	@@ -1833,7 +1833,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.18-rc5.orig/fs/open.c
43		-+++ linux-5.18-rc5/fs/open.c
	42	+--- linux-5.18-rc6.orig/fs/open.c
	43	++++ linux-5.18-rc6/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-rc5.orig/fs/proc/version.c
54		-+++ linux-5.18-rc5/fs/proc/version.c
	53	+--- linux-5.18-rc6.orig/fs/proc/version.c
	54	++++ linux-5.18-rc6/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-rc5 2022/05/02\n");
	62	++ printk(KERN_INFO "Hook version: 5.18-rc6 2022/05/11\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.18-rc5.orig/include/linux/sched.h
67		-+++ linux-5.18-rc5/include/linux/sched.h
	66	+--- linux-5.18-rc6.orig/include/linux/sched.h
	67	++++ linux-5.18-rc6/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-rc5.orig/include/linux/security.h
88		-+++ linux-5.18-rc5/include/linux/security.h
	87	+--- linux-5.18-rc6.orig/include/linux/security.h
	88	++++ linux-5.18-rc6/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-rc5.orig/include/net/ip.h
319		-+++ linux-5.18-rc5/include/net/ip.h
	318	+--- linux-5.18-rc6.orig/include/net/ip.h
	319	++++ linux-5.18-rc6/include/net/ip.h
320	320	@@ -344,6 +344,8 @@ void inet_get_local_port_range(struct ne
321	321	#ifdef CONFIG_SYSCTL
322	322	static inline bool inet_is_local_reserved_port(struct net *net, unsigned short port)

		@@ -335,8 +335,8 @@
335	335	return false;
336	336	}
337	337
338		---- linux-5.18-rc5.orig/init/init_task.c
339		-+++ linux-5.18-rc5/init/init_task.c
	338	+--- linux-5.18-rc6.orig/init/init_task.c
	339	++++ linux-5.18-rc6/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-rc5.orig/kernel/kexec.c
352		-+++ linux-5.18-rc5/kernel/kexec.c
	351	+--- linux-5.18-rc6.orig/kernel/kexec.c
	352	++++ linux-5.18-rc6/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-rc5.orig/kernel/module.c
372		-+++ linux-5.18-rc5/kernel/module.c
	371	+--- linux-5.18-rc6.orig/kernel/module.c
	372	++++ linux-5.18-rc6/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.18-rc5.orig/kernel/ptrace.c
400		-+++ linux-5.18-rc5/kernel/ptrace.c
	399	+--- linux-5.18-rc6.orig/kernel/ptrace.c
	400	++++ linux-5.18-rc6/kernel/ptrace.c
401	401	@@ -1294,6 +1294,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.18-rc5.orig/kernel/reboot.c
426		-+++ linux-5.18-rc5/kernel/reboot.c
	425	+--- linux-5.18-rc6.orig/kernel/reboot.c
	426	++++ linux-5.18-rc6/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-rc5.orig/kernel/sched/core.c
445		-+++ linux-5.18-rc5/kernel/sched/core.c
	444	+--- linux-5.18-rc6.orig/kernel/sched/core.c
	445	++++ linux-5.18-rc6/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,8 +452,8 @@
452	452
453	453	/*
454	454	* Setpriority might change our priority at the same moment.
455		---- linux-5.18-rc5.orig/kernel/signal.c
456		-+++ linux-5.18-rc5/kernel/signal.c
	455	+--- linux-5.18-rc6.orig/kernel/signal.c
	456	++++ linux-5.18-rc6/kernel/signal.c
457	457	@@ -3775,6 +3775,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.18-rc5.orig/kernel/sys.c
525		-+++ linux-5.18-rc5/kernel/sys.c
	524	+--- linux-5.18-rc6.orig/kernel/sys.c
	525	++++ linux-5.18-rc6/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-rc5.orig/kernel/time/timekeeping.c
556		-+++ linux-5.18-rc5/kernel/time/timekeeping.c
	555	+--- linux-5.18-rc6.orig/kernel/time/timekeeping.c
	556	++++ linux-5.18-rc6/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.18-rc5.orig/net/ipv4/raw.c
591		-+++ linux-5.18-rc5/net/ipv4/raw.c
	590	+--- linux-5.18-rc6.orig/net/ipv4/raw.c
	591	++++ linux-5.18-rc6/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-rc5.orig/net/ipv4/udp.c
604		-+++ linux-5.18-rc5/net/ipv4/udp.c
	603	+--- linux-5.18-rc6.orig/net/ipv4/udp.c
	604	++++ linux-5.18-rc6/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-rc5.orig/net/ipv6/raw.c
615		-+++ linux-5.18-rc5/net/ipv6/raw.c
	614	+--- linux-5.18-rc6.orig/net/ipv6/raw.c
	615	++++ linux-5.18-rc6/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.18-rc5.orig/net/ipv6/udp.c
628		-+++ linux-5.18-rc5/net/ipv6/udp.c
	627	+--- linux-5.18-rc6.orig/net/ipv6/udp.c
	628	++++ linux-5.18-rc6/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.18-rc5.orig/net/socket.c
639		-+++ linux-5.18-rc5/net/socket.c
	638	+--- linux-5.18-rc6.orig/net/socket.c
	639	++++ linux-5.18-rc6/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-rc5.orig/net/unix/af_unix.c
652		-+++ linux-5.18-rc5/net/unix/af_unix.c
	651	+--- linux-5.18-rc6.orig/net/unix/af_unix.c
	652	++++ linux-5.18-rc6/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-rc5.orig/security/Kconfig
673		-+++ linux-5.18-rc5/security/Kconfig
	672	+--- linux-5.18-rc6.orig/security/Kconfig
	673	++++ linux-5.18-rc6/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-rc5.orig/security/Makefile
683		-+++ linux-5.18-rc5/security/Makefile
	682	+--- linux-5.18-rc6.orig/security/Makefile
	683	++++ linux-5.18-rc6/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-rc5.orig/security/security.c
692		-+++ linux-5.18-rc5/security/security.c
	691	+--- linux-5.18-rc6.orig/security/security.c
	692	++++ linux-5.18-rc6/security/security.c
693	693	@@ -1661,7 +1661,9 @@ int security_task_alloc(struct task_stru
694	694
695	695	if (rc)

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

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

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 5.4.191.
	1	+This is TOMOYO Linux patch for kernel 5.4.192.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.191.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.192.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.191.orig/fs/exec.c
32		-+++ linux-5.4.191/fs/exec.c
	31	+--- linux-5.4.192.orig/fs/exec.c
	32	++++ linux-5.4.192/fs/exec.c
33	33	@@ -1730,7 +1730,7 @@ static int exec_binprm(struct linux_binp
34	34	old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
35	35	rcu_read_unlock();

		@@ -39,8 +39,8 @@
39	39	if (ret >= 0) {
40	40	audit_bprm(bprm);
41	41	trace_sched_process_exec(current, old_pid, bprm);
42		---- linux-5.4.191.orig/fs/open.c
43		-+++ linux-5.4.191/fs/open.c
	42	+--- linux-5.4.192.orig/fs/open.c
	43	++++ linux-5.4.192/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.191.orig/fs/proc/version.c
54		-+++ linux-5.4.191/fs/proc/version.c
	53	+--- linux-5.4.192.orig/fs/proc/version.c
	54	++++ linux-5.4.192/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.191 2022/05/02\n");
	62	++ printk(KERN_INFO "Hook version: 5.4.192 2022/05/11\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-5.4.191.orig/include/linux/sched.h
67		-+++ linux-5.4.191/include/linux/sched.h
	66	+--- linux-5.4.192.orig/include/linux/sched.h
	67	++++ linux-5.4.192/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.191.orig/include/linux/security.h
88		-+++ linux-5.4.191/include/linux/security.h
	87	+--- linux-5.4.192.orig/include/linux/security.h
	88	++++ linux-5.4.192/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.191.orig/include/net/ip.h
319		-+++ linux-5.4.191/include/net/ip.h
	318	+--- linux-5.4.192.orig/include/net/ip.h
	319	++++ linux-5.4.192/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.191.orig/init/init_task.c
339		-+++ linux-5.4.191/init/init_task.c
	338	+--- linux-5.4.192.orig/init/init_task.c
	339	++++ linux-5.4.192/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.191.orig/kernel/kexec.c
352		-+++ linux-5.4.191/kernel/kexec.c
	351	+--- linux-5.4.192.orig/kernel/kexec.c
	352	++++ linux-5.4.192/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.191.orig/kernel/module.c
372		-+++ linux-5.4.191/kernel/module.c
	371	+--- linux-5.4.192.orig/kernel/module.c
	372	++++ linux-5.4.192/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.191.orig/kernel/ptrace.c
400		-+++ linux-5.4.191/kernel/ptrace.c
	399	+--- linux-5.4.192.orig/kernel/ptrace.c
	400	++++ linux-5.4.192/kernel/ptrace.c
401	401	@@ -1271,6 +1271,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.191.orig/kernel/reboot.c
426		-+++ linux-5.4.191/kernel/reboot.c
	425	+--- linux-5.4.192.orig/kernel/reboot.c
	426	++++ linux-5.4.192/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.191.orig/kernel/sched/core.c
445		-+++ linux-5.4.191/kernel/sched/core.c
	444	+--- linux-5.4.192.orig/kernel/sched/core.c
	445	++++ linux-5.4.192/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.191.orig/kernel/signal.c
456		-+++ linux-5.4.191/kernel/signal.c
	455	+--- linux-5.4.192.orig/kernel/signal.c
	456	++++ linux-5.4.192/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.191.orig/kernel/sys.c
525		-+++ linux-5.4.191/kernel/sys.c
	524	+--- linux-5.4.192.orig/kernel/sys.c
	525	++++ linux-5.4.192/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.191.orig/kernel/time/timekeeping.c
556		-+++ linux-5.4.191/kernel/time/timekeeping.c
	555	+--- linux-5.4.192.orig/kernel/time/timekeeping.c
	556	++++ linux-5.4.192/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.191.orig/net/ipv4/raw.c
591		-+++ linux-5.4.191/net/ipv4/raw.c
	590	+--- linux-5.4.192.orig/net/ipv4/raw.c
	591	++++ linux-5.4.192/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.191.orig/net/ipv4/udp.c
604		-+++ linux-5.4.191/net/ipv4/udp.c
	603	+--- linux-5.4.192.orig/net/ipv4/udp.c
	604	++++ linux-5.4.192/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.191.orig/net/ipv6/raw.c
615		-+++ linux-5.4.191/net/ipv6/raw.c
	614	+--- linux-5.4.192.orig/net/ipv6/raw.c
	615	++++ linux-5.4.192/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.191.orig/net/ipv6/udp.c
628		-+++ linux-5.4.191/net/ipv6/udp.c
	627	+--- linux-5.4.192.orig/net/ipv6/udp.c
	628	++++ linux-5.4.192/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.191.orig/net/socket.c
639		-+++ linux-5.4.191/net/socket.c
	638	+--- linux-5.4.192.orig/net/socket.c
	639	++++ linux-5.4.192/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.191.orig/net/unix/af_unix.c
652		-+++ linux-5.4.191/net/unix/af_unix.c
	651	+--- linux-5.4.192.orig/net/unix/af_unix.c
	652	++++ linux-5.4.192/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.191.orig/security/Kconfig
673		-+++ linux-5.4.191/security/Kconfig
	672	+--- linux-5.4.192.orig/security/Kconfig
	673	++++ linux-5.4.192/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.191.orig/security/Makefile
683		-+++ linux-5.4.191/security/Makefile
	682	+--- linux-5.4.192.orig/security/Makefile
	683	++++ linux-5.4.192/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.191.orig/security/security.c
692		-+++ linux-5.4.191/security/security.c
	691	+--- linux-5.4.192.orig/security/security.c
	692	++++ linux-5.4.192/security/security.c
693	693	@@ -1520,7 +1520,9 @@ int security_task_alloc(struct task_stru
694	694
695	695	if (rc)

Show on old repository browser

TOMOYO Fork

tomoyo: 提交

Commit MetaInfo

Log Message

Change Summary

差異

TOMOYO
Fork