• R/O
  • SSH
  • HTTPS

tomoyo: コミット


コミットメタ情報

リビジョン6838 (tree)
日時2020-11-03 11:32:15
作者kumaneko

ログメッセージ

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

変更サマリ

差分

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-3.10-centos-7.diff (revision 6837)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-3.10-centos-7.diff (revision 6838)
@@ -1,6 +1,6 @@
11 This is TOMOYO Linux patch for CentOS 7.
22
3-Source code for this patch is http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-1127.19.1.el7.src.rpm
3+Source code for this patch is http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-1160.2.2.el7.src.rpm
44 ---
55 fs/exec.c | 2
66 fs/open.c | 2
@@ -28,9 +28,9 @@
2828 security/security.c | 111 +++++++++++++++++++++++++++++++++++++++++-----
2929 24 files changed, 248 insertions(+), 37 deletions(-)
3030
31---- linux-3.10.0-1127.19.1.el7.orig/fs/exec.c
32-+++ linux-3.10.0-1127.19.1.el7/fs/exec.c
33-@@ -1508,7 +1508,7 @@ static int exec_binprm(struct linux_binp
31+--- linux-3.10.0-1160.2.2.el7.orig/fs/exec.c
32++++ linux-3.10.0-1160.2.2.el7/fs/exec.c
33+@@ -1506,7 +1506,7 @@ static int exec_binprm(struct linux_binp
3434 old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
3535 rcu_read_unlock();
3636
@@ -39,8 +39,8 @@
3939 if (ret >= 0) {
4040 audit_bprm(bprm);
4141 trace_sched_process_exec(current, old_pid, bprm);
42---- linux-3.10.0-1127.19.1.el7.orig/fs/open.c
43-+++ linux-3.10.0-1127.19.1.el7/fs/open.c
42+--- linux-3.10.0-1160.2.2.el7.orig/fs/open.c
43++++ linux-3.10.0-1160.2.2.el7/fs/open.c
4444 @@ -1106,6 +1106,8 @@ EXPORT_SYMBOL(sys_close);
4545 */
4646 SYSCALL_DEFINE0(vhangup)
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-3.10.0-1127.19.1.el7.orig/fs/proc/version.c
54-+++ linux-3.10.0-1127.19.1.el7/fs/proc/version.c
53+--- linux-3.10.0-1160.2.2.el7.orig/fs/proc/version.c
54++++ linux-3.10.0-1160.2.2.el7/fs/proc/version.c
5555 @@ -32,3 +32,10 @@ static int __init proc_version_init(void
5656 return 0;
5757 }
@@ -59,12 +59,12 @@
5959 +
6060 +static int __init ccs_show_version(void)
6161 +{
62-+ printk(KERN_INFO "Hook version: 3.10.0-1127.19.1.el7 2020/08/26\n");
62++ printk(KERN_INFO "Hook version: 3.10.0-1160.2.2.el7 2020/11/03\n");
6363 + return 0;
6464 +}
6565 +module_init(ccs_show_version);
66---- linux-3.10.0-1127.19.1.el7.orig/include/linux/init_task.h
67-+++ linux-3.10.0-1127.19.1.el7/include/linux/init_task.h
66+--- linux-3.10.0-1160.2.2.el7.orig/include/linux/init_task.h
67++++ linux-3.10.0-1160.2.2.el7/include/linux/init_task.h
6868 @@ -173,6 +173,14 @@ extern struct task_group root_task_group
6969 # define INIT_RT_MUTEXES(tsk)
7070 #endif
@@ -88,8 +88,8 @@
8888 }
8989
9090
91---- linux-3.10.0-1127.19.1.el7.orig/include/linux/sched.h
92-+++ linux-3.10.0-1127.19.1.el7/include/linux/sched.h
91+--- linux-3.10.0-1160.2.2.el7.orig/include/linux/sched.h
92++++ linux-3.10.0-1160.2.2.el7/include/linux/sched.h
9393 @@ -4,6 +4,8 @@
9494 #include <uapi/linux/sched.h>
9595 #include <linux/rh_kabi.h>
@@ -99,9 +99,9 @@
9999 struct sched_param {
100100 int sched_priority;
101101 };
102-@@ -1869,6 +1871,10 @@ struct task_struct {
103- struct prev_cputime prev_cputime;
104- struct vtime vtime;
102+@@ -1871,6 +1873,10 @@ struct task_struct {
103+ u64 parent_exec_id;
104+ u64 self_exec_id;
105105 #endif /* __GENKSYMS__ */
106106 +#if defined(CONFIG_CCSECURITY) && !defined(CONFIG_CCSECURITY_USE_EXTERNAL_TASK_SECURITY)
107107 + struct ccs_domain_info *ccs_domain_info;
@@ -110,8 +110,8 @@
110110 };
111111
112112 /* Future-safe accessor for struct task_struct's cpus_allowed. */
113---- linux-3.10.0-1127.19.1.el7.orig/include/linux/security.h
114-+++ linux-3.10.0-1127.19.1.el7/include/linux/security.h
113+--- linux-3.10.0-1160.2.2.el7.orig/include/linux/security.h
114++++ linux-3.10.0-1160.2.2.el7/include/linux/security.h
115115 @@ -56,6 +56,7 @@ struct msg_queue;
116116 struct xattr;
117117 struct xfrm_sec_ctx;
@@ -323,8 +323,8 @@
323323 }
324324 #endif /* CONFIG_SECURITY_PATH */
325325
326---- linux-3.10.0-1127.19.1.el7.orig/include/net/ip.h
327-+++ linux-3.10.0-1127.19.1.el7/include/net/ip.h
326+--- linux-3.10.0-1160.2.2.el7.orig/include/net/ip.h
327++++ linux-3.10.0-1160.2.2.el7/include/net/ip.h
328328 @@ -232,6 +232,8 @@ void inet_get_local_port_range(struct ne
329329 extern unsigned long *sysctl_local_reserved_ports;
330330 static inline int inet_is_reserved_local_port(int port)
@@ -334,8 +334,8 @@
334334 return test_bit(port, sysctl_local_reserved_ports);
335335 }
336336
337---- linux-3.10.0-1127.19.1.el7.orig/kernel/fork.c
338-+++ linux-3.10.0-1127.19.1.el7/kernel/fork.c
337+--- linux-3.10.0-1160.2.2.el7.orig/kernel/fork.c
338++++ linux-3.10.0-1160.2.2.el7/kernel/fork.c
339339 @@ -278,6 +278,7 @@ void __put_task_struct(struct task_struc
340340 delayacct_tsk_free(tsk);
341341 put_signal_struct(tsk->signal);
@@ -362,8 +362,8 @@
362362 bad_fork_cleanup_perf:
363363 perf_event_free_task(p);
364364 bad_fork_cleanup_policy:
365---- linux-3.10.0-1127.19.1.el7.orig/kernel/kexec.c
366-+++ linux-3.10.0-1127.19.1.el7/kernel/kexec.c
365+--- linux-3.10.0-1160.2.2.el7.orig/kernel/kexec.c
366++++ linux-3.10.0-1160.2.2.el7/kernel/kexec.c
367367 @@ -190,6 +190,8 @@ SYSCALL_DEFINE4(kexec_load, unsigned lon
368368 /* We only trust the superuser with rebooting the system. */
369369 if (!capable(CAP_SYS_BOOT) || kexec_load_disabled)
@@ -373,8 +373,8 @@
373373
374374 if (get_securelevel() > 0)
375375 return -EPERM;
376---- linux-3.10.0-1127.19.1.el7.orig/kernel/module.c
377-+++ linux-3.10.0-1127.19.1.el7/kernel/module.c
376+--- linux-3.10.0-1160.2.2.el7.orig/kernel/module.c
377++++ linux-3.10.0-1160.2.2.el7/kernel/module.c
378378 @@ -66,6 +66,7 @@
379379 #endif /* __GENKSYMS__ */
380380 #include <uapi/linux/module.h>
@@ -392,7 +392,7 @@
392392
393393 if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0)
394394 return -EFAULT;
395-@@ -3438,6 +3441,8 @@ static int may_init_module(void)
395+@@ -3440,6 +3443,8 @@ static int may_init_module(void)
396396 {
397397 if (!capable(CAP_SYS_MODULE) || modules_disabled)
398398 return -EPERM;
@@ -401,8 +401,8 @@
401401
402402 return 0;
403403 }
404---- linux-3.10.0-1127.19.1.el7.orig/kernel/ptrace.c
405-+++ linux-3.10.0-1127.19.1.el7/kernel/ptrace.c
404+--- linux-3.10.0-1160.2.2.el7.orig/kernel/ptrace.c
405++++ linux-3.10.0-1160.2.2.el7/kernel/ptrace.c
406406 @@ -1082,6 +1082,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
407407 {
408408 struct task_struct *child;
@@ -427,8 +427,8 @@
427427
428428 if (request == PTRACE_TRACEME) {
429429 ret = ptrace_traceme();
430---- linux-3.10.0-1127.19.1.el7.orig/kernel/sched/core.c
431-+++ linux-3.10.0-1127.19.1.el7/kernel/sched/core.c
430+--- linux-3.10.0-1160.2.2.el7.orig/kernel/sched/core.c
431++++ linux-3.10.0-1160.2.2.el7/kernel/sched/core.c
432432 @@ -4415,6 +4415,8 @@ int can_nice(const struct task_struct *p
433433 SYSCALL_DEFINE1(nice, int, increment)
434434 {
@@ -438,8 +438,8 @@
438438
439439 /*
440440 * Setpriority might change our priority at the same moment.
441---- linux-3.10.0-1127.19.1.el7.orig/kernel/signal.c
442-+++ linux-3.10.0-1127.19.1.el7/kernel/signal.c
441+--- linux-3.10.0-1160.2.2.el7.orig/kernel/signal.c
442++++ linux-3.10.0-1160.2.2.el7/kernel/signal.c
443443 @@ -2942,6 +2942,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
444444 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
445445 {
@@ -485,8 +485,8 @@
485485
486486 return do_send_specific(tgid, pid, sig, info);
487487 }
488---- linux-3.10.0-1127.19.1.el7.orig/kernel/sys.c
489-+++ linux-3.10.0-1127.19.1.el7/kernel/sys.c
488+--- linux-3.10.0-1160.2.2.el7.orig/kernel/sys.c
489++++ linux-3.10.0-1160.2.2.el7/kernel/sys.c
490490 @@ -197,6 +197,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
491491
492492 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -525,8 +525,8 @@
525525
526526 down_write(&uts_sem);
527527 errno = -EFAULT;
528---- linux-3.10.0-1127.19.1.el7.orig/kernel/time/ntp.c
529-+++ linux-3.10.0-1127.19.1.el7/kernel/time/ntp.c
528+--- linux-3.10.0-1160.2.2.el7.orig/kernel/time/ntp.c
529++++ linux-3.10.0-1160.2.2.el7/kernel/time/ntp.c
530530 @@ -16,6 +16,7 @@
531531 #include <linux/mm.h>
532532 #include <linux/module.h>
@@ -560,9 +560,9 @@
560560
561561 return 0;
562562 }
563---- linux-3.10.0-1127.19.1.el7.orig/net/ipv4/raw.c
564-+++ linux-3.10.0-1127.19.1.el7/net/ipv4/raw.c
565-@@ -708,6 +708,10 @@ static int raw_recvmsg(struct kiocb *ioc
563+--- linux-3.10.0-1160.2.2.el7.orig/net/ipv4/raw.c
564++++ linux-3.10.0-1160.2.2.el7/net/ipv4/raw.c
565+@@ -710,6 +710,10 @@ static int raw_recvmsg(struct kiocb *ioc
566566 skb = skb_recv_datagram(sk, flags, noblock, &err);
567567 if (!skb)
568568 goto out;
@@ -573,8 +573,8 @@
573573
574574 copied = skb->len;
575575 if (len < copied) {
576---- linux-3.10.0-1127.19.1.el7.orig/net/ipv4/udp.c
577-+++ linux-3.10.0-1127.19.1.el7/net/ipv4/udp.c
576+--- linux-3.10.0-1160.2.2.el7.orig/net/ipv4/udp.c
577++++ linux-3.10.0-1160.2.2.el7/net/ipv4/udp.c
578578 @@ -1467,6 +1467,10 @@ try_again:
579579 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
580580 if (!skb)
@@ -586,9 +586,9 @@
586586
587587 ulen = skb->len - sizeof(struct udphdr);
588588 copied = len;
589---- linux-3.10.0-1127.19.1.el7.orig/net/ipv6/raw.c
590-+++ linux-3.10.0-1127.19.1.el7/net/ipv6/raw.c
591-@@ -468,6 +468,10 @@ static int rawv6_recvmsg(struct kiocb *i
589+--- linux-3.10.0-1160.2.2.el7.orig/net/ipv6/raw.c
590++++ linux-3.10.0-1160.2.2.el7/net/ipv6/raw.c
591+@@ -470,6 +470,10 @@ static int rawv6_recvmsg(struct kiocb *i
592592 skb = skb_recv_datagram(sk, flags, noblock, &err);
593593 if (!skb)
594594 goto out;
@@ -599,8 +599,8 @@
599599
600600 copied = skb->len;
601601 if (copied > len) {
602---- linux-3.10.0-1127.19.1.el7.orig/net/ipv6/udp.c
603-+++ linux-3.10.0-1127.19.1.el7/net/ipv6/udp.c
602+--- linux-3.10.0-1160.2.2.el7.orig/net/ipv6/udp.c
603++++ linux-3.10.0-1160.2.2.el7/net/ipv6/udp.c
604604 @@ -384,6 +384,10 @@ try_again:
605605 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
606606 if (!skb)
@@ -612,8 +612,8 @@
612612
613613 ulen = skb->len - sizeof(struct udphdr);
614614 copied = len;
615---- linux-3.10.0-1127.19.1.el7.orig/net/socket.c
616-+++ linux-3.10.0-1127.19.1.el7/net/socket.c
615+--- linux-3.10.0-1160.2.2.el7.orig/net/socket.c
616++++ linux-3.10.0-1160.2.2.el7/net/socket.c
617617 @@ -1661,6 +1661,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
618618 if (err < 0)
619619 goto out_fd;
@@ -625,8 +625,8 @@
625625 if (upeer_sockaddr) {
626626 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
627627 &len, 2) < 0) {
628---- linux-3.10.0-1127.19.1.el7.orig/net/unix/af_unix.c
629-+++ linux-3.10.0-1127.19.1.el7/net/unix/af_unix.c
628+--- linux-3.10.0-1160.2.2.el7.orig/net/unix/af_unix.c
629++++ linux-3.10.0-1160.2.2.el7/net/unix/af_unix.c
630630 @@ -2138,6 +2138,10 @@ static int unix_dgram_recvmsg(struct kio
631631 wake_up_interruptible_sync_poll(&u->peer_wait,
632632 POLLOUT | POLLWRNORM | POLLWRBAND);
@@ -638,8 +638,8 @@
638638 if (msg->msg_name)
639639 unix_copy_addr(msg, skb->sk);
640640
641---- linux-3.10.0-1127.19.1.el7.orig/security/Kconfig
642-+++ linux-3.10.0-1127.19.1.el7/security/Kconfig
641+--- linux-3.10.0-1160.2.2.el7.orig/security/Kconfig
642++++ linux-3.10.0-1160.2.2.el7/security/Kconfig
643643 @@ -226,5 +226,7 @@ config DEFAULT_SECURITY
644644 default "yama" if DEFAULT_SECURITY_YAMA
645645 default "" if DEFAULT_SECURITY_DAC
@@ -648,8 +648,8 @@
648648 +
649649 endmenu
650650
651---- linux-3.10.0-1127.19.1.el7.orig/security/Makefile
652-+++ linux-3.10.0-1127.19.1.el7/security/Makefile
651+--- linux-3.10.0-1160.2.2.el7.orig/security/Makefile
652++++ linux-3.10.0-1160.2.2.el7/security/Makefile
653653 @@ -29,3 +29,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
654654 # Object integrity file lists
655655 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -657,8 +657,8 @@
657657 +
658658 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
659659 +obj-$(CONFIG_CCSECURITY) += ccsecurity/built-in.o
660---- linux-3.10.0-1127.19.1.el7.orig/security/security.c
661-+++ linux-3.10.0-1127.19.1.el7/security/security.c
660+--- linux-3.10.0-1160.2.2.el7.orig/security/security.c
661++++ linux-3.10.0-1160.2.2.el7/security/security.c
662662 @@ -229,7 +229,10 @@ int security_syslog(int type)
663663
664664 int security_settime(const struct timespec *ts, const struct timezone *tz)
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.14.diff (revision 6837)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.14.diff (revision 6838)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.14.202.
1+This is TOMOYO Linux patch for kernel 4.14.203.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.202.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.203.tar.xz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,8 +28,8 @@
2828 security/security.c | 9 +++++-
2929 24 files changed, 153 insertions(+), 29 deletions(-)
3030
31---- linux-4.14.202.orig/fs/exec.c
32-+++ linux-4.14.202/fs/exec.c
31+--- linux-4.14.203.orig/fs/exec.c
32++++ linux-4.14.203/fs/exec.c
3333 @@ -1679,7 +1679,7 @@ static int exec_binprm(struct linux_binp
3434 old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
3535 rcu_read_unlock();
@@ -39,8 +39,8 @@
3939 if (ret >= 0) {
4040 audit_bprm(bprm);
4141 trace_sched_process_exec(current, old_pid, bprm);
42---- linux-4.14.202.orig/fs/open.c
43-+++ linux-4.14.202/fs/open.c
42+--- linux-4.14.203.orig/fs/open.c
43++++ linux-4.14.203/fs/open.c
4444 @@ -1193,6 +1193,8 @@ EXPORT_SYMBOL(sys_close);
4545 */
4646 SYSCALL_DEFINE0(vhangup)
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-4.14.202.orig/fs/proc/version.c
54-+++ linux-4.14.202/fs/proc/version.c
53+--- linux-4.14.203.orig/fs/proc/version.c
54++++ linux-4.14.203/fs/proc/version.c
5555 @@ -33,3 +33,10 @@ static int __init proc_version_init(void
5656 return 0;
5757 }
@@ -59,12 +59,12 @@
5959 +
6060 +static int __init ccs_show_version(void)
6161 +{
62-+ printk(KERN_INFO "Hook version: 4.14.202 2020/10/24\n");
62++ printk(KERN_INFO "Hook version: 4.14.203 2020/11/03\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.14.202.orig/include/linux/init_task.h
67-+++ linux-4.14.202/include/linux/init_task.h
66+--- linux-4.14.203.orig/include/linux/init_task.h
67++++ linux-4.14.203/include/linux/init_task.h
6868 @@ -219,6 +219,14 @@ extern struct cred init_cred;
6969 #define INIT_TASK_SECURITY
7070 #endif
@@ -88,8 +88,8 @@
8888 }
8989
9090
91---- linux-4.14.202.orig/include/linux/sched.h
92-+++ linux-4.14.202/include/linux/sched.h
91+--- linux-4.14.203.orig/include/linux/sched.h
92++++ linux-4.14.203/include/linux/sched.h
9393 @@ -33,6 +33,7 @@ struct audit_context;
9494 struct backing_dev_info;
9595 struct bio_list;
@@ -109,8 +109,8 @@
109109
110110 /*
111111 * New fields for task_struct should be added above here, so that
112---- linux-4.14.202.orig/include/linux/security.h
113-+++ linux-4.14.202/include/linux/security.h
112+--- linux-4.14.203.orig/include/linux/security.h
113++++ linux-4.14.203/include/linux/security.h
114114 @@ -56,6 +56,7 @@ struct msg_queue;
115115 struct xattr;
116116 struct xfrm_sec_ctx;
@@ -331,8 +331,8 @@
331331 }
332332 #endif /* CONFIG_SECURITY_PATH */
333333
334---- linux-4.14.202.orig/include/net/ip.h
335-+++ linux-4.14.202/include/net/ip.h
334+--- linux-4.14.203.orig/include/net/ip.h
335++++ linux-4.14.203/include/net/ip.h
336336 @@ -266,6 +266,8 @@ void inet_get_local_port_range(struct ne
337337 #ifdef CONFIG_SYSCTL
338338 static inline int inet_is_local_reserved_port(struct net *net, int port)
@@ -351,8 +351,8 @@
351351 return 0;
352352 }
353353
354---- linux-4.14.202.orig/kernel/kexec.c
355-+++ linux-4.14.202/kernel/kexec.c
354+--- linux-4.14.203.orig/kernel/kexec.c
355++++ linux-4.14.203/kernel/kexec.c
356356 @@ -17,7 +17,7 @@
357357 #include <linux/syscalls.h>
358358 #include <linux/vmalloc.h>
@@ -371,8 +371,8 @@
371371
372372 /*
373373 * Verify we have a legal set of flags
374---- linux-4.14.202.orig/kernel/module.c
375-+++ linux-4.14.202/kernel/module.c
374+--- linux-4.14.203.orig/kernel/module.c
375++++ linux-4.14.203/kernel/module.c
376376 @@ -66,6 +66,7 @@
377377 #include <linux/audit.h>
378378 #include <uapi/linux/module.h>
@@ -399,8 +399,8 @@
399399
400400 return 0;
401401 }
402---- linux-4.14.202.orig/kernel/ptrace.c
403-+++ linux-4.14.202/kernel/ptrace.c
402+--- linux-4.14.203.orig/kernel/ptrace.c
403++++ linux-4.14.203/kernel/ptrace.c
404404 @@ -1153,6 +1153,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
405405 {
406406 struct task_struct *child;
@@ -425,8 +425,8 @@
425425
426426 if (request == PTRACE_TRACEME) {
427427 ret = ptrace_traceme();
428---- linux-4.14.202.orig/kernel/reboot.c
429-+++ linux-4.14.202/kernel/reboot.c
428+--- linux-4.14.203.orig/kernel/reboot.c
429++++ linux-4.14.203/kernel/reboot.c
430430 @@ -16,6 +16,7 @@
431431 #include <linux/syscalls.h>
432432 #include <linux/syscore_ops.h>
@@ -444,8 +444,8 @@
444444
445445 /*
446446 * If pid namespaces are enabled and the current task is in a child
447---- linux-4.14.202.orig/kernel/sched/core.c
448-+++ linux-4.14.202/kernel/sched/core.c
447+--- linux-4.14.203.orig/kernel/sched/core.c
448++++ linux-4.14.203/kernel/sched/core.c
449449 @@ -3856,6 +3856,8 @@ int can_nice(const struct task_struct *p
450450 SYSCALL_DEFINE1(nice, int, increment)
451451 {
@@ -455,8 +455,8 @@
455455
456456 /*
457457 * Setpriority might change our priority at the same moment.
458---- linux-4.14.202.orig/kernel/signal.c
459-+++ linux-4.14.202/kernel/signal.c
458+--- linux-4.14.203.orig/kernel/signal.c
459++++ linux-4.14.203/kernel/signal.c
460460 @@ -3042,6 +3042,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait,
461461 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
462462 {
@@ -502,8 +502,8 @@
502502
503503 return do_send_specific(tgid, pid, sig, info);
504504 }
505---- linux-4.14.202.orig/kernel/sys.c
506-+++ linux-4.14.202/kernel/sys.c
505+--- linux-4.14.203.orig/kernel/sys.c
506++++ linux-4.14.203/kernel/sys.c
507507 @@ -193,6 +193,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
508508
509509 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -533,8 +533,8 @@
533533
534534 errno = -EFAULT;
535535 if (!copy_from_user(tmp, name, len)) {
536---- linux-4.14.202.orig/kernel/time/ntp.c
537-+++ linux-4.14.202/kernel/time/ntp.c
536+--- linux-4.14.203.orig/kernel/time/ntp.c
537++++ linux-4.14.203/kernel/time/ntp.c
538538 @@ -18,6 +18,7 @@
539539 #include <linux/module.h>
540540 #include <linux/rtc.h>
@@ -568,8 +568,8 @@
568568
569569 if (txc->modes & ADJ_NANO) {
570570 struct timespec ts;
571---- linux-4.14.202.orig/net/ipv4/raw.c
572-+++ linux-4.14.202/net/ipv4/raw.c
571+--- linux-4.14.203.orig/net/ipv4/raw.c
572++++ linux-4.14.203/net/ipv4/raw.c
573573 @@ -768,6 +768,10 @@ static int raw_recvmsg(struct sock *sk,
574574 skb = skb_recv_datagram(sk, flags, noblock, &err);
575575 if (!skb)
@@ -581,8 +581,8 @@
581581
582582 copied = skb->len;
583583 if (len < copied) {
584---- linux-4.14.202.orig/net/ipv4/udp.c
585-+++ linux-4.14.202/net/ipv4/udp.c
584+--- linux-4.14.203.orig/net/ipv4/udp.c
585++++ linux-4.14.203/net/ipv4/udp.c
586586 @@ -1608,6 +1608,8 @@ try_again:
587587 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
588588 if (!skb)
@@ -592,8 +592,8 @@
592592
593593 ulen = udp_skb_len(skb);
594594 copied = len;
595---- linux-4.14.202.orig/net/ipv6/raw.c
596-+++ linux-4.14.202/net/ipv6/raw.c
595+--- linux-4.14.203.orig/net/ipv6/raw.c
596++++ linux-4.14.203/net/ipv6/raw.c
597597 @@ -485,6 +485,10 @@ static int rawv6_recvmsg(struct sock *sk
598598 skb = skb_recv_datagram(sk, flags, noblock, &err);
599599 if (!skb)
@@ -605,8 +605,8 @@
605605
606606 copied = skb->len;
607607 if (copied > len) {
608---- linux-4.14.202.orig/net/ipv6/udp.c
609-+++ linux-4.14.202/net/ipv6/udp.c
608+--- linux-4.14.203.orig/net/ipv6/udp.c
609++++ linux-4.14.203/net/ipv6/udp.c
610610 @@ -371,6 +371,8 @@ try_again:
611611 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
612612 if (!skb)
@@ -616,8 +616,8 @@
616616
617617 ulen = udp6_skb_len(skb);
618618 copied = len;
619---- linux-4.14.202.orig/net/socket.c
620-+++ linux-4.14.202/net/socket.c
619+--- linux-4.14.203.orig/net/socket.c
620++++ linux-4.14.203/net/socket.c
621621 @@ -1588,6 +1588,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
622622 if (err < 0)
623623 goto out_fd;
@@ -629,8 +629,8 @@
629629 if (upeer_sockaddr) {
630630 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
631631 &len, 2) < 0) {
632---- linux-4.14.202.orig/net/unix/af_unix.c
633-+++ linux-4.14.202/net/unix/af_unix.c
632+--- linux-4.14.203.orig/net/unix/af_unix.c
633++++ linux-4.14.203/net/unix/af_unix.c
634634 @@ -2162,6 +2162,10 @@ static int unix_dgram_recvmsg(struct soc
635635 POLLOUT | POLLWRNORM |
636636 POLLWRBAND);
@@ -650,8 +650,8 @@
650650 mutex_unlock(&u->iolock);
651651 out:
652652 return err;
653---- linux-4.14.202.orig/security/Kconfig
654-+++ linux-4.14.202/security/Kconfig
653+--- linux-4.14.203.orig/security/Kconfig
654++++ linux-4.14.203/security/Kconfig
655655 @@ -263,5 +263,7 @@ config DEFAULT_SECURITY
656656 default "apparmor" if DEFAULT_SECURITY_APPARMOR
657657 default "" if DEFAULT_SECURITY_DAC
@@ -660,8 +660,8 @@
660660 +
661661 endmenu
662662
663---- linux-4.14.202.orig/security/Makefile
664-+++ linux-4.14.202/security/Makefile
663+--- linux-4.14.203.orig/security/Makefile
664++++ linux-4.14.203/security/Makefile
665665 @@ -30,3 +30,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
666666 # Object integrity file lists
667667 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -669,8 +669,8 @@
669669 +
670670 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
671671 +obj-$(CONFIG_CCSECURITY) += ccsecurity/
672---- linux-4.14.202.orig/security/security.c
673-+++ linux-4.14.202/security/security.c
672+--- linux-4.14.203.orig/security/security.c
673++++ linux-4.14.203/security/security.c
674674 @@ -978,12 +978,19 @@ int security_file_open(struct file *file
675675
676676 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 6837)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.19.diff (revision 6838)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.19.152.
1+This is TOMOYO Linux patch for kernel 4.19.154.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.152.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.154.tar.xz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,8 +28,8 @@
2828 security/security.c | 9 +++++-
2929 24 files changed, 148 insertions(+), 29 deletions(-)
3030
31---- linux-4.19.152.orig/fs/exec.c
32-+++ linux-4.19.152/fs/exec.c
31+--- linux-4.19.154.orig/fs/exec.c
32++++ linux-4.19.154/fs/exec.c
3333 @@ -1694,7 +1694,7 @@ static int exec_binprm(struct linux_binp
3434 old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
3535 rcu_read_unlock();
@@ -39,8 +39,8 @@
3939 if (ret >= 0) {
4040 audit_bprm(bprm);
4141 trace_sched_process_exec(current, old_pid, bprm);
42---- linux-4.19.152.orig/fs/open.c
43-+++ linux-4.19.152/fs/open.c
42+--- linux-4.19.154.orig/fs/open.c
43++++ linux-4.19.154/fs/open.c
4444 @@ -1196,6 +1196,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd)
4545 */
4646 SYSCALL_DEFINE0(vhangup)
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-4.19.152.orig/fs/proc/version.c
54-+++ linux-4.19.152/fs/proc/version.c
53+--- linux-4.19.154.orig/fs/proc/version.c
54++++ linux-4.19.154/fs/proc/version.c
5555 @@ -21,3 +21,10 @@ static int __init proc_version_init(void
5656 return 0;
5757 }
@@ -59,12 +59,12 @@
5959 +
6060 +static int __init ccs_show_version(void)
6161 +{
62-+ printk(KERN_INFO "Hook version: 4.19.152 2020/10/24\n");
62++ printk(KERN_INFO "Hook version: 4.19.154 2020/11/03\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.19.152.orig/include/linux/sched.h
67-+++ linux-4.19.152/include/linux/sched.h
66+--- linux-4.19.154.orig/include/linux/sched.h
67++++ linux-4.19.154/include/linux/sched.h
6868 @@ -34,6 +34,7 @@ struct audit_context;
6969 struct backing_dev_info;
7070 struct bio_list;
@@ -84,8 +84,8 @@
8484
8585 /*
8686 * New fields for task_struct should be added above here, so that
87---- linux-4.19.152.orig/include/linux/security.h
88-+++ linux-4.19.152/include/linux/security.h
87+--- linux-4.19.154.orig/include/linux/security.h
88++++ linux-4.19.154/include/linux/security.h
8989 @@ -53,6 +53,7 @@ struct msg_msg;
9090 struct xattr;
9191 struct xfrm_sec_ctx;
@@ -306,8 +306,8 @@
306306 }
307307 #endif /* CONFIG_SECURITY_PATH */
308308
309---- linux-4.19.152.orig/include/net/ip.h
310-+++ linux-4.19.152/include/net/ip.h
309+--- linux-4.19.154.orig/include/net/ip.h
310++++ linux-4.19.154/include/net/ip.h
311311 @@ -301,6 +301,8 @@ void inet_get_local_port_range(struct ne
312312 #ifdef CONFIG_SYSCTL
313313 static inline int inet_is_local_reserved_port(struct net *net, int port)
@@ -326,8 +326,8 @@
326326 return 0;
327327 }
328328
329---- linux-4.19.152.orig/init/init_task.c
330-+++ linux-4.19.152/init/init_task.c
329+--- linux-4.19.154.orig/init/init_task.c
330++++ linux-4.19.154/init/init_task.c
331331 @@ -179,6 +179,10 @@ struct task_struct init_task
332332 #ifdef CONFIG_SECURITY
333333 .security = NULL,
@@ -339,8 +339,8 @@
339339 };
340340 EXPORT_SYMBOL(init_task);
341341
342---- linux-4.19.152.orig/kernel/kexec.c
343-+++ linux-4.19.152/kernel/kexec.c
342+--- linux-4.19.154.orig/kernel/kexec.c
343++++ linux-4.19.154/kernel/kexec.c
344344 @@ -18,7 +18,7 @@
345345 #include <linux/syscalls.h>
346346 #include <linux/vmalloc.h>
@@ -359,8 +359,8 @@
359359
360360 /* Permit LSMs and IMA to fail the kexec */
361361 result = security_kernel_load_data(LOADING_KEXEC_IMAGE);
362---- linux-4.19.152.orig/kernel/module.c
363-+++ linux-4.19.152/kernel/module.c
362+--- linux-4.19.154.orig/kernel/module.c
363++++ linux-4.19.154/kernel/module.c
364364 @@ -66,6 +66,7 @@
365365 #include <linux/audit.h>
366366 #include <uapi/linux/module.h>
@@ -387,8 +387,8 @@
387387
388388 return 0;
389389 }
390---- linux-4.19.152.orig/kernel/ptrace.c
391-+++ linux-4.19.152/kernel/ptrace.c
390+--- linux-4.19.154.orig/kernel/ptrace.c
391++++ linux-4.19.154/kernel/ptrace.c
392392 @@ -1142,6 +1142,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
393393 {
394394 struct task_struct *child;
@@ -413,8 +413,8 @@
413413
414414 if (request == PTRACE_TRACEME) {
415415 ret = ptrace_traceme();
416---- linux-4.19.152.orig/kernel/reboot.c
417-+++ linux-4.19.152/kernel/reboot.c
416+--- linux-4.19.154.orig/kernel/reboot.c
417++++ linux-4.19.154/kernel/reboot.c
418418 @@ -16,6 +16,7 @@
419419 #include <linux/syscalls.h>
420420 #include <linux/syscore_ops.h>
@@ -432,8 +432,8 @@
432432
433433 /*
434434 * If pid namespaces are enabled and the current task is in a child
435---- linux-4.19.152.orig/kernel/sched/core.c
436-+++ linux-4.19.152/kernel/sched/core.c
435+--- linux-4.19.154.orig/kernel/sched/core.c
436++++ linux-4.19.154/kernel/sched/core.c
437437 @@ -3989,6 +3989,8 @@ int can_nice(const struct task_struct *p
438438 SYSCALL_DEFINE1(nice, int, increment)
439439 {
@@ -443,8 +443,8 @@
443443
444444 /*
445445 * Setpriority might change our priority at the same moment.
446---- linux-4.19.152.orig/kernel/signal.c
447-+++ linux-4.19.152/kernel/signal.c
446+--- linux-4.19.154.orig/kernel/signal.c
447++++ linux-4.19.154/kernel/signal.c
448448 @@ -3285,6 +3285,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait,
449449 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
450450 {
@@ -490,8 +490,8 @@
490490
491491 return do_send_specific(tgid, pid, sig, info);
492492 }
493---- linux-4.19.152.orig/kernel/sys.c
494-+++ linux-4.19.152/kernel/sys.c
493+--- linux-4.19.154.orig/kernel/sys.c
494++++ linux-4.19.154/kernel/sys.c
495495 @@ -201,6 +201,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
496496
497497 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -521,8 +521,8 @@
521521
522522 errno = -EFAULT;
523523 if (!copy_from_user(tmp, name, len)) {
524---- linux-4.19.152.orig/kernel/time/timekeeping.c
525-+++ linux-4.19.152/kernel/time/timekeeping.c
524+--- linux-4.19.154.orig/kernel/time/timekeeping.c
525++++ linux-4.19.154/kernel/time/timekeeping.c
526526 @@ -26,6 +26,7 @@
527527 #include <linux/stop_machine.h>
528528 #include <linux/pvclock_gtod.h>
@@ -556,8 +556,8 @@
556556
557557 /*
558558 * Validate if a timespec/timeval used to inject a time
559---- linux-4.19.152.orig/net/ipv4/raw.c
560-+++ linux-4.19.152/net/ipv4/raw.c
559+--- linux-4.19.154.orig/net/ipv4/raw.c
560++++ linux-4.19.154/net/ipv4/raw.c
561561 @@ -772,6 +772,10 @@ static int raw_recvmsg(struct sock *sk,
562562 skb = skb_recv_datagram(sk, flags, noblock, &err);
563563 if (!skb)
@@ -569,8 +569,8 @@
569569
570570 copied = skb->len;
571571 if (len < copied) {
572---- linux-4.19.152.orig/net/ipv4/udp.c
573-+++ linux-4.19.152/net/ipv4/udp.c
572+--- linux-4.19.154.orig/net/ipv4/udp.c
573++++ linux-4.19.154/net/ipv4/udp.c
574574 @@ -1686,6 +1686,8 @@ try_again:
575575 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
576576 if (!skb)
@@ -580,8 +580,8 @@
580580
581581 ulen = udp_skb_len(skb);
582582 copied = len;
583---- linux-4.19.152.orig/net/ipv6/raw.c
584-+++ linux-4.19.152/net/ipv6/raw.c
583+--- linux-4.19.154.orig/net/ipv6/raw.c
584++++ linux-4.19.154/net/ipv6/raw.c
585585 @@ -485,6 +485,10 @@ static int rawv6_recvmsg(struct sock *sk
586586 skb = skb_recv_datagram(sk, flags, noblock, &err);
587587 if (!skb)
@@ -593,8 +593,8 @@
593593
594594 copied = skb->len;
595595 if (copied > len) {
596---- linux-4.19.152.orig/net/ipv6/udp.c
597-+++ linux-4.19.152/net/ipv6/udp.c
596+--- linux-4.19.154.orig/net/ipv6/udp.c
597++++ linux-4.19.154/net/ipv6/udp.c
598598 @@ -347,6 +347,8 @@ try_again:
599599 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
600600 if (!skb)
@@ -604,8 +604,8 @@
604604
605605 ulen = udp6_skb_len(skb);
606606 copied = len;
607---- linux-4.19.152.orig/net/socket.c
608-+++ linux-4.19.152/net/socket.c
607+--- linux-4.19.154.orig/net/socket.c
608++++ linux-4.19.154/net/socket.c
609609 @@ -1590,6 +1590,10 @@ int __sys_accept4(int fd, struct sockadd
610610 if (err < 0)
611611 goto out_fd;
@@ -617,8 +617,8 @@
617617 if (upeer_sockaddr) {
618618 len = newsock->ops->getname(newsock,
619619 (struct sockaddr *)&address, 2);
620---- linux-4.19.152.orig/net/unix/af_unix.c
621-+++ linux-4.19.152/net/unix/af_unix.c
620+--- linux-4.19.154.orig/net/unix/af_unix.c
621++++ linux-4.19.154/net/unix/af_unix.c
622622 @@ -2158,6 +2158,10 @@ static int unix_dgram_recvmsg(struct soc
623623 EPOLLOUT | EPOLLWRNORM |
624624 EPOLLWRBAND);
@@ -638,8 +638,8 @@
638638 mutex_unlock(&u->iolock);
639639 out:
640640 return err;
641---- linux-4.19.152.orig/security/Kconfig
642-+++ linux-4.19.152/security/Kconfig
641+--- linux-4.19.154.orig/security/Kconfig
642++++ linux-4.19.154/security/Kconfig
643643 @@ -276,5 +276,7 @@ config DEFAULT_SECURITY
644644 default "apparmor" if DEFAULT_SECURITY_APPARMOR
645645 default "" if DEFAULT_SECURITY_DAC
@@ -648,8 +648,8 @@
648648 +
649649 endmenu
650650
651---- linux-4.19.152.orig/security/Makefile
652-+++ linux-4.19.152/security/Makefile
651+--- linux-4.19.154.orig/security/Makefile
652++++ linux-4.19.154/security/Makefile
653653 @@ -30,3 +30,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
654654 # Object integrity file lists
655655 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -657,8 +657,8 @@
657657 +
658658 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
659659 +obj-$(CONFIG_CCSECURITY) += ccsecurity/
660---- linux-4.19.152.orig/security/security.c
661-+++ linux-4.19.152/security/security.c
660+--- linux-4.19.154.orig/security/security.c
661++++ linux-4.19.154/security/security.c
662662 @@ -984,12 +984,19 @@ int security_file_open(struct file *file
663663
664664 int security_task_alloc(struct task_struct *task, unsigned long clone_flags)
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.4.diff (revision 6837)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.4.diff (revision 6838)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.4.240.
1+This is TOMOYO Linux patch for kernel 4.4.241.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.240.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.241.tar.xz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,8 +28,8 @@
2828 security/Makefile | 3 ++
2929 24 files changed, 150 insertions(+), 26 deletions(-)
3030
31---- linux-4.4.240.orig/fs/exec.c
32-+++ linux-4.4.240/fs/exec.c
31+--- linux-4.4.241.orig/fs/exec.c
32++++ linux-4.4.241/fs/exec.c
3333 @@ -1514,7 +1514,7 @@ static int exec_binprm(struct linux_binp
3434 old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
3535 rcu_read_unlock();
@@ -39,8 +39,8 @@
3939 if (ret >= 0) {
4040 audit_bprm(bprm);
4141 trace_sched_process_exec(current, old_pid, bprm);
42---- linux-4.4.240.orig/fs/open.c
43-+++ linux-4.4.240/fs/open.c
42+--- linux-4.4.241.orig/fs/open.c
43++++ linux-4.4.241/fs/open.c
4444 @@ -1136,6 +1136,8 @@ EXPORT_SYMBOL(sys_close);
4545 */
4646 SYSCALL_DEFINE0(vhangup)
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-4.4.240.orig/fs/proc/version.c
54-+++ linux-4.4.240/fs/proc/version.c
53+--- linux-4.4.241.orig/fs/proc/version.c
54++++ linux-4.4.241/fs/proc/version.c
5555 @@ -32,3 +32,10 @@ static int __init proc_version_init(void
5656 return 0;
5757 }
@@ -59,12 +59,12 @@
5959 +
6060 +static int __init ccs_show_version(void)
6161 +{
62-+ printk(KERN_INFO "Hook version: 4.4.240 2020/10/24\n");
62++ printk(KERN_INFO "Hook version: 4.4.241 2020/11/03\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.4.240.orig/include/linux/init_task.h
67-+++ linux-4.4.240/include/linux/init_task.h
66+--- linux-4.4.241.orig/include/linux/init_task.h
67++++ linux-4.4.241/include/linux/init_task.h
6868 @@ -191,6 +191,14 @@ extern struct task_group root_task_group
6969 # define INIT_TASK_TI(tsk)
7070 #endif
@@ -88,8 +88,8 @@
8888 }
8989
9090
91---- linux-4.4.240.orig/include/linux/sched.h
92-+++ linux-4.4.240/include/linux/sched.h
91+--- linux-4.4.241.orig/include/linux/sched.h
92++++ linux-4.4.241/include/linux/sched.h
9393 @@ -6,6 +6,8 @@
9494 #include <linux/sched/prio.h>
9595
@@ -110,8 +110,8 @@
110110 /* CPU-specific state of this task */
111111 struct thread_struct thread;
112112 /*
113---- linux-4.4.240.orig/include/linux/security.h
114-+++ linux-4.4.240/include/linux/security.h
113+--- linux-4.4.241.orig/include/linux/security.h
114++++ linux-4.4.241/include/linux/security.h
115115 @@ -53,6 +53,7 @@ struct msg_queue;
116116 struct xattr;
117117 struct xfrm_sec_ctx;
@@ -318,8 +318,8 @@
318318 }
319319 #endif /* CONFIG_SECURITY_PATH */
320320
321---- linux-4.4.240.orig/include/net/ip.h
322-+++ linux-4.4.240/include/net/ip.h
321+--- linux-4.4.241.orig/include/net/ip.h
322++++ linux-4.4.241/include/net/ip.h
323323 @@ -225,6 +225,8 @@ void inet_get_local_port_range(struct ne
324324 #ifdef CONFIG_SYSCTL
325325 static inline int inet_is_local_reserved_port(struct net *net, int port)
@@ -338,8 +338,8 @@
338338 return 0;
339339 }
340340 #endif
341---- linux-4.4.240.orig/kernel/fork.c
342-+++ linux-4.4.240/kernel/fork.c
341+--- linux-4.4.241.orig/kernel/fork.c
342++++ linux-4.4.241/kernel/fork.c
343343 @@ -260,6 +260,7 @@ void __put_task_struct(struct task_struc
344344 delayacct_tsk_free(tsk);
345345 put_signal_struct(tsk->signal);
@@ -366,8 +366,8 @@
366366 bad_fork_cleanup_perf:
367367 perf_event_free_task(p);
368368 bad_fork_cleanup_policy:
369---- linux-4.4.240.orig/kernel/kexec.c
370-+++ linux-4.4.240/kernel/kexec.c
369+--- linux-4.4.241.orig/kernel/kexec.c
370++++ linux-4.4.241/kernel/kexec.c
371371 @@ -17,7 +17,7 @@
372372 #include <linux/syscalls.h>
373373 #include <linux/vmalloc.h>
@@ -386,8 +386,8 @@
386386
387387 /*
388388 * Verify we have a legal set of flags
389---- linux-4.4.240.orig/kernel/module.c
390-+++ linux-4.4.240/kernel/module.c
389+--- linux-4.4.241.orig/kernel/module.c
390++++ linux-4.4.241/kernel/module.c
391391 @@ -61,6 +61,7 @@
392392 #include <linux/bsearch.h>
393393 #include <uapi/linux/module.h>
@@ -414,8 +414,8 @@
414414
415415 return 0;
416416 }
417---- linux-4.4.240.orig/kernel/ptrace.c
418-+++ linux-4.4.240/kernel/ptrace.c
417+--- linux-4.4.241.orig/kernel/ptrace.c
418++++ linux-4.4.241/kernel/ptrace.c
419419 @@ -1109,6 +1109,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
420420 {
421421 struct task_struct *child;
@@ -440,8 +440,8 @@
440440
441441 if (request == PTRACE_TRACEME) {
442442 ret = ptrace_traceme();
443---- linux-4.4.240.orig/kernel/reboot.c
444-+++ linux-4.4.240/kernel/reboot.c
443+--- linux-4.4.241.orig/kernel/reboot.c
444++++ linux-4.4.241/kernel/reboot.c
445445 @@ -16,6 +16,7 @@
446446 #include <linux/syscalls.h>
447447 #include <linux/syscore_ops.h>
@@ -459,8 +459,8 @@
459459
460460 /*
461461 * If pid namespaces are enabled and the current task is in a child
462---- linux-4.4.240.orig/kernel/sched/core.c
463-+++ linux-4.4.240/kernel/sched/core.c
462+--- linux-4.4.241.orig/kernel/sched/core.c
463++++ linux-4.4.241/kernel/sched/core.c
464464 @@ -3550,6 +3550,8 @@ int can_nice(const struct task_struct *p
465465 SYSCALL_DEFINE1(nice, int, increment)
466466 {
@@ -470,8 +470,8 @@
470470
471471 /*
472472 * Setpriority might change our priority at the same moment.
473---- linux-4.4.240.orig/kernel/signal.c
474-+++ linux-4.4.240/kernel/signal.c
473+--- linux-4.4.241.orig/kernel/signal.c
474++++ linux-4.4.241/kernel/signal.c
475475 @@ -2943,6 +2943,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
476476 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
477477 {
@@ -517,8 +517,8 @@
517517
518518 return do_send_specific(tgid, pid, sig, info);
519519 }
520---- linux-4.4.240.orig/kernel/sys.c
521-+++ linux-4.4.240/kernel/sys.c
520+--- linux-4.4.241.orig/kernel/sys.c
521++++ linux-4.4.241/kernel/sys.c
522522 @@ -185,6 +185,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
523523
524524 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -548,8 +548,8 @@
548548
549549 errno = -EFAULT;
550550 if (!copy_from_user(tmp, name, len)) {
551---- linux-4.4.240.orig/kernel/time/ntp.c
552-+++ linux-4.4.240/kernel/time/ntp.c
551+--- linux-4.4.241.orig/kernel/time/ntp.c
552++++ linux-4.4.241/kernel/time/ntp.c
553553 @@ -16,6 +16,7 @@
554554 #include <linux/mm.h>
555555 #include <linux/module.h>
@@ -583,8 +583,8 @@
583583
584584 if (txc->modes & ADJ_NANO) {
585585 struct timespec ts;
586---- linux-4.4.240.orig/net/ipv4/raw.c
587-+++ linux-4.4.240/net/ipv4/raw.c
586+--- linux-4.4.241.orig/net/ipv4/raw.c
587++++ linux-4.4.241/net/ipv4/raw.c
588588 @@ -749,6 +749,10 @@ static int raw_recvmsg(struct sock *sk,
589589 skb = skb_recv_datagram(sk, flags, noblock, &err);
590590 if (!skb)
@@ -596,8 +596,8 @@
596596
597597 copied = skb->len;
598598 if (len < copied) {
599---- linux-4.4.240.orig/net/ipv4/udp.c
600-+++ linux-4.4.240/net/ipv4/udp.c
599+--- linux-4.4.241.orig/net/ipv4/udp.c
600++++ linux-4.4.241/net/ipv4/udp.c
601601 @@ -1289,6 +1289,10 @@ try_again:
602602 &peeked, &off, &err);
603603 if (!skb)
@@ -609,8 +609,8 @@
609609
610610 ulen = skb->len - sizeof(struct udphdr);
611611 copied = len;
612---- linux-4.4.240.orig/net/ipv6/raw.c
613-+++ linux-4.4.240/net/ipv6/raw.c
612+--- linux-4.4.241.orig/net/ipv6/raw.c
613++++ linux-4.4.241/net/ipv6/raw.c
614614 @@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk
615615 skb = skb_recv_datagram(sk, flags, noblock, &err);
616616 if (!skb)
@@ -622,8 +622,8 @@
622622
623623 copied = skb->len;
624624 if (copied > len) {
625---- linux-4.4.240.orig/net/ipv6/udp.c
626-+++ linux-4.4.240/net/ipv6/udp.c
625+--- linux-4.4.241.orig/net/ipv6/udp.c
626++++ linux-4.4.241/net/ipv6/udp.c
627627 @@ -417,6 +417,10 @@ try_again:
628628 &peeked, &off, &err);
629629 if (!skb)
@@ -635,8 +635,8 @@
635635
636636 ulen = skb->len - sizeof(struct udphdr);
637637 copied = len;
638---- linux-4.4.240.orig/net/socket.c
639-+++ linux-4.4.240/net/socket.c
638+--- linux-4.4.241.orig/net/socket.c
639++++ linux-4.4.241/net/socket.c
640640 @@ -1465,6 +1465,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
641641 if (err < 0)
642642 goto out_fd;
@@ -648,8 +648,8 @@
648648 if (upeer_sockaddr) {
649649 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
650650 &len, 2) < 0) {
651---- linux-4.4.240.orig/net/unix/af_unix.c
652-+++ linux-4.4.240/net/unix/af_unix.c
651+--- linux-4.4.241.orig/net/unix/af_unix.c
652++++ linux-4.4.241/net/unix/af_unix.c
653653 @@ -2160,6 +2160,10 @@ static int unix_dgram_recvmsg(struct soc
654654 wake_up_interruptible_sync_poll(&u->peer_wait,
655655 POLLOUT | POLLWRNORM | POLLWRBAND);
@@ -661,8 +661,8 @@
661661 if (msg->msg_name)
662662 unix_copy_addr(msg, skb->sk);
663663
664---- linux-4.4.240.orig/security/Kconfig
665-+++ linux-4.4.240/security/Kconfig
664+--- linux-4.4.241.orig/security/Kconfig
665++++ linux-4.4.241/security/Kconfig
666666 @@ -173,5 +173,7 @@ config DEFAULT_SECURITY
667667 default "apparmor" if DEFAULT_SECURITY_APPARMOR
668668 default "" if DEFAULT_SECURITY_DAC
@@ -671,8 +671,8 @@
671671 +
672672 endmenu
673673
674---- linux-4.4.240.orig/security/Makefile
675-+++ linux-4.4.240/security/Makefile
674+--- linux-4.4.241.orig/security/Makefile
675++++ linux-4.4.241/security/Makefile
676676 @@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
677677 # Object integrity file lists
678678 subdir-$(CONFIG_INTEGRITY) += integrity
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.9.diff (revision 6837)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.9.diff (revision 6838)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.9.240.
1+This is TOMOYO Linux patch for kernel 4.9.241.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.240.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.241.tar.xz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,8 +28,8 @@
2828 security/Makefile | 3 ++
2929 24 files changed, 147 insertions(+), 26 deletions(-)
3030
31---- linux-4.9.240.orig/fs/exec.c
32-+++ linux-4.9.240/fs/exec.c
31+--- linux-4.9.241.orig/fs/exec.c
32++++ linux-4.9.241/fs/exec.c
3333 @@ -1662,7 +1662,7 @@ static int exec_binprm(struct linux_binp
3434 old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
3535 rcu_read_unlock();
@@ -39,8 +39,8 @@
3939 if (ret >= 0) {
4040 audit_bprm(bprm);
4141 trace_sched_process_exec(current, old_pid, bprm);
42---- linux-4.9.240.orig/fs/open.c
43-+++ linux-4.9.240/fs/open.c
42+--- linux-4.9.241.orig/fs/open.c
43++++ linux-4.9.241/fs/open.c
4444 @@ -1173,6 +1173,8 @@ EXPORT_SYMBOL(sys_close);
4545 */
4646 SYSCALL_DEFINE0(vhangup)
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-4.9.240.orig/fs/proc/version.c
54-+++ linux-4.9.240/fs/proc/version.c
53+--- linux-4.9.241.orig/fs/proc/version.c
54++++ linux-4.9.241/fs/proc/version.c
5555 @@ -32,3 +32,10 @@ static int __init proc_version_init(void
5656 return 0;
5757 }
@@ -59,12 +59,12 @@
5959 +
6060 +static int __init ccs_show_version(void)
6161 +{
62-+ printk(KERN_INFO "Hook version: 4.9.240 2020/10/24\n");
62++ printk(KERN_INFO "Hook version: 4.9.241 2020/11/03\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.9.240.orig/include/linux/init_task.h
67-+++ linux-4.9.240/include/linux/init_task.h
66+--- linux-4.9.241.orig/include/linux/init_task.h
67++++ linux-4.9.241/include/linux/init_task.h
6868 @@ -193,6 +193,14 @@ extern struct task_group root_task_group
6969 # define INIT_TASK_TI(tsk)
7070 #endif
@@ -88,8 +88,8 @@
8888 }
8989
9090
91---- linux-4.9.240.orig/include/linux/sched.h
92-+++ linux-4.9.240/include/linux/sched.h
91+--- linux-4.9.241.orig/include/linux/sched.h
92++++ linux-4.9.241/include/linux/sched.h
9393 @@ -6,6 +6,8 @@
9494 #include <linux/sched/prio.h>
9595
@@ -110,8 +110,8 @@
110110 /* CPU-specific state of this task */
111111 struct thread_struct thread;
112112 /*
113---- linux-4.9.240.orig/include/linux/security.h
114-+++ linux-4.9.240/include/linux/security.h
113+--- linux-4.9.241.orig/include/linux/security.h
114++++ linux-4.9.241/include/linux/security.h
115115 @@ -55,6 +55,7 @@ struct msg_queue;
116116 struct xattr;
117117 struct xfrm_sec_ctx;
@@ -318,8 +318,8 @@
318318 }
319319 #endif /* CONFIG_SECURITY_PATH */
320320
321---- linux-4.9.240.orig/include/net/ip.h
322-+++ linux-4.9.240/include/net/ip.h
321+--- linux-4.9.241.orig/include/net/ip.h
322++++ linux-4.9.241/include/net/ip.h
323323 @@ -254,6 +254,8 @@ void inet_get_local_port_range(struct ne
324324 #ifdef CONFIG_SYSCTL
325325 static inline int inet_is_local_reserved_port(struct net *net, int port)
@@ -338,8 +338,8 @@
338338 return 0;
339339 }
340340 #endif
341---- linux-4.9.240.orig/kernel/fork.c
342-+++ linux-4.9.240/kernel/fork.c
341+--- linux-4.9.241.orig/kernel/fork.c
342++++ linux-4.9.241/kernel/fork.c
343343 @@ -395,6 +395,7 @@ void __put_task_struct(struct task_struc
344344 delayacct_tsk_free(tsk);
345345 put_signal_struct(tsk->signal);
@@ -366,8 +366,8 @@
366366 bad_fork_cleanup_perf:
367367 perf_event_free_task(p);
368368 bad_fork_cleanup_policy:
369---- linux-4.9.240.orig/kernel/kexec.c
370-+++ linux-4.9.240/kernel/kexec.c
369+--- linux-4.9.241.orig/kernel/kexec.c
370++++ linux-4.9.241/kernel/kexec.c
371371 @@ -17,7 +17,7 @@
372372 #include <linux/syscalls.h>
373373 #include <linux/vmalloc.h>
@@ -386,8 +386,8 @@
386386
387387 /*
388388 * Verify we have a legal set of flags
389---- linux-4.9.240.orig/kernel/module.c
390-+++ linux-4.9.240/kernel/module.c
389+--- linux-4.9.241.orig/kernel/module.c
390++++ linux-4.9.241/kernel/module.c
391391 @@ -63,6 +63,7 @@
392392 #include <linux/dynamic_debug.h>
393393 #include <uapi/linux/module.h>
@@ -414,8 +414,8 @@
414414
415415 return 0;
416416 }
417---- linux-4.9.240.orig/kernel/ptrace.c
418-+++ linux-4.9.240/kernel/ptrace.c
417+--- linux-4.9.241.orig/kernel/ptrace.c
418++++ linux-4.9.241/kernel/ptrace.c
419419 @@ -1146,6 +1146,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
420420 {
421421 struct task_struct *child;
@@ -440,8 +440,8 @@
440440
441441 if (request == PTRACE_TRACEME) {
442442 ret = ptrace_traceme();
443---- linux-4.9.240.orig/kernel/reboot.c
444-+++ linux-4.9.240/kernel/reboot.c
443+--- linux-4.9.241.orig/kernel/reboot.c
444++++ linux-4.9.241/kernel/reboot.c
445445 @@ -16,6 +16,7 @@
446446 #include <linux/syscalls.h>
447447 #include <linux/syscore_ops.h>
@@ -459,8 +459,8 @@
459459
460460 /*
461461 * If pid namespaces are enabled and the current task is in a child
462---- linux-4.9.240.orig/kernel/sched/core.c
463-+++ linux-4.9.240/kernel/sched/core.c
462+--- linux-4.9.241.orig/kernel/sched/core.c
463++++ linux-4.9.241/kernel/sched/core.c
464464 @@ -3814,6 +3814,8 @@ int can_nice(const struct task_struct *p
465465 SYSCALL_DEFINE1(nice, int, increment)
466466 {
@@ -470,8 +470,8 @@
470470
471471 /*
472472 * Setpriority might change our priority at the same moment.
473---- linux-4.9.240.orig/kernel/signal.c
474-+++ linux-4.9.240/kernel/signal.c
473+--- linux-4.9.241.orig/kernel/signal.c
474++++ linux-4.9.241/kernel/signal.c
475475 @@ -2943,6 +2943,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
476476 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
477477 {
@@ -517,8 +517,8 @@
517517
518518 return do_send_specific(tgid, pid, sig, info);
519519 }
520---- linux-4.9.240.orig/kernel/sys.c
521-+++ linux-4.9.240/kernel/sys.c
520+--- linux-4.9.241.orig/kernel/sys.c
521++++ linux-4.9.241/kernel/sys.c
522522 @@ -185,6 +185,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
523523
524524 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -548,8 +548,8 @@
548548
549549 errno = -EFAULT;
550550 if (!copy_from_user(tmp, name, len)) {
551---- linux-4.9.240.orig/kernel/time/ntp.c
552-+++ linux-4.9.240/kernel/time/ntp.c
551+--- linux-4.9.241.orig/kernel/time/ntp.c
552++++ linux-4.9.241/kernel/time/ntp.c
553553 @@ -17,6 +17,7 @@
554554 #include <linux/module.h>
555555 #include <linux/rtc.h>
@@ -583,8 +583,8 @@
583583
584584 if (txc->modes & ADJ_NANO) {
585585 struct timespec ts;
586---- linux-4.9.240.orig/net/ipv4/raw.c
587-+++ linux-4.9.240/net/ipv4/raw.c
586+--- linux-4.9.241.orig/net/ipv4/raw.c
587++++ linux-4.9.241/net/ipv4/raw.c
588588 @@ -746,6 +746,10 @@ static int raw_recvmsg(struct sock *sk,
589589 skb = skb_recv_datagram(sk, flags, noblock, &err);
590590 if (!skb)
@@ -596,8 +596,8 @@
596596
597597 copied = skb->len;
598598 if (len < copied) {
599---- linux-4.9.240.orig/net/ipv4/udp.c
600-+++ linux-4.9.240/net/ipv4/udp.c
599+--- linux-4.9.241.orig/net/ipv4/udp.c
600++++ linux-4.9.241/net/ipv4/udp.c
601601 @@ -1271,6 +1271,8 @@ try_again:
602602 &peeked, &off, &err);
603603 if (!skb)
@@ -607,8 +607,8 @@
607607
608608 ulen = skb->len;
609609 copied = len;
610---- linux-4.9.240.orig/net/ipv6/raw.c
611-+++ linux-4.9.240/net/ipv6/raw.c
610+--- linux-4.9.241.orig/net/ipv6/raw.c
611++++ linux-4.9.241/net/ipv6/raw.c
612612 @@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk
613613 skb = skb_recv_datagram(sk, flags, noblock, &err);
614614 if (!skb)
@@ -620,8 +620,8 @@
620620
621621 copied = skb->len;
622622 if (copied > len) {
623---- linux-4.9.240.orig/net/ipv6/udp.c
624-+++ linux-4.9.240/net/ipv6/udp.c
623+--- linux-4.9.241.orig/net/ipv6/udp.c
624++++ linux-4.9.241/net/ipv6/udp.c
625625 @@ -348,6 +348,8 @@ try_again:
626626 &peeked, &off, &err);
627627 if (!skb)
@@ -631,8 +631,8 @@
631631
632632 ulen = skb->len;
633633 copied = len;
634---- linux-4.9.240.orig/net/socket.c
635-+++ linux-4.9.240/net/socket.c
634+--- linux-4.9.241.orig/net/socket.c
635++++ linux-4.9.241/net/socket.c
636636 @@ -1482,6 +1482,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
637637 if (err < 0)
638638 goto out_fd;
@@ -644,8 +644,8 @@
644644 if (upeer_sockaddr) {
645645 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
646646 &len, 2) < 0) {
647---- linux-4.9.240.orig/net/unix/af_unix.c
648-+++ linux-4.9.240/net/unix/af_unix.c
647+--- linux-4.9.241.orig/net/unix/af_unix.c
648++++ linux-4.9.241/net/unix/af_unix.c
649649 @@ -2169,6 +2169,10 @@ static int unix_dgram_recvmsg(struct soc
650650 POLLOUT | POLLWRNORM |
651651 POLLWRBAND);
@@ -665,8 +665,8 @@
665665 mutex_unlock(&u->iolock);
666666 out:
667667 return err;
668---- linux-4.9.240.orig/security/Kconfig
669-+++ linux-4.9.240/security/Kconfig
668+--- linux-4.9.241.orig/security/Kconfig
669++++ linux-4.9.241/security/Kconfig
670670 @@ -214,5 +214,7 @@ config DEFAULT_SECURITY
671671 default "apparmor" if DEFAULT_SECURITY_APPARMOR
672672 default "" if DEFAULT_SECURITY_DAC
@@ -675,8 +675,8 @@
675675 +
676676 endmenu
677677
678---- linux-4.9.240.orig/security/Makefile
679-+++ linux-4.9.240/security/Makefile
678+--- linux-4.9.241.orig/security/Makefile
679++++ linux-4.9.241/security/Makefile
680680 @@ -29,3 +29,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
681681 # Object integrity file lists
682682 subdir-$(CONFIG_INTEGRITY) += integrity
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-5.10.diff (revision 6837)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-5.10.diff (revision 6838)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 5.10-rc1.
1+This is TOMOYO Linux patch for kernel 5.10-rc2.
22
3-Source code for this patch is https://git.kernel.org/torvalds/t/linux-5.10-rc1.tar.gz
3+Source code for this patch is https://git.kernel.org/torvalds/t/linux-5.10-rc2.tar.gz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,8 +28,8 @@
2828 security/security.c | 5 ++-
2929 24 files changed, 160 insertions(+), 30 deletions(-)
3030
31---- linux-5.10-rc1.orig/fs/exec.c
32-+++ linux-5.10-rc1/fs/exec.c
31+--- linux-5.10-rc2.orig/fs/exec.c
32++++ linux-5.10-rc2/fs/exec.c
3333 @@ -1817,7 +1817,7 @@ static int bprm_execve(struct linux_binp
3434 if (retval)
3535 goto out;
@@ -39,8 +39,8 @@
3939 if (retval < 0)
4040 goto out;
4141
42---- linux-5.10-rc1.orig/fs/open.c
43-+++ linux-5.10-rc1/fs/open.c
42+--- linux-5.10-rc2.orig/fs/open.c
43++++ linux-5.10-rc2/fs/open.c
4444 @@ -1327,6 +1327,8 @@ SYSCALL_DEFINE3(close_range, unsigned in
4545 */
4646 SYSCALL_DEFINE0(vhangup)
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-5.10-rc1.orig/fs/proc/version.c
54-+++ linux-5.10-rc1/fs/proc/version.c
53+--- linux-5.10-rc2.orig/fs/proc/version.c
54++++ linux-5.10-rc2/fs/proc/version.c
5555 @@ -21,3 +21,10 @@ static int __init proc_version_init(void
5656 return 0;
5757 }
@@ -59,12 +59,12 @@
5959 +
6060 +static int __init ccs_show_version(void)
6161 +{
62-+ printk(KERN_INFO "Hook version: 5.10-rc1 2020/10/26\n");
62++ printk(KERN_INFO "Hook version: 5.10-rc2 2020/11/03\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-5.10-rc1.orig/include/linux/sched.h
67-+++ linux-5.10-rc1/include/linux/sched.h
66+--- linux-5.10-rc2.orig/include/linux/sched.h
67++++ linux-5.10-rc2/include/linux/sched.h
6868 @@ -41,6 +41,7 @@ struct backing_dev_info;
6969 struct bio_list;
7070 struct blk_plug;
@@ -84,8 +84,8 @@
8484
8585 #ifdef CONFIG_GCC_PLUGIN_STACKLEAK
8686 unsigned long lowest_stack;
87---- linux-5.10-rc1.orig/include/linux/security.h
88-+++ linux-5.10-rc1/include/linux/security.h
87+--- linux-5.10-rc2.orig/include/linux/security.h
88++++ linux-5.10-rc2/include/linux/security.h
8989 @@ -59,6 +59,7 @@ struct fs_parameter;
9090 enum fs_value_type;
9191 struct watch;
@@ -315,8 +315,8 @@
315315 }
316316 #endif /* CONFIG_SECURITY_PATH */
317317
318---- linux-5.10-rc1.orig/include/net/ip.h
319-+++ linux-5.10-rc1/include/net/ip.h
318+--- linux-5.10-rc2.orig/include/net/ip.h
319++++ linux-5.10-rc2/include/net/ip.h
320320 @@ -338,6 +338,8 @@ void inet_get_local_port_range(struct ne
321321 #ifdef CONFIG_SYSCTL
322322 static inline bool inet_is_local_reserved_port(struct net *net, unsigned short port)
@@ -335,8 +335,8 @@
335335 return false;
336336 }
337337
338---- linux-5.10-rc1.orig/init/init_task.c
339-+++ linux-5.10-rc1/init/init_task.c
338+--- linux-5.10-rc2.orig/init/init_task.c
339++++ linux-5.10-rc2/init/init_task.c
340340 @@ -212,6 +212,10 @@ struct task_struct init_task
341341 #ifdef CONFIG_SECCOMP
342342 .seccomp = { .filter_count = ATOMIC_INIT(0) },
@@ -348,8 +348,8 @@
348348 };
349349 EXPORT_SYMBOL(init_task);
350350
351---- linux-5.10-rc1.orig/kernel/kexec.c
352-+++ linux-5.10-rc1/kernel/kexec.c
351+--- linux-5.10-rc2.orig/kernel/kexec.c
352++++ linux-5.10-rc2/kernel/kexec.c
353353 @@ -16,7 +16,7 @@
354354 #include <linux/syscalls.h>
355355 #include <linux/vmalloc.h>
@@ -368,8 +368,8 @@
368368
369369 /* Permit LSMs and IMA to fail the kexec */
370370 result = security_kernel_load_data(LOADING_KEXEC_IMAGE, false);
371---- linux-5.10-rc1.orig/kernel/module.c
372-+++ linux-5.10-rc1/kernel/module.c
371+--- linux-5.10-rc2.orig/kernel/module.c
372++++ linux-5.10-rc2/kernel/module.c
373373 @@ -59,6 +59,7 @@
374374 #include <linux/audit.h>
375375 #include <uapi/linux/module.h>
@@ -396,8 +396,8 @@
396396
397397 return 0;
398398 }
399---- linux-5.10-rc1.orig/kernel/ptrace.c
400-+++ linux-5.10-rc1/kernel/ptrace.c
399+--- linux-5.10-rc2.orig/kernel/ptrace.c
400++++ linux-5.10-rc2/kernel/ptrace.c
401401 @@ -1244,6 +1244,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
402402 {
403403 struct task_struct *child;
@@ -422,8 +422,8 @@
422422
423423 if (request == PTRACE_TRACEME) {
424424 ret = ptrace_traceme();
425---- linux-5.10-rc1.orig/kernel/reboot.c
426-+++ linux-5.10-rc1/kernel/reboot.c
425+--- linux-5.10-rc2.orig/kernel/reboot.c
426++++ linux-5.10-rc2/kernel/reboot.c
427427 @@ -17,6 +17,7 @@
428428 #include <linux/syscalls.h>
429429 #include <linux/syscore_ops.h>
@@ -441,8 +441,8 @@
441441
442442 /*
443443 * If pid namespaces are enabled and the current task is in a child
444---- linux-5.10-rc1.orig/kernel/sched/core.c
445-+++ linux-5.10-rc1/kernel/sched/core.c
444+--- linux-5.10-rc2.orig/kernel/sched/core.c
445++++ linux-5.10-rc2/kernel/sched/core.c
446446 @@ -5029,6 +5029,8 @@ int can_nice(const struct task_struct *p
447447 SYSCALL_DEFINE1(nice, int, increment)
448448 {
@@ -452,8 +452,8 @@
452452
453453 /*
454454 * Setpriority might change our priority at the same moment.
455---- linux-5.10-rc1.orig/kernel/signal.c
456-+++ linux-5.10-rc1/kernel/signal.c
455+--- linux-5.10-rc2.orig/kernel/signal.c
456++++ linux-5.10-rc2/kernel/signal.c
457457 @@ -3657,6 +3657,8 @@ static inline void prepare_kill_siginfo(
458458 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
459459 {
@@ -521,8 +521,8 @@
521521
522522 return do_send_specific(tgid, pid, sig, info);
523523 }
524---- linux-5.10-rc1.orig/kernel/sys.c
525-+++ linux-5.10-rc1/kernel/sys.c
524+--- linux-5.10-rc2.orig/kernel/sys.c
525++++ linux-5.10-rc2/kernel/sys.c
526526 @@ -205,6 +205,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
527527
528528 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -552,8 +552,8 @@
552552
553553 errno = -EFAULT;
554554 if (!copy_from_user(tmp, name, len)) {
555---- linux-5.10-rc1.orig/kernel/time/timekeeping.c
556-+++ linux-5.10-rc1/kernel/time/timekeeping.c
555+--- linux-5.10-rc2.orig/kernel/time/timekeeping.c
556++++ linux-5.10-rc2/kernel/time/timekeeping.c
557557 @@ -22,6 +22,7 @@
558558 #include <linux/pvclock_gtod.h>
559559 #include <linux/compiler.h>
@@ -587,8 +587,8 @@
587587
588588 /*
589589 * Validate if a timespec/timeval used to inject a time
590---- linux-5.10-rc1.orig/net/ipv4/raw.c
591-+++ linux-5.10-rc1/net/ipv4/raw.c
590+--- linux-5.10-rc2.orig/net/ipv4/raw.c
591++++ linux-5.10-rc2/net/ipv4/raw.c
592592 @@ -768,6 +768,10 @@ static int raw_recvmsg(struct sock *sk,
593593 skb = skb_recv_datagram(sk, flags, noblock, &err);
594594 if (!skb)
@@ -600,8 +600,8 @@
600600
601601 copied = skb->len;
602602 if (len < copied) {
603---- linux-5.10-rc1.orig/net/ipv4/udp.c
604-+++ linux-5.10-rc1/net/ipv4/udp.c
603+--- linux-5.10-rc2.orig/net/ipv4/udp.c
604++++ linux-5.10-rc2/net/ipv4/udp.c
605605 @@ -1801,6 +1801,8 @@ try_again:
606606 skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
607607 if (!skb)
@@ -611,8 +611,8 @@
611611
612612 ulen = udp_skb_len(skb);
613613 copied = len;
614---- linux-5.10-rc1.orig/net/ipv6/raw.c
615-+++ linux-5.10-rc1/net/ipv6/raw.c
614+--- linux-5.10-rc2.orig/net/ipv6/raw.c
615++++ linux-5.10-rc2/net/ipv6/raw.c
616616 @@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk
617617 skb = skb_recv_datagram(sk, flags, noblock, &err);
618618 if (!skb)
@@ -624,8 +624,8 @@
624624
625625 copied = skb->len;
626626 if (copied > len) {
627---- linux-5.10-rc1.orig/net/ipv6/udp.c
628-+++ linux-5.10-rc1/net/ipv6/udp.c
627+--- linux-5.10-rc2.orig/net/ipv6/udp.c
628++++ linux-5.10-rc2/net/ipv6/udp.c
629629 @@ -343,6 +343,8 @@ try_again:
630630 skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
631631 if (!skb)
@@ -635,8 +635,8 @@
635635
636636 ulen = udp6_skb_len(skb);
637637 copied = len;
638---- linux-5.10-rc1.orig/net/socket.c
639-+++ linux-5.10-rc1/net/socket.c
638+--- linux-5.10-rc2.orig/net/socket.c
639++++ linux-5.10-rc2/net/socket.c
640640 @@ -1755,6 +1755,10 @@ int __sys_accept4_file(struct file *file
641641 if (err < 0)
642642 goto out_fd;
@@ -648,8 +648,8 @@
648648 if (upeer_sockaddr) {
649649 len = newsock->ops->getname(newsock,
650650 (struct sockaddr *)&address, 2);
651---- linux-5.10-rc1.orig/net/unix/af_unix.c
652-+++ linux-5.10-rc1/net/unix/af_unix.c
651+--- linux-5.10-rc2.orig/net/unix/af_unix.c
652++++ linux-5.10-rc2/net/unix/af_unix.c
653653 @@ -2127,6 +2127,10 @@ static int unix_dgram_recvmsg(struct soc
654654 EPOLLOUT | EPOLLWRNORM |
655655 EPOLLWRBAND);
@@ -669,8 +669,8 @@
669669 mutex_unlock(&u->iolock);
670670 out:
671671 return err;
672---- linux-5.10-rc1.orig/security/Kconfig
673-+++ linux-5.10-rc1/security/Kconfig
672+--- linux-5.10-rc2.orig/security/Kconfig
673++++ linux-5.10-rc2/security/Kconfig
674674 @@ -291,5 +291,7 @@ config LSM
675675
676676 source "security/Kconfig.hardening"
@@ -679,8 +679,8 @@
679679 +
680680 endmenu
681681
682---- linux-5.10-rc1.orig/security/Makefile
683-+++ linux-5.10-rc1/security/Makefile
682+--- linux-5.10-rc2.orig/security/Makefile
683++++ linux-5.10-rc2/security/Makefile
684684 @@ -36,3 +36,6 @@ obj-$(CONFIG_BPF_LSM) += bpf/
685685 # Object integrity file lists
686686 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -688,8 +688,8 @@
688688 +
689689 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
690690 +obj-$(CONFIG_CCSECURITY) += ccsecurity/
691---- linux-5.10-rc1.orig/security/security.c
692-+++ linux-5.10-rc1/security/security.c
691+--- linux-5.10-rc2.orig/security/security.c
692++++ linux-5.10-rc2/security/security.c
693693 @@ -1585,7 +1585,9 @@ int security_task_alloc(struct task_stru
694694
695695 if (rc)
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-5.4.diff (revision 6837)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-5.4.diff (revision 6838)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 5.4.72.
1+This is TOMOYO Linux patch for kernel 5.4.74.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.72.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.74.tar.xz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,8 +28,8 @@
2828 security/security.c | 5 ++-
2929 24 files changed, 160 insertions(+), 30 deletions(-)
3030
31---- linux-5.4.72.orig/fs/exec.c
32-+++ linux-5.4.72/fs/exec.c
31+--- linux-5.4.74.orig/fs/exec.c
32++++ linux-5.4.74/fs/exec.c
3333 @@ -1717,7 +1717,7 @@ static int exec_binprm(struct linux_binp
3434 old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
3535 rcu_read_unlock();
@@ -39,8 +39,8 @@
3939 if (ret >= 0) {
4040 audit_bprm(bprm);
4141 trace_sched_process_exec(current, old_pid, bprm);
42---- linux-5.4.72.orig/fs/open.c
43-+++ linux-5.4.72/fs/open.c
42+--- linux-5.4.74.orig/fs/open.c
43++++ linux-5.4.74/fs/open.c
4444 @@ -1205,6 +1205,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd)
4545 */
4646 SYSCALL_DEFINE0(vhangup)
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-5.4.72.orig/fs/proc/version.c
54-+++ linux-5.4.72/fs/proc/version.c
53+--- linux-5.4.74.orig/fs/proc/version.c
54++++ linux-5.4.74/fs/proc/version.c
5555 @@ -21,3 +21,10 @@ static int __init proc_version_init(void
5656 return 0;
5757 }
@@ -59,12 +59,12 @@
5959 +
6060 +static int __init ccs_show_version(void)
6161 +{
62-+ printk(KERN_INFO "Hook version: 5.4.72 2020/10/24\n");
62++ printk(KERN_INFO "Hook version: 5.4.74 2020/11/03\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-5.4.72.orig/include/linux/sched.h
67-+++ linux-5.4.72/include/linux/sched.h
66+--- linux-5.4.74.orig/include/linux/sched.h
67++++ linux-5.4.74/include/linux/sched.h
6868 @@ -38,6 +38,7 @@ struct backing_dev_info;
6969 struct bio_list;
7070 struct blk_plug;
@@ -84,8 +84,8 @@
8484
8585 #ifdef CONFIG_GCC_PLUGIN_STACKLEAK
8686 unsigned long lowest_stack;
87---- linux-5.4.72.orig/include/linux/security.h
88-+++ linux-5.4.72/include/linux/security.h
87+--- linux-5.4.74.orig/include/linux/security.h
88++++ linux-5.4.74/include/linux/security.h
8989 @@ -57,6 +57,7 @@ struct mm_struct;
9090 struct fs_context;
9191 struct fs_parameter;
@@ -315,8 +315,8 @@
315315 }
316316 #endif /* CONFIG_SECURITY_PATH */
317317
318---- linux-5.4.72.orig/include/net/ip.h
319-+++ linux-5.4.72/include/net/ip.h
318+--- linux-5.4.74.orig/include/net/ip.h
319++++ linux-5.4.74/include/net/ip.h
320320 @@ -341,6 +341,8 @@ void inet_get_local_port_range(struct ne
321321 #ifdef CONFIG_SYSCTL
322322 static inline int inet_is_local_reserved_port(struct net *net, int port)
@@ -335,8 +335,8 @@
335335 return 0;
336336 }
337337
338---- linux-5.4.72.orig/init/init_task.c
339-+++ linux-5.4.72/init/init_task.c
338+--- linux-5.4.74.orig/init/init_task.c
339++++ linux-5.4.74/init/init_task.c
340340 @@ -182,6 +182,10 @@ struct task_struct init_task
341341 #ifdef CONFIG_SECURITY
342342 .security = NULL,
@@ -348,8 +348,8 @@
348348 };
349349 EXPORT_SYMBOL(init_task);
350350
351---- linux-5.4.72.orig/kernel/kexec.c
352-+++ linux-5.4.72/kernel/kexec.c
351+--- linux-5.4.74.orig/kernel/kexec.c
352++++ linux-5.4.74/kernel/kexec.c
353353 @@ -16,7 +16,7 @@
354354 #include <linux/syscalls.h>
355355 #include <linux/vmalloc.h>
@@ -368,8 +368,8 @@
368368
369369 /* Permit LSMs and IMA to fail the kexec */
370370 result = security_kernel_load_data(LOADING_KEXEC_IMAGE);
371---- linux-5.4.72.orig/kernel/module.c
372-+++ linux-5.4.72/kernel/module.c
371+--- linux-5.4.74.orig/kernel/module.c
372++++ linux-5.4.74/kernel/module.c
373373 @@ -55,6 +55,7 @@
374374 #include <linux/audit.h>
375375 #include <uapi/linux/module.h>
@@ -378,7 +378,7 @@
378378
379379 #define CREATE_TRACE_POINTS
380380 #include <trace/events/module.h>
381-@@ -976,6 +977,8 @@ SYSCALL_DEFINE2(delete_module, const cha
381+@@ -977,6 +978,8 @@ SYSCALL_DEFINE2(delete_module, const cha
382382
383383 if (!capable(CAP_SYS_MODULE) || modules_disabled)
384384 return -EPERM;
@@ -387,7 +387,7 @@
387387
388388 if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0)
389389 return -EFAULT;
390-@@ -3694,6 +3697,8 @@ static int may_init_module(void)
390+@@ -3687,6 +3690,8 @@ static int may_init_module(void)
391391 {
392392 if (!capable(CAP_SYS_MODULE) || modules_disabled)
393393 return -EPERM;
@@ -396,8 +396,8 @@
396396
397397 return 0;
398398 }
399---- linux-5.4.72.orig/kernel/ptrace.c
400-+++ linux-5.4.72/kernel/ptrace.c
399+--- linux-5.4.74.orig/kernel/ptrace.c
400++++ linux-5.4.74/kernel/ptrace.c
401401 @@ -1244,6 +1244,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
402402 {
403403 struct task_struct *child;
@@ -422,8 +422,8 @@
422422
423423 if (request == PTRACE_TRACEME) {
424424 ret = ptrace_traceme();
425---- linux-5.4.72.orig/kernel/reboot.c
426-+++ linux-5.4.72/kernel/reboot.c
425+--- linux-5.4.74.orig/kernel/reboot.c
426++++ linux-5.4.74/kernel/reboot.c
427427 @@ -17,6 +17,7 @@
428428 #include <linux/syscalls.h>
429429 #include <linux/syscore_ops.h>
@@ -441,8 +441,8 @@
441441
442442 /*
443443 * If pid namespaces are enabled and the current task is in a child
444---- linux-5.4.72.orig/kernel/sched/core.c
445-+++ linux-5.4.72/kernel/sched/core.c
444+--- linux-5.4.74.orig/kernel/sched/core.c
445++++ linux-5.4.74/kernel/sched/core.c
446446 @@ -4663,6 +4663,8 @@ int can_nice(const struct task_struct *p
447447 SYSCALL_DEFINE1(nice, int, increment)
448448 {
@@ -452,8 +452,8 @@
452452
453453 /*
454454 * Setpriority might change our priority at the same moment.
455---- linux-5.4.72.orig/kernel/signal.c
456-+++ linux-5.4.72/kernel/signal.c
455+--- linux-5.4.74.orig/kernel/signal.c
456++++ linux-5.4.74/kernel/signal.c
457457 @@ -3643,6 +3643,8 @@ static inline void prepare_kill_siginfo(
458458 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
459459 {
@@ -521,8 +521,8 @@
521521
522522 return do_send_specific(tgid, pid, sig, info);
523523 }
524---- linux-5.4.72.orig/kernel/sys.c
525-+++ linux-5.4.72/kernel/sys.c
524+--- linux-5.4.74.orig/kernel/sys.c
525++++ linux-5.4.74/kernel/sys.c
526526 @@ -204,6 +204,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
527527
528528 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -552,8 +552,8 @@
552552
553553 errno = -EFAULT;
554554 if (!copy_from_user(tmp, name, len)) {
555---- linux-5.4.72.orig/kernel/time/timekeeping.c
556-+++ linux-5.4.72/kernel/time/timekeeping.c
555+--- linux-5.4.74.orig/kernel/time/timekeeping.c
556++++ linux-5.4.74/kernel/time/timekeeping.c
557557 @@ -22,6 +22,7 @@
558558 #include <linux/pvclock_gtod.h>
559559 #include <linux/compiler.h>
@@ -587,8 +587,8 @@
587587
588588 /*
589589 * Validate if a timespec/timeval used to inject a time
590---- linux-5.4.72.orig/net/ipv4/raw.c
591-+++ linux-5.4.72/net/ipv4/raw.c
590+--- linux-5.4.74.orig/net/ipv4/raw.c
591++++ linux-5.4.74/net/ipv4/raw.c
592592 @@ -767,6 +767,10 @@ static int raw_recvmsg(struct sock *sk,
593593 skb = skb_recv_datagram(sk, flags, noblock, &err);
594594 if (!skb)
@@ -600,8 +600,8 @@
600600
601601 copied = skb->len;
602602 if (len < copied) {
603---- linux-5.4.72.orig/net/ipv4/udp.c
604-+++ linux-5.4.72/net/ipv4/udp.c
603+--- linux-5.4.74.orig/net/ipv4/udp.c
604++++ linux-5.4.74/net/ipv4/udp.c
605605 @@ -1744,6 +1744,8 @@ try_again:
606606 skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
607607 if (!skb)
@@ -611,8 +611,8 @@
611611
612612 ulen = udp_skb_len(skb);
613613 copied = len;
614---- linux-5.4.72.orig/net/ipv6/raw.c
615-+++ linux-5.4.72/net/ipv6/raw.c
614+--- linux-5.4.74.orig/net/ipv6/raw.c
615++++ linux-5.4.74/net/ipv6/raw.c
616616 @@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk
617617 skb = skb_recv_datagram(sk, flags, noblock, &err);
618618 if (!skb)
@@ -624,8 +624,8 @@
624624
625625 copied = skb->len;
626626 if (copied > len) {
627---- linux-5.4.72.orig/net/ipv6/udp.c
628-+++ linux-5.4.72/net/ipv6/udp.c
627+--- linux-5.4.74.orig/net/ipv6/udp.c
628++++ linux-5.4.74/net/ipv6/udp.c
629629 @@ -291,6 +291,8 @@ try_again:
630630 skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
631631 if (!skb)
@@ -635,8 +635,8 @@
635635
636636 ulen = udp6_skb_len(skb);
637637 copied = len;
638---- linux-5.4.72.orig/net/socket.c
639-+++ linux-5.4.72/net/socket.c
638+--- linux-5.4.74.orig/net/socket.c
639++++ linux-5.4.74/net/socket.c
640640 @@ -1755,6 +1755,10 @@ int __sys_accept4(int fd, struct sockadd
641641 if (err < 0)
642642 goto out_fd;
@@ -648,8 +648,8 @@
648648 if (upeer_sockaddr) {
649649 len = newsock->ops->getname(newsock,
650650 (struct sockaddr *)&address, 2);
651---- linux-5.4.72.orig/net/unix/af_unix.c
652-+++ linux-5.4.72/net/unix/af_unix.c
651+--- linux-5.4.74.orig/net/unix/af_unix.c
652++++ linux-5.4.74/net/unix/af_unix.c
653653 @@ -2094,6 +2094,10 @@ static int unix_dgram_recvmsg(struct soc
654654 EPOLLOUT | EPOLLWRNORM |
655655 EPOLLWRBAND);
@@ -669,8 +669,8 @@
669669 mutex_unlock(&u->iolock);
670670 out:
671671 return err;
672---- linux-5.4.72.orig/security/Kconfig
673-+++ linux-5.4.72/security/Kconfig
672+--- linux-5.4.74.orig/security/Kconfig
673++++ linux-5.4.74/security/Kconfig
674674 @@ -291,5 +291,7 @@ config LSM
675675
676676 source "security/Kconfig.hardening"
@@ -679,8 +679,8 @@
679679 +
680680 endmenu
681681
682---- linux-5.4.72.orig/security/Makefile
683-+++ linux-5.4.72/security/Makefile
682+--- linux-5.4.74.orig/security/Makefile
683++++ linux-5.4.74/security/Makefile
684684 @@ -34,3 +34,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
685685 # Object integrity file lists
686686 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -688,8 +688,8 @@
688688 +
689689 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
690690 +obj-$(CONFIG_CCSECURITY) += ccsecurity/
691---- linux-5.4.72.orig/security/security.c
692-+++ linux-5.4.72/security/security.c
691+--- linux-5.4.74.orig/security/security.c
692++++ linux-5.4.74/security/security.c
693693 @@ -1507,7 +1507,9 @@ int security_task_alloc(struct task_stru
694694
695695 if (rc)
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-5.8.diff (revision 6837)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-5.8.diff (revision 6838)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 5.8.16.
1+This is TOMOYO Linux patch for kernel 5.8.18.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.16.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.18.tar.xz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,9 +28,9 @@
2828 security/security.c | 5 ++-
2929 24 files changed, 160 insertions(+), 30 deletions(-)
3030
31---- linux-5.8.16.orig/fs/exec.c
32-+++ linux-5.8.16/fs/exec.c
33-@@ -1923,7 +1923,7 @@ static int __do_execve_file(int fd, stru
31+--- linux-5.8.18.orig/fs/exec.c
32++++ linux-5.8.18/fs/exec.c
33+@@ -1929,7 +1929,7 @@ static int __do_execve_file(int fd, stru
3434 if (retval < 0)
3535 goto out;
3636
@@ -39,8 +39,8 @@
3939 if (retval < 0)
4040 goto out;
4141
42---- linux-5.8.16.orig/fs/open.c
43-+++ linux-5.8.16/fs/open.c
42+--- linux-5.8.18.orig/fs/open.c
43++++ linux-5.8.18/fs/open.c
4444 @@ -1316,6 +1316,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd)
4545 */
4646 SYSCALL_DEFINE0(vhangup)
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-5.8.16.orig/fs/proc/version.c
54-+++ linux-5.8.16/fs/proc/version.c
53+--- linux-5.8.18.orig/fs/proc/version.c
54++++ linux-5.8.18/fs/proc/version.c
5555 @@ -21,3 +21,10 @@ static int __init proc_version_init(void
5656 return 0;
5757 }
@@ -59,12 +59,12 @@
5959 +
6060 +static int __init ccs_show_version(void)
6161 +{
62-+ printk(KERN_INFO "Hook version: 5.8.16 2020/10/24\n");
62++ printk(KERN_INFO "Hook version: 5.8.18 2020/11/03\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-5.8.16.orig/include/linux/sched.h
67-+++ linux-5.8.16/include/linux/sched.h
66+--- linux-5.8.18.orig/include/linux/sched.h
67++++ linux-5.8.18/include/linux/sched.h
6868 @@ -39,6 +39,7 @@ struct backing_dev_info;
6969 struct bio_list;
7070 struct blk_plug;
@@ -73,7 +73,7 @@
7373 struct cfs_rq;
7474 struct fs_struct;
7575 struct futex_pi_state;
76-@@ -1295,6 +1296,10 @@ struct task_struct {
76+@@ -1300,6 +1301,10 @@ struct task_struct {
7777 /* Used by LSM modules for access restriction: */
7878 void *security;
7979 #endif
@@ -84,8 +84,8 @@
8484
8585 #ifdef CONFIG_GCC_PLUGIN_STACKLEAK
8686 unsigned long lowest_stack;
87---- linux-5.8.16.orig/include/linux/security.h
88-+++ linux-5.8.16/include/linux/security.h
87+--- linux-5.8.18.orig/include/linux/security.h
88++++ linux-5.8.18/include/linux/security.h
8989 @@ -58,6 +58,7 @@ struct fs_parameter;
9090 enum fs_value_type;
9191 struct watch;
@@ -315,8 +315,8 @@
315315 }
316316 #endif /* CONFIG_SECURITY_PATH */
317317
318---- linux-5.8.16.orig/include/net/ip.h
319-+++ linux-5.8.16/include/net/ip.h
318+--- linux-5.8.18.orig/include/net/ip.h
319++++ linux-5.8.18/include/net/ip.h
320320 @@ -341,6 +341,8 @@ void inet_get_local_port_range(struct ne
321321 #ifdef CONFIG_SYSCTL
322322 static inline bool inet_is_local_reserved_port(struct net *net, unsigned short port)
@@ -335,9 +335,9 @@
335335 return false;
336336 }
337337
338---- linux-5.8.16.orig/init/init_task.c
339-+++ linux-5.8.16/init/init_task.c
340-@@ -204,6 +204,10 @@ struct task_struct init_task
338+--- linux-5.8.18.orig/init/init_task.c
339++++ linux-5.8.18/init/init_task.c
340+@@ -207,6 +207,10 @@ struct task_struct init_task
341341 #ifdef CONFIG_SECURITY
342342 .security = NULL,
343343 #endif
@@ -348,8 +348,8 @@
348348 };
349349 EXPORT_SYMBOL(init_task);
350350
351---- linux-5.8.16.orig/kernel/kexec.c
352-+++ linux-5.8.16/kernel/kexec.c
351+--- linux-5.8.18.orig/kernel/kexec.c
352++++ linux-5.8.18/kernel/kexec.c
353353 @@ -16,7 +16,7 @@
354354 #include <linux/syscalls.h>
355355 #include <linux/vmalloc.h>
@@ -368,8 +368,8 @@
368368
369369 /* Permit LSMs and IMA to fail the kexec */
370370 result = security_kernel_load_data(LOADING_KEXEC_IMAGE);
371---- linux-5.8.16.orig/kernel/module.c
372-+++ linux-5.8.16/kernel/module.c
371+--- linux-5.8.18.orig/kernel/module.c
372++++ linux-5.8.18/kernel/module.c
373373 @@ -58,6 +58,7 @@
374374 #include <linux/audit.h>
375375 #include <uapi/linux/module.h>
@@ -378,7 +378,7 @@
378378
379379 #define CREATE_TRACE_POINTS
380380 #include <trace/events/module.h>
381-@@ -979,6 +980,8 @@ SYSCALL_DEFINE2(delete_module, const cha
381+@@ -980,6 +981,8 @@ SYSCALL_DEFINE2(delete_module, const cha
382382
383383 if (!capable(CAP_SYS_MODULE) || modules_disabled)
384384 return -EPERM;
@@ -387,7 +387,7 @@
387387
388388 if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0)
389389 return -EFAULT;
390-@@ -3682,6 +3685,8 @@ static int may_init_module(void)
390+@@ -3675,6 +3678,8 @@ static int may_init_module(void)
391391 {
392392 if (!capable(CAP_SYS_MODULE) || modules_disabled)
393393 return -EPERM;
@@ -396,8 +396,8 @@
396396
397397 return 0;
398398 }
399---- linux-5.8.16.orig/kernel/ptrace.c
400-+++ linux-5.8.16/kernel/ptrace.c
399+--- linux-5.8.18.orig/kernel/ptrace.c
400++++ linux-5.8.18/kernel/ptrace.c
401401 @@ -1244,6 +1244,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
402402 {
403403 struct task_struct *child;
@@ -422,8 +422,8 @@
422422
423423 if (request == PTRACE_TRACEME) {
424424 ret = ptrace_traceme();
425---- linux-5.8.16.orig/kernel/reboot.c
426-+++ linux-5.8.16/kernel/reboot.c
425+--- linux-5.8.18.orig/kernel/reboot.c
426++++ linux-5.8.18/kernel/reboot.c
427427 @@ -17,6 +17,7 @@
428428 #include <linux/syscalls.h>
429429 #include <linux/syscore_ops.h>
@@ -441,8 +441,8 @@
441441
442442 /*
443443 * If pid namespaces are enabled and the current task is in a child
444---- linux-5.8.16.orig/kernel/sched/core.c
445-+++ linux-5.8.16/kernel/sched/core.c
444+--- linux-5.8.18.orig/kernel/sched/core.c
445++++ linux-5.8.18/kernel/sched/core.c
446446 @@ -4810,6 +4810,8 @@ int can_nice(const struct task_struct *p
447447 SYSCALL_DEFINE1(nice, int, increment)
448448 {
@@ -452,8 +452,8 @@
452452
453453 /*
454454 * Setpriority might change our priority at the same moment.
455---- linux-5.8.16.orig/kernel/signal.c
456-+++ linux-5.8.16/kernel/signal.c
455+--- linux-5.8.18.orig/kernel/signal.c
456++++ linux-5.8.18/kernel/signal.c
457457 @@ -3657,6 +3657,8 @@ static inline void prepare_kill_siginfo(
458458 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
459459 {
@@ -521,8 +521,8 @@
521521
522522 return do_send_specific(tgid, pid, sig, info);
523523 }
524---- linux-5.8.16.orig/kernel/sys.c
525-+++ linux-5.8.16/kernel/sys.c
524+--- linux-5.8.18.orig/kernel/sys.c
525++++ linux-5.8.18/kernel/sys.c
526526 @@ -205,6 +205,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
527527
528528 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -552,8 +552,8 @@
552552
553553 errno = -EFAULT;
554554 if (!copy_from_user(tmp, name, len)) {
555---- linux-5.8.16.orig/kernel/time/timekeeping.c
556-+++ linux-5.8.16/kernel/time/timekeeping.c
555+--- linux-5.8.18.orig/kernel/time/timekeeping.c
556++++ linux-5.8.18/kernel/time/timekeeping.c
557557 @@ -22,6 +22,7 @@
558558 #include <linux/pvclock_gtod.h>
559559 #include <linux/compiler.h>
@@ -587,8 +587,8 @@
587587
588588 /*
589589 * Validate if a timespec/timeval used to inject a time
590---- linux-5.8.16.orig/net/ipv4/raw.c
591-+++ linux-5.8.16/net/ipv4/raw.c
590+--- linux-5.8.18.orig/net/ipv4/raw.c
591++++ linux-5.8.18/net/ipv4/raw.c
592592 @@ -767,6 +767,10 @@ static int raw_recvmsg(struct sock *sk,
593593 skb = skb_recv_datagram(sk, flags, noblock, &err);
594594 if (!skb)
@@ -600,8 +600,8 @@
600600
601601 copied = skb->len;
602602 if (len < copied) {
603---- linux-5.8.16.orig/net/ipv4/udp.c
604-+++ linux-5.8.16/net/ipv4/udp.c
603+--- linux-5.8.18.orig/net/ipv4/udp.c
604++++ linux-5.8.18/net/ipv4/udp.c
605605 @@ -1750,6 +1750,8 @@ try_again:
606606 skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
607607 if (!skb)
@@ -611,8 +611,8 @@
611611
612612 ulen = udp_skb_len(skb);
613613 copied = len;
614---- linux-5.8.16.orig/net/ipv6/raw.c
615-+++ linux-5.8.16/net/ipv6/raw.c
614+--- linux-5.8.18.orig/net/ipv6/raw.c
615++++ linux-5.8.18/net/ipv6/raw.c
616616 @@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk
617617 skb = skb_recv_datagram(sk, flags, noblock, &err);
618618 if (!skb)
@@ -624,8 +624,8 @@
624624
625625 copied = skb->len;
626626 if (copied > len) {
627---- linux-5.8.16.orig/net/ipv6/udp.c
628-+++ linux-5.8.16/net/ipv6/udp.c
627+--- linux-5.8.18.orig/net/ipv6/udp.c
628++++ linux-5.8.18/net/ipv6/udp.c
629629 @@ -291,6 +291,8 @@ try_again:
630630 skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
631631 if (!skb)
@@ -635,8 +635,8 @@
635635
636636 ulen = udp6_skb_len(skb);
637637 copied = len;
638---- linux-5.8.16.orig/net/socket.c
639-+++ linux-5.8.16/net/socket.c
638+--- linux-5.8.18.orig/net/socket.c
639++++ linux-5.8.18/net/socket.c
640640 @@ -1756,6 +1756,10 @@ int __sys_accept4_file(struct file *file
641641 if (err < 0)
642642 goto out_fd;
@@ -648,8 +648,8 @@
648648 if (upeer_sockaddr) {
649649 len = newsock->ops->getname(newsock,
650650 (struct sockaddr *)&address, 2);
651---- linux-5.8.16.orig/net/unix/af_unix.c
652-+++ linux-5.8.16/net/unix/af_unix.c
651+--- linux-5.8.18.orig/net/unix/af_unix.c
652++++ linux-5.8.18/net/unix/af_unix.c
653653 @@ -2136,6 +2136,10 @@ static int unix_dgram_recvmsg(struct soc
654654 EPOLLOUT | EPOLLWRNORM |
655655 EPOLLWRBAND);
@@ -669,8 +669,8 @@
669669 mutex_unlock(&u->iolock);
670670 out:
671671 return err;
672---- linux-5.8.16.orig/security/Kconfig
673-+++ linux-5.8.16/security/Kconfig
672+--- linux-5.8.18.orig/security/Kconfig
673++++ linux-5.8.18/security/Kconfig
674674 @@ -291,5 +291,7 @@ config LSM
675675
676676 source "security/Kconfig.hardening"
@@ -679,8 +679,8 @@
679679 +
680680 endmenu
681681
682---- linux-5.8.16.orig/security/Makefile
683-+++ linux-5.8.16/security/Makefile
682+--- linux-5.8.18.orig/security/Makefile
683++++ linux-5.8.18/security/Makefile
684684 @@ -36,3 +36,6 @@ obj-$(CONFIG_BPF_LSM) += bpf/
685685 # Object integrity file lists
686686 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -688,8 +688,8 @@
688688 +
689689 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
690690 +obj-$(CONFIG_CCSECURITY) += ccsecurity/
691---- linux-5.8.16.orig/security/security.c
692-+++ linux-5.8.16/security/security.c
691+--- linux-5.8.18.orig/security/security.c
692++++ linux-5.8.18/security/security.c
693693 @@ -1584,7 +1584,9 @@ int security_task_alloc(struct task_stru
694694
695695 if (rc)
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-5.9.diff (revision 6837)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-5.9.diff (revision 6838)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 5.9.1.
1+This is TOMOYO Linux patch for kernel 5.9.3.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.1.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.3.tar.xz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,9 +28,9 @@
2828 security/security.c | 5 ++-
2929 24 files changed, 160 insertions(+), 30 deletions(-)
3030
31---- linux-5.9.1.orig/fs/exec.c
32-+++ linux-5.9.1/fs/exec.c
33-@@ -1928,7 +1928,7 @@ static int bprm_execve(struct linux_binp
31+--- linux-5.9.3.orig/fs/exec.c
32++++ linux-5.9.3/fs/exec.c
33+@@ -1934,7 +1934,7 @@ static int bprm_execve(struct linux_binp
3434 if (retval)
3535 goto out;
3636
@@ -39,8 +39,8 @@
3939 if (retval < 0)
4040 goto out;
4141
42---- linux-5.9.1.orig/fs/open.c
43-+++ linux-5.9.1/fs/open.c
42+--- linux-5.9.3.orig/fs/open.c
43++++ linux-5.9.3/fs/open.c
4444 @@ -1327,6 +1327,8 @@ SYSCALL_DEFINE3(close_range, unsigned in
4545 */
4646 SYSCALL_DEFINE0(vhangup)
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-5.9.1.orig/fs/proc/version.c
54-+++ linux-5.9.1/fs/proc/version.c
53+--- linux-5.9.3.orig/fs/proc/version.c
54++++ linux-5.9.3/fs/proc/version.c
5555 @@ -21,3 +21,10 @@ static int __init proc_version_init(void
5656 return 0;
5757 }
@@ -59,12 +59,12 @@
5959 +
6060 +static int __init ccs_show_version(void)
6161 +{
62-+ printk(KERN_INFO "Hook version: 5.9.1 2020/10/24\n");
62++ printk(KERN_INFO "Hook version: 5.9.3 2020/11/03\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-5.9.1.orig/include/linux/sched.h
67-+++ linux-5.9.1/include/linux/sched.h
66+--- linux-5.9.3.orig/include/linux/sched.h
67++++ linux-5.9.3/include/linux/sched.h
6868 @@ -41,6 +41,7 @@ struct backing_dev_info;
6969 struct bio_list;
7070 struct blk_plug;
@@ -73,7 +73,7 @@
7373 struct cfs_rq;
7474 struct fs_struct;
7575 struct futex_pi_state;
76-@@ -1301,6 +1302,10 @@ struct task_struct {
76+@@ -1306,6 +1307,10 @@ struct task_struct {
7777 /* Used by LSM modules for access restriction: */
7878 void *security;
7979 #endif
@@ -84,8 +84,8 @@
8484
8585 #ifdef CONFIG_GCC_PLUGIN_STACKLEAK
8686 unsigned long lowest_stack;
87---- linux-5.9.1.orig/include/linux/security.h
88-+++ linux-5.9.1/include/linux/security.h
87+--- linux-5.9.3.orig/include/linux/security.h
88++++ linux-5.9.3/include/linux/security.h
8989 @@ -58,6 +58,7 @@ struct fs_parameter;
9090 enum fs_value_type;
9191 struct watch;
@@ -315,8 +315,8 @@
315315 }
316316 #endif /* CONFIG_SECURITY_PATH */
317317
318---- linux-5.9.1.orig/include/net/ip.h
319-+++ linux-5.9.1/include/net/ip.h
318+--- linux-5.9.3.orig/include/net/ip.h
319++++ linux-5.9.3/include/net/ip.h
320320 @@ -338,6 +338,8 @@ void inet_get_local_port_range(struct ne
321321 #ifdef CONFIG_SYSCTL
322322 static inline bool inet_is_local_reserved_port(struct net *net, unsigned short port)
@@ -335,9 +335,9 @@
335335 return false;
336336 }
337337
338---- linux-5.9.1.orig/init/init_task.c
339-+++ linux-5.9.1/init/init_task.c
340-@@ -209,6 +209,10 @@ struct task_struct init_task
338+--- linux-5.9.3.orig/init/init_task.c
339++++ linux-5.9.3/init/init_task.c
340+@@ -212,6 +212,10 @@ struct task_struct init_task
341341 #ifdef CONFIG_SECCOMP
342342 .seccomp = { .filter_count = ATOMIC_INIT(0) },
343343 #endif
@@ -348,8 +348,8 @@
348348 };
349349 EXPORT_SYMBOL(init_task);
350350
351---- linux-5.9.1.orig/kernel/kexec.c
352-+++ linux-5.9.1/kernel/kexec.c
351+--- linux-5.9.3.orig/kernel/kexec.c
352++++ linux-5.9.3/kernel/kexec.c
353353 @@ -16,7 +16,7 @@
354354 #include <linux/syscalls.h>
355355 #include <linux/vmalloc.h>
@@ -368,8 +368,8 @@
368368
369369 /* Permit LSMs and IMA to fail the kexec */
370370 result = security_kernel_load_data(LOADING_KEXEC_IMAGE);
371---- linux-5.9.1.orig/kernel/module.c
372-+++ linux-5.9.1/kernel/module.c
371+--- linux-5.9.3.orig/kernel/module.c
372++++ linux-5.9.3/kernel/module.c
373373 @@ -58,6 +58,7 @@
374374 #include <linux/audit.h>
375375 #include <uapi/linux/module.h>
@@ -378,7 +378,7 @@
378378
379379 #define CREATE_TRACE_POINTS
380380 #include <trace/events/module.h>
381-@@ -981,6 +982,8 @@ SYSCALL_DEFINE2(delete_module, const cha
381+@@ -982,6 +983,8 @@ SYSCALL_DEFINE2(delete_module, const cha
382382
383383 if (!capable(CAP_SYS_MODULE) || modules_disabled)
384384 return -EPERM;
@@ -387,7 +387,7 @@
387387
388388 if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0)
389389 return -EFAULT;
390-@@ -3710,6 +3713,8 @@ static int may_init_module(void)
390+@@ -3703,6 +3706,8 @@ static int may_init_module(void)
391391 {
392392 if (!capable(CAP_SYS_MODULE) || modules_disabled)
393393 return -EPERM;
@@ -396,8 +396,8 @@
396396
397397 return 0;
398398 }
399---- linux-5.9.1.orig/kernel/ptrace.c
400-+++ linux-5.9.1/kernel/ptrace.c
399+--- linux-5.9.3.orig/kernel/ptrace.c
400++++ linux-5.9.3/kernel/ptrace.c
401401 @@ -1244,6 +1244,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
402402 {
403403 struct task_struct *child;
@@ -422,8 +422,8 @@
422422
423423 if (request == PTRACE_TRACEME) {
424424 ret = ptrace_traceme();
425---- linux-5.9.1.orig/kernel/reboot.c
426-+++ linux-5.9.1/kernel/reboot.c
425+--- linux-5.9.3.orig/kernel/reboot.c
426++++ linux-5.9.3/kernel/reboot.c
427427 @@ -17,6 +17,7 @@
428428 #include <linux/syscalls.h>
429429 #include <linux/syscore_ops.h>
@@ -441,8 +441,8 @@
441441
442442 /*
443443 * If pid namespaces are enabled and the current task is in a child
444---- linux-5.9.1.orig/kernel/sched/core.c
445-+++ linux-5.9.1/kernel/sched/core.c
444+--- linux-5.9.3.orig/kernel/sched/core.c
445++++ linux-5.9.3/kernel/sched/core.c
446446 @@ -5030,6 +5030,8 @@ int can_nice(const struct task_struct *p
447447 SYSCALL_DEFINE1(nice, int, increment)
448448 {
@@ -452,8 +452,8 @@
452452
453453 /*
454454 * Setpriority might change our priority at the same moment.
455---- linux-5.9.1.orig/kernel/signal.c
456-+++ linux-5.9.1/kernel/signal.c
455+--- linux-5.9.3.orig/kernel/signal.c
456++++ linux-5.9.3/kernel/signal.c
457457 @@ -3657,6 +3657,8 @@ static inline void prepare_kill_siginfo(
458458 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
459459 {
@@ -521,8 +521,8 @@
521521
522522 return do_send_specific(tgid, pid, sig, info);
523523 }
524---- linux-5.9.1.orig/kernel/sys.c
525-+++ linux-5.9.1/kernel/sys.c
524+--- linux-5.9.3.orig/kernel/sys.c
525++++ linux-5.9.3/kernel/sys.c
526526 @@ -205,6 +205,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
527527
528528 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -552,8 +552,8 @@
552552
553553 errno = -EFAULT;
554554 if (!copy_from_user(tmp, name, len)) {
555---- linux-5.9.1.orig/kernel/time/timekeeping.c
556-+++ linux-5.9.1/kernel/time/timekeeping.c
555+--- linux-5.9.3.orig/kernel/time/timekeeping.c
556++++ linux-5.9.3/kernel/time/timekeeping.c
557557 @@ -22,6 +22,7 @@
558558 #include <linux/pvclock_gtod.h>
559559 #include <linux/compiler.h>
@@ -587,8 +587,8 @@
587587
588588 /*
589589 * Validate if a timespec/timeval used to inject a time
590---- linux-5.9.1.orig/net/ipv4/raw.c
591-+++ linux-5.9.1/net/ipv4/raw.c
590+--- linux-5.9.3.orig/net/ipv4/raw.c
591++++ linux-5.9.3/net/ipv4/raw.c
592592 @@ -767,6 +767,10 @@ static int raw_recvmsg(struct sock *sk,
593593 skb = skb_recv_datagram(sk, flags, noblock, &err);
594594 if (!skb)
@@ -600,8 +600,8 @@
600600
601601 copied = skb->len;
602602 if (len < copied) {
603---- linux-5.9.1.orig/net/ipv4/udp.c
604-+++ linux-5.9.1/net/ipv4/udp.c
603+--- linux-5.9.3.orig/net/ipv4/udp.c
604++++ linux-5.9.3/net/ipv4/udp.c
605605 @@ -1801,6 +1801,8 @@ try_again:
606606 skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
607607 if (!skb)
@@ -611,8 +611,8 @@
611611
612612 ulen = udp_skb_len(skb);
613613 copied = len;
614---- linux-5.9.1.orig/net/ipv6/raw.c
615-+++ linux-5.9.1/net/ipv6/raw.c
614+--- linux-5.9.3.orig/net/ipv6/raw.c
615++++ linux-5.9.3/net/ipv6/raw.c
616616 @@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk
617617 skb = skb_recv_datagram(sk, flags, noblock, &err);
618618 if (!skb)
@@ -624,8 +624,8 @@
624624
625625 copied = skb->len;
626626 if (copied > len) {
627---- linux-5.9.1.orig/net/ipv6/udp.c
628-+++ linux-5.9.1/net/ipv6/udp.c
627+--- linux-5.9.3.orig/net/ipv6/udp.c
628++++ linux-5.9.3/net/ipv6/udp.c
629629 @@ -343,6 +343,8 @@ try_again:
630630 skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
631631 if (!skb)
@@ -635,8 +635,8 @@
635635
636636 ulen = udp6_skb_len(skb);
637637 copied = len;
638---- linux-5.9.1.orig/net/socket.c
639-+++ linux-5.9.1/net/socket.c
638+--- linux-5.9.3.orig/net/socket.c
639++++ linux-5.9.3/net/socket.c
640640 @@ -1755,6 +1755,10 @@ int __sys_accept4_file(struct file *file
641641 if (err < 0)
642642 goto out_fd;
@@ -648,8 +648,8 @@
648648 if (upeer_sockaddr) {
649649 len = newsock->ops->getname(newsock,
650650 (struct sockaddr *)&address, 2);
651---- linux-5.9.1.orig/net/unix/af_unix.c
652-+++ linux-5.9.1/net/unix/af_unix.c
651+--- linux-5.9.3.orig/net/unix/af_unix.c
652++++ linux-5.9.3/net/unix/af_unix.c
653653 @@ -2130,6 +2130,10 @@ static int unix_dgram_recvmsg(struct soc
654654 EPOLLOUT | EPOLLWRNORM |
655655 EPOLLWRBAND);
@@ -669,8 +669,8 @@
669669 mutex_unlock(&u->iolock);
670670 out:
671671 return err;
672---- linux-5.9.1.orig/security/Kconfig
673-+++ linux-5.9.1/security/Kconfig
672+--- linux-5.9.3.orig/security/Kconfig
673++++ linux-5.9.3/security/Kconfig
674674 @@ -291,5 +291,7 @@ config LSM
675675
676676 source "security/Kconfig.hardening"
@@ -679,8 +679,8 @@
679679 +
680680 endmenu
681681
682---- linux-5.9.1.orig/security/Makefile
683-+++ linux-5.9.1/security/Makefile
682+--- linux-5.9.3.orig/security/Makefile
683++++ linux-5.9.3/security/Makefile
684684 @@ -36,3 +36,6 @@ obj-$(CONFIG_BPF_LSM) += bpf/
685685 # Object integrity file lists
686686 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -688,8 +688,8 @@
688688 +
689689 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
690690 +obj-$(CONFIG_CCSECURITY) += ccsecurity/
691---- linux-5.9.1.orig/security/security.c
692-+++ linux-5.9.1/security/security.c
691+--- linux-5.9.3.orig/security/security.c
692++++ linux-5.9.3/security/security.c
693693 @@ -1584,7 +1584,9 @@ int security_task_alloc(struct task_stru
694694
695695 if (rc)
--- trunk/1.8.x/ccs-patch/specs/build-c7-3.10.sh (revision 6837)
+++ trunk/1.8.x/ccs-patch/specs/build-c7-3.10.sh (revision 6838)
@@ -10,12 +10,12 @@
1010
1111 cd /tmp/ || die "Can't chdir to /tmp/ ."
1212
13-if [ ! -r kernel-3.10.0-1127.19.1.el7.src.rpm ]
13+if [ ! -r kernel-3.10.0-1160.2.2.el7.src.rpm ]
1414 then
15- wget http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-1127.19.1.el7.src.rpm || die "Can't download source package."
15+ wget http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-1160.2.2.el7.src.rpm || die "Can't download source package."
1616 fi
17-LANG=C rpm --checksig kernel-3.10.0-1127.19.1.el7.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature."
18-rpm -ivh kernel-3.10.0-1127.19.1.el7.src.rpm || die "Can't install source package."
17+LANG=C rpm --checksig kernel-3.10.0-1160.2.2.el7.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature."
18+rpm -ivh kernel-3.10.0-1160.2.2.el7.src.rpm || die "Can't install source package."
1919
2020 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
2121 if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ]
@@ -35,9 +35,9 @@
3535 -# % define buildid .local
3636 +%define buildid _tomoyo_1.8.7p2
3737
38- # For a kernel released for public testing, released_kernel should be 1.
39- # For internal testing builds during development, it should be 0.
40-@@ -325,7 +325,7 @@
38+ # If there's no unversioned python, select version explicitly,
39+ # so it's possible to at least do rh-srpm.
40+@@ -331,7 +331,7 @@
4141 AutoProv: yes\
4242 %{nil}
4343
@@ -46,7 +46,7 @@
4646 Group: System Environment/Kernel
4747 License: GPLv2
4848 URL: http://www.kernel.org/
49-@@ -684,13 +684,13 @@
49+@@ -690,13 +690,13 @@
5050 %package %{?1:%{1}-}devel\
5151 Summary: Development package for building kernel modules to match the %{?2:%{2} }kernel\
5252 Group: System Environment/Kernel\
@@ -64,7 +64,7 @@
6464 This package provides kernel headers and makefiles sufficient to build modules\
6565 against the %{?2:%{2} }kernel package.\
6666 %{nil}
67-@@ -802,6 +802,10 @@
67+@@ -808,6 +808,10 @@
6868 ApplyOptionalPatch debrand-rh_taint.patch
6969 ApplyOptionalPatch debrand-rh-i686-cpu.patch
7070
@@ -75,7 +75,7 @@
7575 # Any further pre-build tree manipulations happen here.
7676
7777 chmod +x scripts/checkpatch.pl
78-@@ -840,6 +844,17 @@
78+@@ -846,6 +850,17 @@
7979 for i in *.config
8080 do
8181 mv $i .config
旧リポジトリブラウザで表示