• R/O
  • SSH
  • HTTPS

tomoyo: Commit


Commit MetaInfo

Revisão6858 (tree)
Hora2021-03-01 22:23:24
Autorkumaneko

Mensagem de Log

(mensagem de log vazia)

Mudança Sumário

Diff

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.14.diff (revision 6857)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.14.diff (revision 6858)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.14.221.
1+This is TOMOYO Linux patch for kernel 4.14.222.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.221.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.222.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.221.orig/fs/exec.c
32-+++ linux-4.14.221/fs/exec.c
31+--- linux-4.14.222.orig/fs/exec.c
32++++ linux-4.14.222/fs/exec.c
3333 @@ -1692,7 +1692,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.221.orig/fs/open.c
43-+++ linux-4.14.221/fs/open.c
42+--- linux-4.14.222.orig/fs/open.c
43++++ linux-4.14.222/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.221.orig/fs/proc/version.c
54-+++ linux-4.14.221/fs/proc/version.c
53+--- linux-4.14.222.orig/fs/proc/version.c
54++++ linux-4.14.222/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.221 2021/02/14\n");
62++ printk(KERN_INFO "Hook version: 4.14.222 2021/03/01\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.14.221.orig/include/linux/init_task.h
67-+++ linux-4.14.221/include/linux/init_task.h
66+--- linux-4.14.222.orig/include/linux/init_task.h
67++++ linux-4.14.222/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.221.orig/include/linux/sched.h
92-+++ linux-4.14.221/include/linux/sched.h
91+--- linux-4.14.222.orig/include/linux/sched.h
92++++ linux-4.14.222/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.221.orig/include/linux/security.h
113-+++ linux-4.14.221/include/linux/security.h
112+--- linux-4.14.222.orig/include/linux/security.h
113++++ linux-4.14.222/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.221.orig/include/net/ip.h
335-+++ linux-4.14.221/include/net/ip.h
334+--- linux-4.14.222.orig/include/net/ip.h
335++++ linux-4.14.222/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.221.orig/kernel/kexec.c
355-+++ linux-4.14.221/kernel/kexec.c
354+--- linux-4.14.222.orig/kernel/kexec.c
355++++ linux-4.14.222/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.221.orig/kernel/module.c
375-+++ linux-4.14.221/kernel/module.c
374+--- linux-4.14.222.orig/kernel/module.c
375++++ linux-4.14.222/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.221.orig/kernel/ptrace.c
403-+++ linux-4.14.221/kernel/ptrace.c
402+--- linux-4.14.222.orig/kernel/ptrace.c
403++++ linux-4.14.222/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.221.orig/kernel/reboot.c
429-+++ linux-4.14.221/kernel/reboot.c
428+--- linux-4.14.222.orig/kernel/reboot.c
429++++ linux-4.14.222/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.221.orig/kernel/sched/core.c
448-+++ linux-4.14.221/kernel/sched/core.c
447+--- linux-4.14.222.orig/kernel/sched/core.c
448++++ linux-4.14.222/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.221.orig/kernel/signal.c
459-+++ linux-4.14.221/kernel/signal.c
458+--- linux-4.14.222.orig/kernel/signal.c
459++++ linux-4.14.222/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.221.orig/kernel/sys.c
506-+++ linux-4.14.221/kernel/sys.c
505+--- linux-4.14.222.orig/kernel/sys.c
506++++ linux-4.14.222/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.221.orig/kernel/time/ntp.c
537-+++ linux-4.14.221/kernel/time/ntp.c
536+--- linux-4.14.222.orig/kernel/time/ntp.c
537++++ linux-4.14.222/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.221.orig/net/ipv4/raw.c
572-+++ linux-4.14.221/net/ipv4/raw.c
571+--- linux-4.14.222.orig/net/ipv4/raw.c
572++++ linux-4.14.222/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.221.orig/net/ipv4/udp.c
585-+++ linux-4.14.221/net/ipv4/udp.c
584+--- linux-4.14.222.orig/net/ipv4/udp.c
585++++ linux-4.14.222/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.221.orig/net/ipv6/raw.c
596-+++ linux-4.14.221/net/ipv6/raw.c
595+--- linux-4.14.222.orig/net/ipv6/raw.c
596++++ linux-4.14.222/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.221.orig/net/ipv6/udp.c
609-+++ linux-4.14.221/net/ipv6/udp.c
608+--- linux-4.14.222.orig/net/ipv6/udp.c
609++++ linux-4.14.222/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.221.orig/net/socket.c
620-+++ linux-4.14.221/net/socket.c
619+--- linux-4.14.222.orig/net/socket.c
620++++ linux-4.14.222/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.221.orig/net/unix/af_unix.c
633-+++ linux-4.14.221/net/unix/af_unix.c
632+--- linux-4.14.222.orig/net/unix/af_unix.c
633++++ linux-4.14.222/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.221.orig/security/Kconfig
654-+++ linux-4.14.221/security/Kconfig
653+--- linux-4.14.222.orig/security/Kconfig
654++++ linux-4.14.222/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.221.orig/security/Makefile
664-+++ linux-4.14.221/security/Makefile
663+--- linux-4.14.222.orig/security/Makefile
664++++ linux-4.14.222/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.221.orig/security/security.c
673-+++ linux-4.14.221/security/security.c
672+--- linux-4.14.222.orig/security/security.c
673++++ linux-4.14.222/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 6857)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.19.diff (revision 6858)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.19.176.
1+This is TOMOYO Linux patch for kernel 4.19.177.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.176.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.177.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.176.orig/fs/exec.c
32-+++ linux-4.19.176/fs/exec.c
31+--- linux-4.19.177.orig/fs/exec.c
32++++ linux-4.19.177/fs/exec.c
3333 @@ -1707,7 +1707,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.176.orig/fs/open.c
43-+++ linux-4.19.176/fs/open.c
42+--- linux-4.19.177.orig/fs/open.c
43++++ linux-4.19.177/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.176.orig/fs/proc/version.c
54-+++ linux-4.19.176/fs/proc/version.c
53+--- linux-4.19.177.orig/fs/proc/version.c
54++++ linux-4.19.177/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.176 2021/02/14\n");
62++ printk(KERN_INFO "Hook version: 4.19.177 2021/03/01\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.19.176.orig/include/linux/sched.h
67-+++ linux-4.19.176/include/linux/sched.h
66+--- linux-4.19.177.orig/include/linux/sched.h
67++++ linux-4.19.177/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.176.orig/include/linux/security.h
88-+++ linux-4.19.176/include/linux/security.h
87+--- linux-4.19.177.orig/include/linux/security.h
88++++ linux-4.19.177/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.176.orig/include/net/ip.h
310-+++ linux-4.19.176/include/net/ip.h
309+--- linux-4.19.177.orig/include/net/ip.h
310++++ linux-4.19.177/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.176.orig/init/init_task.c
330-+++ linux-4.19.176/init/init_task.c
329+--- linux-4.19.177.orig/init/init_task.c
330++++ linux-4.19.177/init/init_task.c
331331 @@ -180,6 +180,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.176.orig/kernel/kexec.c
343-+++ linux-4.19.176/kernel/kexec.c
342+--- linux-4.19.177.orig/kernel/kexec.c
343++++ linux-4.19.177/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.176.orig/kernel/module.c
363-+++ linux-4.19.176/kernel/module.c
362+--- linux-4.19.177.orig/kernel/module.c
363++++ linux-4.19.177/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.176.orig/kernel/ptrace.c
391-+++ linux-4.19.176/kernel/ptrace.c
390+--- linux-4.19.177.orig/kernel/ptrace.c
391++++ linux-4.19.177/kernel/ptrace.c
392392 @@ -1136,6 +1136,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.176.orig/kernel/reboot.c
417-+++ linux-4.19.176/kernel/reboot.c
416+--- linux-4.19.177.orig/kernel/reboot.c
417++++ linux-4.19.177/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.176.orig/kernel/sched/core.c
436-+++ linux-4.19.176/kernel/sched/core.c
435+--- linux-4.19.177.orig/kernel/sched/core.c
436++++ linux-4.19.177/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.176.orig/kernel/signal.c
447-+++ linux-4.19.176/kernel/signal.c
446+--- linux-4.19.177.orig/kernel/signal.c
447++++ linux-4.19.177/kernel/signal.c
448448 @@ -3286,6 +3286,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.176.orig/kernel/sys.c
494-+++ linux-4.19.176/kernel/sys.c
493+--- linux-4.19.177.orig/kernel/sys.c
494++++ linux-4.19.177/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.176.orig/kernel/time/timekeeping.c
525-+++ linux-4.19.176/kernel/time/timekeeping.c
524+--- linux-4.19.177.orig/kernel/time/timekeeping.c
525++++ linux-4.19.177/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.176.orig/net/ipv4/raw.c
560-+++ linux-4.19.176/net/ipv4/raw.c
559+--- linux-4.19.177.orig/net/ipv4/raw.c
560++++ linux-4.19.177/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.176.orig/net/ipv4/udp.c
573-+++ linux-4.19.176/net/ipv4/udp.c
572+--- linux-4.19.177.orig/net/ipv4/udp.c
573++++ linux-4.19.177/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.176.orig/net/ipv6/raw.c
584-+++ linux-4.19.176/net/ipv6/raw.c
583+--- linux-4.19.177.orig/net/ipv6/raw.c
584++++ linux-4.19.177/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.176.orig/net/ipv6/udp.c
597-+++ linux-4.19.176/net/ipv6/udp.c
596+--- linux-4.19.177.orig/net/ipv6/udp.c
597++++ linux-4.19.177/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.176.orig/net/socket.c
608-+++ linux-4.19.176/net/socket.c
607+--- linux-4.19.177.orig/net/socket.c
608++++ linux-4.19.177/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.176.orig/net/unix/af_unix.c
621-+++ linux-4.19.176/net/unix/af_unix.c
620+--- linux-4.19.177.orig/net/unix/af_unix.c
621++++ linux-4.19.177/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.176.orig/security/Kconfig
642-+++ linux-4.19.176/security/Kconfig
641+--- linux-4.19.177.orig/security/Kconfig
642++++ linux-4.19.177/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.176.orig/security/Makefile
652-+++ linux-4.19.176/security/Makefile
651+--- linux-4.19.177.orig/security/Makefile
652++++ linux-4.19.177/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.176.orig/security/security.c
661-+++ linux-4.19.176/security/security.c
660+--- linux-4.19.177.orig/security/security.c
661++++ linux-4.19.177/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 6857)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.4.diff (revision 6858)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.4.257.
1+This is TOMOYO Linux patch for kernel 4.4.258.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.257.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.258.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.257.orig/fs/exec.c
32-+++ linux-4.4.257/fs/exec.c
31+--- linux-4.4.258.orig/fs/exec.c
32++++ linux-4.4.258/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.257.orig/fs/open.c
43-+++ linux-4.4.257/fs/open.c
42+--- linux-4.4.258.orig/fs/open.c
43++++ linux-4.4.258/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.257.orig/fs/proc/version.c
54-+++ linux-4.4.257/fs/proc/version.c
53+--- linux-4.4.258.orig/fs/proc/version.c
54++++ linux-4.4.258/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.257 2021/02/14\n");
62++ printk(KERN_INFO "Hook version: 4.4.258 2021/03/01\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.4.257.orig/include/linux/init_task.h
67-+++ linux-4.4.257/include/linux/init_task.h
66+--- linux-4.4.258.orig/include/linux/init_task.h
67++++ linux-4.4.258/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.257.orig/include/linux/sched.h
92-+++ linux-4.4.257/include/linux/sched.h
91+--- linux-4.4.258.orig/include/linux/sched.h
92++++ linux-4.4.258/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.257.orig/include/linux/security.h
114-+++ linux-4.4.257/include/linux/security.h
113+--- linux-4.4.258.orig/include/linux/security.h
114++++ linux-4.4.258/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.257.orig/include/net/ip.h
322-+++ linux-4.4.257/include/net/ip.h
321+--- linux-4.4.258.orig/include/net/ip.h
322++++ linux-4.4.258/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.257.orig/kernel/fork.c
342-+++ linux-4.4.257/kernel/fork.c
341+--- linux-4.4.258.orig/kernel/fork.c
342++++ linux-4.4.258/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.257.orig/kernel/kexec.c
370-+++ linux-4.4.257/kernel/kexec.c
369+--- linux-4.4.258.orig/kernel/kexec.c
370++++ linux-4.4.258/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.257.orig/kernel/module.c
390-+++ linux-4.4.257/kernel/module.c
389+--- linux-4.4.258.orig/kernel/module.c
390++++ linux-4.4.258/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.257.orig/kernel/ptrace.c
418-+++ linux-4.4.257/kernel/ptrace.c
417+--- linux-4.4.258.orig/kernel/ptrace.c
418++++ linux-4.4.258/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.257.orig/kernel/reboot.c
444-+++ linux-4.4.257/kernel/reboot.c
443+--- linux-4.4.258.orig/kernel/reboot.c
444++++ linux-4.4.258/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.257.orig/kernel/sched/core.c
463-+++ linux-4.4.257/kernel/sched/core.c
462+--- linux-4.4.258.orig/kernel/sched/core.c
463++++ linux-4.4.258/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.257.orig/kernel/signal.c
474-+++ linux-4.4.257/kernel/signal.c
473+--- linux-4.4.258.orig/kernel/signal.c
474++++ linux-4.4.258/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.257.orig/kernel/sys.c
521-+++ linux-4.4.257/kernel/sys.c
520+--- linux-4.4.258.orig/kernel/sys.c
521++++ linux-4.4.258/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.257.orig/kernel/time/ntp.c
552-+++ linux-4.4.257/kernel/time/ntp.c
551+--- linux-4.4.258.orig/kernel/time/ntp.c
552++++ linux-4.4.258/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.257.orig/net/ipv4/raw.c
587-+++ linux-4.4.257/net/ipv4/raw.c
586+--- linux-4.4.258.orig/net/ipv4/raw.c
587++++ linux-4.4.258/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.257.orig/net/ipv4/udp.c
600-+++ linux-4.4.257/net/ipv4/udp.c
599+--- linux-4.4.258.orig/net/ipv4/udp.c
600++++ linux-4.4.258/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.257.orig/net/ipv6/raw.c
613-+++ linux-4.4.257/net/ipv6/raw.c
612+--- linux-4.4.258.orig/net/ipv6/raw.c
613++++ linux-4.4.258/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.257.orig/net/ipv6/udp.c
626-+++ linux-4.4.257/net/ipv6/udp.c
625+--- linux-4.4.258.orig/net/ipv6/udp.c
626++++ linux-4.4.258/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.257.orig/net/socket.c
639-+++ linux-4.4.257/net/socket.c
638+--- linux-4.4.258.orig/net/socket.c
639++++ linux-4.4.258/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.257.orig/net/unix/af_unix.c
652-+++ linux-4.4.257/net/unix/af_unix.c
651+--- linux-4.4.258.orig/net/unix/af_unix.c
652++++ linux-4.4.258/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.257.orig/security/Kconfig
665-+++ linux-4.4.257/security/Kconfig
664+--- linux-4.4.258.orig/security/Kconfig
665++++ linux-4.4.258/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.257.orig/security/Makefile
675-+++ linux-4.4.257/security/Makefile
674+--- linux-4.4.258.orig/security/Makefile
675++++ linux-4.4.258/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 6857)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.9.diff (revision 6858)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.9.257.
1+This is TOMOYO Linux patch for kernel 4.9.258.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.257.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.258.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.257.orig/fs/exec.c
32-+++ linux-4.9.257/fs/exec.c
31+--- linux-4.9.258.orig/fs/exec.c
32++++ linux-4.9.258/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.257.orig/fs/open.c
43-+++ linux-4.9.257/fs/open.c
42+--- linux-4.9.258.orig/fs/open.c
43++++ linux-4.9.258/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.257.orig/fs/proc/version.c
54-+++ linux-4.9.257/fs/proc/version.c
53+--- linux-4.9.258.orig/fs/proc/version.c
54++++ linux-4.9.258/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.257 2021/02/14\n");
62++ printk(KERN_INFO "Hook version: 4.9.258 2021/03/01\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.9.257.orig/include/linux/init_task.h
67-+++ linux-4.9.257/include/linux/init_task.h
66+--- linux-4.9.258.orig/include/linux/init_task.h
67++++ linux-4.9.258/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.257.orig/include/linux/sched.h
92-+++ linux-4.9.257/include/linux/sched.h
91+--- linux-4.9.258.orig/include/linux/sched.h
92++++ linux-4.9.258/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.257.orig/include/linux/security.h
114-+++ linux-4.9.257/include/linux/security.h
113+--- linux-4.9.258.orig/include/linux/security.h
114++++ linux-4.9.258/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.257.orig/include/net/ip.h
322-+++ linux-4.9.257/include/net/ip.h
321+--- linux-4.9.258.orig/include/net/ip.h
322++++ linux-4.9.258/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.257.orig/kernel/fork.c
342-+++ linux-4.9.257/kernel/fork.c
341+--- linux-4.9.258.orig/kernel/fork.c
342++++ linux-4.9.258/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.257.orig/kernel/kexec.c
370-+++ linux-4.9.257/kernel/kexec.c
369+--- linux-4.9.258.orig/kernel/kexec.c
370++++ linux-4.9.258/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.257.orig/kernel/module.c
390-+++ linux-4.9.257/kernel/module.c
389+--- linux-4.9.258.orig/kernel/module.c
390++++ linux-4.9.258/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.257.orig/kernel/ptrace.c
418-+++ linux-4.9.257/kernel/ptrace.c
417+--- linux-4.9.258.orig/kernel/ptrace.c
418++++ linux-4.9.258/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.257.orig/kernel/reboot.c
444-+++ linux-4.9.257/kernel/reboot.c
443+--- linux-4.9.258.orig/kernel/reboot.c
444++++ linux-4.9.258/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.257.orig/kernel/sched/core.c
463-+++ linux-4.9.257/kernel/sched/core.c
462+--- linux-4.9.258.orig/kernel/sched/core.c
463++++ linux-4.9.258/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.257.orig/kernel/signal.c
474-+++ linux-4.9.257/kernel/signal.c
473+--- linux-4.9.258.orig/kernel/signal.c
474++++ linux-4.9.258/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.257.orig/kernel/sys.c
521-+++ linux-4.9.257/kernel/sys.c
520+--- linux-4.9.258.orig/kernel/sys.c
521++++ linux-4.9.258/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.257.orig/kernel/time/ntp.c
552-+++ linux-4.9.257/kernel/time/ntp.c
551+--- linux-4.9.258.orig/kernel/time/ntp.c
552++++ linux-4.9.258/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.257.orig/net/ipv4/raw.c
587-+++ linux-4.9.257/net/ipv4/raw.c
586+--- linux-4.9.258.orig/net/ipv4/raw.c
587++++ linux-4.9.258/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.257.orig/net/ipv4/udp.c
600-+++ linux-4.9.257/net/ipv4/udp.c
599+--- linux-4.9.258.orig/net/ipv4/udp.c
600++++ linux-4.9.258/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.257.orig/net/ipv6/raw.c
611-+++ linux-4.9.257/net/ipv6/raw.c
610+--- linux-4.9.258.orig/net/ipv6/raw.c
611++++ linux-4.9.258/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.257.orig/net/ipv6/udp.c
624-+++ linux-4.9.257/net/ipv6/udp.c
623+--- linux-4.9.258.orig/net/ipv6/udp.c
624++++ linux-4.9.258/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.257.orig/net/socket.c
635-+++ linux-4.9.257/net/socket.c
634+--- linux-4.9.258.orig/net/socket.c
635++++ linux-4.9.258/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.257.orig/net/unix/af_unix.c
648-+++ linux-4.9.257/net/unix/af_unix.c
647+--- linux-4.9.258.orig/net/unix/af_unix.c
648++++ linux-4.9.258/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.257.orig/security/Kconfig
669-+++ linux-4.9.257/security/Kconfig
668+--- linux-4.9.258.orig/security/Kconfig
669++++ linux-4.9.258/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.257.orig/security/Makefile
679-+++ linux-4.9.257/security/Makefile
678+--- linux-4.9.258.orig/security/Makefile
679++++ linux-4.9.258/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 6857)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-5.10.diff (revision 6858)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 5.10.17.
1+This is TOMOYO Linux patch for kernel 5.10.19.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.17.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.19.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.10.17.orig/fs/exec.c
32-+++ linux-5.10.17/fs/exec.c
31+--- linux-5.10.19.orig/fs/exec.c
32++++ linux-5.10.19/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.17.orig/fs/open.c
43-+++ linux-5.10.17/fs/open.c
42+--- linux-5.10.19.orig/fs/open.c
43++++ linux-5.10.19/fs/open.c
4444 @@ -1331,6 +1331,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.17.orig/fs/proc/version.c
54-+++ linux-5.10.17/fs/proc/version.c
53+--- linux-5.10.19.orig/fs/proc/version.c
54++++ linux-5.10.19/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.17 2021/02/22\n");
62++ printk(KERN_INFO "Hook version: 5.10.19 2021/03/01\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-5.10.17.orig/include/linux/sched.h
67-+++ linux-5.10.17/include/linux/sched.h
66+--- linux-5.10.19.orig/include/linux/sched.h
67++++ linux-5.10.19/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.17.orig/include/linux/security.h
88-+++ linux-5.10.17/include/linux/security.h
87+--- linux-5.10.19.orig/include/linux/security.h
88++++ linux-5.10.19/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.17.orig/include/net/ip.h
319-+++ linux-5.10.17/include/net/ip.h
318+--- linux-5.10.19.orig/include/net/ip.h
319++++ linux-5.10.19/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.17.orig/init/init_task.c
339-+++ linux-5.10.17/init/init_task.c
338+--- linux-5.10.19.orig/init/init_task.c
339++++ linux-5.10.19/init/init_task.c
340340 @@ -213,6 +213,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.17.orig/kernel/kexec.c
352-+++ linux-5.10.17/kernel/kexec.c
351+--- linux-5.10.19.orig/kernel/kexec.c
352++++ linux-5.10.19/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.17.orig/kernel/module.c
372-+++ linux-5.10.17/kernel/module.c
371+--- linux-5.10.19.orig/kernel/module.c
372++++ linux-5.10.19/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.17.orig/kernel/ptrace.c
400-+++ linux-5.10.17/kernel/ptrace.c
399+--- linux-5.10.19.orig/kernel/ptrace.c
400++++ linux-5.10.19/kernel/ptrace.c
401401 @@ -1238,6 +1238,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.17.orig/kernel/reboot.c
426-+++ linux-5.10.17/kernel/reboot.c
425+--- linux-5.10.19.orig/kernel/reboot.c
426++++ linux-5.10.19/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.17.orig/kernel/sched/core.c
445-+++ linux-5.10.17/kernel/sched/core.c
444+--- linux-5.10.19.orig/kernel/sched/core.c
445++++ linux-5.10.19/kernel/sched/core.c
446446 @@ -5035,6 +5035,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.17.orig/kernel/signal.c
456-+++ linux-5.10.17/kernel/signal.c
455+--- linux-5.10.19.orig/kernel/signal.c
456++++ linux-5.10.19/kernel/signal.c
457457 @@ -3658,6 +3658,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.17.orig/kernel/sys.c
525-+++ linux-5.10.17/kernel/sys.c
524+--- linux-5.10.19.orig/kernel/sys.c
525++++ linux-5.10.19/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.17.orig/kernel/time/timekeeping.c
556-+++ linux-5.10.17/kernel/time/timekeeping.c
555+--- linux-5.10.19.orig/kernel/time/timekeeping.c
556++++ linux-5.10.19/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.17.orig/net/ipv4/raw.c
591-+++ linux-5.10.17/net/ipv4/raw.c
590+--- linux-5.10.19.orig/net/ipv4/raw.c
591++++ linux-5.10.19/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.17.orig/net/ipv4/udp.c
604-+++ linux-5.10.17/net/ipv4/udp.c
603+--- linux-5.10.19.orig/net/ipv4/udp.c
604++++ linux-5.10.19/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.17.orig/net/ipv6/raw.c
615-+++ linux-5.10.17/net/ipv6/raw.c
614+--- linux-5.10.19.orig/net/ipv6/raw.c
615++++ linux-5.10.19/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.17.orig/net/ipv6/udp.c
628-+++ linux-5.10.17/net/ipv6/udp.c
627+--- linux-5.10.19.orig/net/ipv6/udp.c
628++++ linux-5.10.19/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.17.orig/net/socket.c
639-+++ linux-5.10.17/net/socket.c
638+--- linux-5.10.19.orig/net/socket.c
639++++ linux-5.10.19/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.17.orig/net/unix/af_unix.c
652-+++ linux-5.10.17/net/unix/af_unix.c
651+--- linux-5.10.19.orig/net/unix/af_unix.c
652++++ linux-5.10.19/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.17.orig/security/Kconfig
673-+++ linux-5.10.17/security/Kconfig
672+--- linux-5.10.19.orig/security/Kconfig
673++++ linux-5.10.19/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.17.orig/security/Makefile
683-+++ linux-5.10.17/security/Makefile
682+--- linux-5.10.19.orig/security/Makefile
683++++ linux-5.10.19/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.17.orig/security/security.c
692-+++ linux-5.10.17/security/security.c
691+--- linux-5.10.19.orig/security/security.c
692++++ linux-5.10.19/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.11.diff (revision 6857)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-5.11.diff (revision 6858)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 5.11.
1+This is TOMOYO Linux patch for kernel 5.11.2.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.2.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.11.orig/fs/exec.c
32-+++ linux-5.11/fs/exec.c
31+--- linux-5.11.2.orig/fs/exec.c
32++++ linux-5.11.2/fs/exec.c
3333 @@ -1823,7 +1823,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.11.orig/fs/open.c
43-+++ linux-5.11/fs/open.c
42+--- linux-5.11.2.orig/fs/open.c
43++++ linux-5.11.2/fs/open.c
4444 @@ -1331,6 +1331,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.11.orig/fs/proc/version.c
54-+++ linux-5.11/fs/proc/version.c
53+--- linux-5.11.2.orig/fs/proc/version.c
54++++ linux-5.11.2/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.11 2021/02/15\n");
62++ printk(KERN_INFO "Hook version: 5.11.2 2021/03/01\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-5.11.orig/include/linux/sched.h
67-+++ linux-5.11/include/linux/sched.h
66+--- linux-5.11.2.orig/include/linux/sched.h
67++++ linux-5.11.2/include/linux/sched.h
6868 @@ -43,6 +43,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.11.orig/include/linux/security.h
88-+++ linux-5.11/include/linux/security.h
87+--- linux-5.11.2.orig/include/linux/security.h
88++++ linux-5.11.2/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.11.orig/include/net/ip.h
319-+++ linux-5.11/include/net/ip.h
318+--- linux-5.11.2.orig/include/net/ip.h
319++++ linux-5.11.2/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.11.orig/init/init_task.c
339-+++ linux-5.11/init/init_task.c
338+--- linux-5.11.2.orig/init/init_task.c
339++++ linux-5.11.2/init/init_task.c
340340 @@ -213,6 +213,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.11.orig/kernel/kexec.c
352-+++ linux-5.11/kernel/kexec.c
351+--- linux-5.11.2.orig/kernel/kexec.c
352++++ linux-5.11.2/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.11.orig/kernel/module.c
372-+++ linux-5.11/kernel/module.c
371+--- linux-5.11.2.orig/kernel/module.c
372++++ linux-5.11.2/kernel/module.c
373373 @@ -58,6 +58,7 @@
374374 #include <linux/audit.h>
375375 #include <uapi/linux/module.h>
@@ -396,8 +396,8 @@
396396
397397 return 0;
398398 }
399---- linux-5.11.orig/kernel/ptrace.c
400-+++ linux-5.11/kernel/ptrace.c
399+--- linux-5.11.2.orig/kernel/ptrace.c
400++++ linux-5.11.2/kernel/ptrace.c
401401 @@ -1238,6 +1238,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.11.orig/kernel/reboot.c
426-+++ linux-5.11/kernel/reboot.c
425+--- linux-5.11.2.orig/kernel/reboot.c
426++++ linux-5.11.2/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.11.orig/kernel/sched/core.c
445-+++ linux-5.11/kernel/sched/core.c
444+--- linux-5.11.2.orig/kernel/sched/core.c
445++++ linux-5.11.2/kernel/sched/core.c
446446 @@ -5588,6 +5588,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.11.orig/kernel/signal.c
456-+++ linux-5.11/kernel/signal.c
455+--- linux-5.11.2.orig/kernel/signal.c
456++++ linux-5.11.2/kernel/signal.c
457457 @@ -3677,6 +3677,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.11.orig/kernel/sys.c
525-+++ linux-5.11/kernel/sys.c
524+--- linux-5.11.2.orig/kernel/sys.c
525++++ linux-5.11.2/kernel/sys.c
526526 @@ -206,6 +206,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.11.orig/kernel/time/timekeeping.c
556-+++ linux-5.11/kernel/time/timekeeping.c
555+--- linux-5.11.2.orig/kernel/time/timekeeping.c
556++++ linux-5.11.2/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.11.orig/net/ipv4/raw.c
591-+++ linux-5.11/net/ipv4/raw.c
590+--- linux-5.11.2.orig/net/ipv4/raw.c
591++++ linux-5.11.2/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.11.orig/net/ipv4/udp.c
604-+++ linux-5.11/net/ipv4/udp.c
603+--- linux-5.11.2.orig/net/ipv4/udp.c
604++++ linux-5.11.2/net/ipv4/udp.c
605605 @@ -1800,6 +1800,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.11.orig/net/ipv6/raw.c
615-+++ linux-5.11/net/ipv6/raw.c
614+--- linux-5.11.2.orig/net/ipv6/raw.c
615++++ linux-5.11.2/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.11.orig/net/ipv6/udp.c
628-+++ linux-5.11/net/ipv6/udp.c
627+--- linux-5.11.2.orig/net/ipv6/udp.c
628++++ linux-5.11.2/net/ipv6/udp.c
629629 @@ -342,6 +342,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.11.orig/net/socket.c
639-+++ linux-5.11/net/socket.c
638+--- linux-5.11.2.orig/net/socket.c
639++++ linux-5.11.2/net/socket.c
640640 @@ -1736,6 +1736,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.11.orig/net/unix/af_unix.c
652-+++ linux-5.11/net/unix/af_unix.c
651+--- linux-5.11.2.orig/net/unix/af_unix.c
652++++ linux-5.11.2/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.11.orig/security/Kconfig
673-+++ linux-5.11/security/Kconfig
672+--- linux-5.11.2.orig/security/Kconfig
673++++ linux-5.11.2/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.11.orig/security/Makefile
683-+++ linux-5.11/security/Makefile
682+--- linux-5.11.2.orig/security/Makefile
683++++ linux-5.11.2/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.11.orig/security/security.c
692-+++ linux-5.11/security/security.c
691+--- linux-5.11.2.orig/security/security.c
692++++ linux-5.11.2/security/security.c
693693 @@ -1586,7 +1586,9 @@ int security_task_alloc(struct task_stru
694694
695695 if (rc)
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-5.12.diff (nonexistent)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-5.12.diff (revision 6858)
@@ -0,0 +1,711 @@
1+This is TOMOYO Linux patch for kernel 5.12-rc1.
2+
3+Source code for this patch is https://git.kernel.org/torvalds/t/linux-5.12-rc1.tar.gz
4+---
5+ fs/exec.c | 2 -
6+ fs/open.c | 2 +
7+ fs/proc/version.c | 7 ++++
8+ include/linux/sched.h | 5 +++
9+ include/linux/security.h | 70 ++++++++++++++++++++++++++++------------------
10+ include/net/ip.h | 4 ++
11+ init/init_task.c | 4 ++
12+ kernel/kexec.c | 4 +-
13+ kernel/module.c | 5 +++
14+ kernel/ptrace.c | 10 ++++++
15+ kernel/reboot.c | 3 +
16+ kernel/sched/core.c | 2 +
17+ kernel/signal.c | 25 ++++++++++++++++
18+ kernel/sys.c | 8 +++++
19+ kernel/time/timekeeping.c | 8 +++++
20+ net/ipv4/raw.c | 4 ++
21+ net/ipv4/udp.c | 2 +
22+ net/ipv6/raw.c | 4 ++
23+ net/ipv6/udp.c | 2 +
24+ net/socket.c | 4 ++
25+ net/unix/af_unix.c | 5 +++
26+ security/Kconfig | 2 +
27+ security/Makefile | 3 +
28+ security/security.c | 5 ++-
29+ 24 files changed, 160 insertions(+), 30 deletions(-)
30+
31+--- linux-5.12-rc1.orig/fs/exec.c
32++++ linux-5.12-rc1/fs/exec.c
33+@@ -1827,7 +1827,7 @@ static int bprm_execve(struct linux_binp
34+ if (retval)
35+ goto out;
36+
37+- retval = exec_binprm(bprm);
38++ retval = ccs_exec_binprm(bprm);
39+ if (retval < 0)
40+ goto out;
41+
42+--- linux-5.12-rc1.orig/fs/open.c
43++++ linux-5.12-rc1/fs/open.c
44+@@ -1346,6 +1346,8 @@ SYSCALL_DEFINE3(close_range, unsigned in
45+ */
46+ SYSCALL_DEFINE0(vhangup)
47+ {
48++ if (!ccs_capable(CCS_SYS_VHANGUP))
49++ return -EPERM;
50+ if (capable(CAP_SYS_TTY_CONFIG)) {
51+ tty_vhangup_self();
52+ return 0;
53+--- linux-5.12-rc1.orig/fs/proc/version.c
54++++ linux-5.12-rc1/fs/proc/version.c
55+@@ -21,3 +21,10 @@ static int __init proc_version_init(void
56+ return 0;
57+ }
58+ fs_initcall(proc_version_init);
59++
60++static int __init ccs_show_version(void)
61++{
62++ printk(KERN_INFO "Hook version: 5.12-rc1 2021/03/01\n");
63++ return 0;
64++}
65++fs_initcall(ccs_show_version);
66+--- linux-5.12-rc1.orig/include/linux/sched.h
67++++ linux-5.12-rc1/include/linux/sched.h
68+@@ -43,6 +43,7 @@ struct backing_dev_info;
69+ struct bio_list;
70+ struct blk_plug;
71+ struct capture_control;
72++struct ccs_domain_info;
73+ struct cfs_rq;
74+ struct fs_struct;
75+ struct futex_pi_state;
76+@@ -1351,6 +1352,10 @@ struct task_struct {
77+ /* Used by LSM modules for access restriction: */
78+ void *security;
79+ #endif
80++#if defined(CONFIG_CCSECURITY) && !defined(CONFIG_CCSECURITY_USE_EXTERNAL_TASK_SECURITY)
81++ struct ccs_domain_info *ccs_domain_info;
82++ u32 ccs_flags;
83++#endif
84+
85+ #ifdef CONFIG_GCC_PLUGIN_STACKLEAK
86+ unsigned long lowest_stack;
87+--- linux-5.12-rc1.orig/include/linux/security.h
88++++ linux-5.12-rc1/include/linux/security.h
89+@@ -59,6 +59,7 @@ struct fs_parameter;
90+ enum fs_value_type;
91+ struct watch;
92+ struct watch_notification;
93++#include <linux/ccsecurity.h>
94+
95+ /* Default (no) options for the capable function */
96+ #define CAP_OPT_NONE 0x0
97+@@ -583,7 +584,10 @@ static inline int security_syslog(int ty
98+ static inline int security_settime64(const struct timespec64 *ts,
99+ const struct timezone *tz)
100+ {
101+- return cap_settime(ts, tz);
102++ int error = cap_settime(ts, tz);
103++ if (!error)
104++ error = ccs_settime(ts, tz);
105++ return error;
106+ }
107+
108+ static inline int security_vm_enough_memory_mm(struct mm_struct *mm, long pages)
109+@@ -666,18 +670,18 @@ static inline int security_sb_mount(cons
110+ const char *type, unsigned long flags,
111+ void *data)
112+ {
113+- return 0;
114++ return ccs_sb_mount(dev_name, path, type, flags, data);
115+ }
116+
117+ static inline int security_sb_umount(struct vfsmount *mnt, int flags)
118+ {
119+- return 0;
120++ return ccs_sb_umount(mnt, flags);
121+ }
122+
123+ static inline int security_sb_pivotroot(const struct path *old_path,
124+ const struct path *new_path)
125+ {
126+- return 0;
127++ return ccs_sb_pivotroot(old_path, new_path);
128+ }
129+
130+ static inline int security_sb_set_mnt_opts(struct super_block *sb,
131+@@ -705,7 +709,7 @@ static inline int security_add_mnt_opt(c
132+ static inline int security_move_mount(const struct path *from_path,
133+ const struct path *to_path)
134+ {
135+- return 0;
136++ return ccs_move_mount_permission(from_path, to_path);
137+ }
138+
139+ static inline int security_path_notify(const struct path *path, u64 mask,
140+@@ -846,7 +850,7 @@ static inline int security_inode_setattr
141+
142+ static inline int security_inode_getattr(const struct path *path)
143+ {
144+- return 0;
145++ return ccs_inode_getattr(path);
146+ }
147+
148+ static inline int security_inode_setxattr(struct user_namespace *mnt_userns,
149+@@ -944,7 +948,7 @@ static inline void security_file_free(st
150+ static inline int security_file_ioctl(struct file *file, unsigned int cmd,
151+ unsigned long arg)
152+ {
153+- return 0;
154++ return ccs_file_ioctl(file, cmd, arg);
155+ }
156+
157+ static inline int security_mmap_file(struct file *file, unsigned long prot,
158+@@ -973,7 +977,7 @@ static inline int security_file_lock(str
159+ static inline int security_file_fcntl(struct file *file, unsigned int cmd,
160+ unsigned long arg)
161+ {
162+- return 0;
163++ return ccs_file_fcntl(file, cmd, arg);
164+ }
165+
166+ static inline void security_file_set_fowner(struct file *file)
167+@@ -995,17 +999,19 @@ static inline int security_file_receive(
168+
169+ static inline int security_file_open(struct file *file)
170+ {
171+- return 0;
172++ return ccs_file_open(file);
173+ }
174+
175+ static inline int security_task_alloc(struct task_struct *task,
176+ unsigned long clone_flags)
177+ {
178+- return 0;
179++ return ccs_alloc_task_security(task);
180+ }
181+
182+ static inline void security_task_free(struct task_struct *task)
183+-{ }
184++{
185++ ccs_free_task_security(task);
186++}
187+
188+ static inline int security_cred_alloc_blank(struct cred *cred, gfp_t gfp)
189+ {
190+@@ -1422,7 +1428,7 @@ static inline int security_unix_may_send
191+ static inline int security_socket_create(int family, int type,
192+ int protocol, int kern)
193+ {
194+- return 0;
195++ return ccs_socket_create(family, type, protocol, kern);
196+ }
197+
198+ static inline int security_socket_post_create(struct socket *sock,
199+@@ -1443,19 +1449,19 @@ static inline int security_socket_bind(s
200+ struct sockaddr *address,
201+ int addrlen)
202+ {
203+- return 0;
204++ return ccs_socket_bind(sock, address, addrlen);
205+ }
206+
207+ static inline int security_socket_connect(struct socket *sock,
208+ struct sockaddr *address,
209+ int addrlen)
210+ {
211+- return 0;
212++ return ccs_socket_connect(sock, address, addrlen);
213+ }
214+
215+ static inline int security_socket_listen(struct socket *sock, int backlog)
216+ {
217+- return 0;
218++ return ccs_socket_listen(sock, backlog);
219+ }
220+
221+ static inline int security_socket_accept(struct socket *sock,
222+@@ -1467,7 +1473,7 @@ static inline int security_socket_accept
223+ static inline int security_socket_sendmsg(struct socket *sock,
224+ struct msghdr *msg, int size)
225+ {
226+- return 0;
227++ return ccs_socket_sendmsg(sock, msg, size);
228+ }
229+
230+ static inline int security_socket_recvmsg(struct socket *sock,
231+@@ -1758,42 +1764,42 @@ int security_path_chroot(const struct pa
232+ #else /* CONFIG_SECURITY_PATH */
233+ static inline int security_path_unlink(const struct path *dir, struct dentry *dentry)
234+ {
235+- return 0;
236++ return ccs_path_unlink(dir, dentry);
237+ }
238+
239+ static inline int security_path_mkdir(const struct path *dir, struct dentry *dentry,
240+ umode_t mode)
241+ {
242+- return 0;
243++ return ccs_path_mkdir(dir, dentry, mode);
244+ }
245+
246+ static inline int security_path_rmdir(const struct path *dir, struct dentry *dentry)
247+ {
248+- return 0;
249++ return ccs_path_rmdir(dir, dentry);
250+ }
251+
252+ static inline int security_path_mknod(const struct path *dir, struct dentry *dentry,
253+ umode_t mode, unsigned int dev)
254+ {
255+- return 0;
256++ return ccs_path_mknod(dir, dentry, mode, dev);
257+ }
258+
259+ static inline int security_path_truncate(const struct path *path)
260+ {
261+- return 0;
262++ return ccs_path_truncate(path);
263+ }
264+
265+ static inline int security_path_symlink(const struct path *dir, struct dentry *dentry,
266+ const char *old_name)
267+ {
268+- return 0;
269++ return ccs_path_symlink(dir, dentry, old_name);
270+ }
271+
272+ static inline int security_path_link(struct dentry *old_dentry,
273+ const struct path *new_dir,
274+ struct dentry *new_dentry)
275+ {
276+- return 0;
277++ return ccs_path_link(old_dentry, new_dir, new_dentry);
278+ }
279+
280+ static inline int security_path_rename(const struct path *old_dir,
281+@@ -1802,22 +1808,32 @@ static inline int security_path_rename(c
282+ struct dentry *new_dentry,
283+ unsigned int flags)
284+ {
285+- return 0;
286++ /*
287++ * Not using RENAME_EXCHANGE here in order to avoid KABI breakage
288++ * by doing "#include <uapi/linux/fs.h>" .
289++ */
290++ if (flags & (1 << 1)) {
291++ int err = ccs_path_rename(new_dir, new_dentry, old_dir,
292++ old_dentry);
293++ if (err)
294++ return err;
295++ }
296++ return ccs_path_rename(old_dir, old_dentry, new_dir, new_dentry);
297+ }
298+
299+ static inline int security_path_chmod(const struct path *path, umode_t mode)
300+ {
301+- return 0;
302++ return ccs_path_chmod(path, mode);
303+ }
304+
305+ static inline int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
306+ {
307+- return 0;
308++ return ccs_path_chown(path, uid, gid);
309+ }
310+
311+ static inline int security_path_chroot(const struct path *path)
312+ {
313+- return 0;
314++ return ccs_path_chroot(path);
315+ }
316+ #endif /* CONFIG_SECURITY_PATH */
317+
318+--- linux-5.12-rc1.orig/include/net/ip.h
319++++ linux-5.12-rc1/include/net/ip.h
320+@@ -338,6 +338,8 @@ void inet_get_local_port_range(struct ne
321+ #ifdef CONFIG_SYSCTL
322+ static inline bool inet_is_local_reserved_port(struct net *net, unsigned short port)
323+ {
324++ if (ccs_lport_reserved(port))
325++ return true;
326+ if (!net->ipv4.sysctl_local_reserved_ports)
327+ return false;
328+ return test_bit(port, net->ipv4.sysctl_local_reserved_ports);
329+@@ -356,6 +358,8 @@ static inline bool inet_port_requires_bi
330+ #else
331+ static inline bool inet_is_local_reserved_port(struct net *net, unsigned short port)
332+ {
333++ if (ccs_lport_reserved(port))
334++ return true;
335+ return false;
336+ }
337+
338+--- linux-5.12-rc1.orig/init/init_task.c
339++++ linux-5.12-rc1/init/init_task.c
340+@@ -213,6 +213,10 @@ struct task_struct init_task
341+ #ifdef CONFIG_SECCOMP
342+ .seccomp = { .filter_count = ATOMIC_INIT(0) },
343+ #endif
344++#if defined(CONFIG_CCSECURITY) && !defined(CONFIG_CCSECURITY_USE_EXTERNAL_TASK_SECURITY)
345++ .ccs_domain_info = NULL,
346++ .ccs_flags = 0,
347++#endif
348+ };
349+ EXPORT_SYMBOL(init_task);
350+
351+--- linux-5.12-rc1.orig/kernel/kexec.c
352++++ linux-5.12-rc1/kernel/kexec.c
353+@@ -16,7 +16,7 @@
354+ #include <linux/syscalls.h>
355+ #include <linux/vmalloc.h>
356+ #include <linux/slab.h>
357+-
358++#include <linux/ccsecurity.h>
359+ #include "kexec_internal.h"
360+
361+ static int copy_user_segment_list(struct kimage *image,
362+@@ -203,6 +203,8 @@ static inline int kexec_load_check(unsig
363+ /* We only trust the superuser with rebooting the system. */
364+ if (!capable(CAP_SYS_BOOT) || kexec_load_disabled)
365+ return -EPERM;
366++ if (!ccs_capable(CCS_SYS_KEXEC_LOAD))
367++ return -EPERM;
368+
369+ /* Permit LSMs and IMA to fail the kexec */
370+ result = security_kernel_load_data(LOADING_KEXEC_IMAGE, false);
371+--- linux-5.12-rc1.orig/kernel/module.c
372++++ linux-5.12-rc1/kernel/module.c
373+@@ -58,6 +58,7 @@
374+ #include <linux/audit.h>
375+ #include <uapi/linux/module.h>
376+ #include "module-internal.h"
377++#include <linux/ccsecurity.h>
378+
379+ #define CREATE_TRACE_POINTS
380+ #include <trace/events/module.h>
381+@@ -913,6 +914,8 @@ SYSCALL_DEFINE2(delete_module, const cha
382+
383+ if (!capable(CAP_SYS_MODULE) || modules_disabled)
384+ return -EPERM;
385++ if (!ccs_capable(CCS_USE_KERNEL_MODULE))
386++ return -EPERM;
387+
388+ if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0)
389+ return -EFAULT;
390+@@ -3755,6 +3758,8 @@ static int may_init_module(void)
391+ {
392+ if (!capable(CAP_SYS_MODULE) || modules_disabled)
393+ return -EPERM;
394++ if (!ccs_capable(CCS_USE_KERNEL_MODULE))
395++ return -EPERM;
396+
397+ return 0;
398+ }
399+--- linux-5.12-rc1.orig/kernel/ptrace.c
400++++ linux-5.12-rc1/kernel/ptrace.c
401+@@ -1238,6 +1238,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
402+ {
403+ struct task_struct *child;
404+ long ret;
405++ {
406++ const int rc = ccs_ptrace_permission(request, pid);
407++ if (rc)
408++ return rc;
409++ }
410+
411+ if (request == PTRACE_TRACEME) {
412+ ret = ptrace_traceme();
413+@@ -1385,6 +1390,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
414+ {
415+ struct task_struct *child;
416+ long ret;
417++ {
418++ const int rc = ccs_ptrace_permission(request, pid);
419++ if (rc)
420++ return rc;
421++ }
422+
423+ if (request == PTRACE_TRACEME) {
424+ ret = ptrace_traceme();
425+--- linux-5.12-rc1.orig/kernel/reboot.c
426++++ linux-5.12-rc1/kernel/reboot.c
427+@@ -17,6 +17,7 @@
428+ #include <linux/syscalls.h>
429+ #include <linux/syscore_ops.h>
430+ #include <linux/uaccess.h>
431++#include <linux/ccsecurity.h>
432+
433+ /*
434+ * this indicates whether you can reboot with ctrl-alt-del: the default is yes
435+@@ -327,6 +328,8 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
436+ magic2 != LINUX_REBOOT_MAGIC2B &&
437+ magic2 != LINUX_REBOOT_MAGIC2C))
438+ return -EINVAL;
439++ if (!ccs_capable(CCS_SYS_REBOOT))
440++ return -EPERM;
441+
442+ /*
443+ * If pid namespaces are enabled and the current task is in a child
444+--- linux-5.12-rc1.orig/kernel/sched/core.c
445++++ linux-5.12-rc1/kernel/sched/core.c
446+@@ -5780,6 +5780,8 @@ int can_nice(const struct task_struct *p
447+ SYSCALL_DEFINE1(nice, int, increment)
448+ {
449+ long nice, retval;
450++ if (!ccs_capable(CCS_SYS_NICE))
451++ return -EPERM;
452+
453+ /*
454+ * Setpriority might change our priority at the same moment.
455+--- linux-5.12-rc1.orig/kernel/signal.c
456++++ linux-5.12-rc1/kernel/signal.c
457+@@ -3677,6 +3677,8 @@ static inline void prepare_kill_siginfo(
458+ SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
459+ {
460+ struct kernel_siginfo info;
461++ if (ccs_kill_permission(pid, sig))
462++ return -EPERM;
463+
464+ prepare_kill_siginfo(sig, &info);
465+
466+@@ -3776,6 +3778,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int,
467+ if (!access_pidfd_pidns(pid))
468+ goto err;
469+
470++ {
471++ struct task_struct *task;
472++ int id = 0;
473++
474++ rcu_read_lock();
475++ task = pid_task(pid, PIDTYPE_PID);
476++ if (task)
477++ id = task_pid_vnr(task);
478++ rcu_read_unlock();
479++ if (task && ccs_kill_permission(id, sig)) {
480++ ret = -EPERM;
481++ goto err;
482++ }
483++ }
484++
485+ if (info) {
486+ ret = copy_siginfo_from_user_any(&kinfo, info);
487+ if (unlikely(ret))
488+@@ -3860,6 +3877,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
489+ /* This is only valid for single tasks */
490+ if (pid <= 0 || tgid <= 0)
491+ return -EINVAL;
492++ if (ccs_tgkill_permission(tgid, pid, sig))
493++ return -EPERM;
494+
495+ return do_tkill(tgid, pid, sig);
496+ }
497+@@ -3876,6 +3895,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
498+ /* This is only valid for single tasks */
499+ if (pid <= 0)
500+ return -EINVAL;
501++ if (ccs_tkill_permission(pid, sig))
502++ return -EPERM;
503+
504+ return do_tkill(0, pid, sig);
505+ }
506+@@ -3888,6 +3909,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
507+ if ((info->si_code >= 0 || info->si_code == SI_TKILL) &&
508+ (task_pid_vnr(current) != pid))
509+ return -EPERM;
510++ if (ccs_sigqueue_permission(pid, sig))
511++ return -EPERM;
512+
513+ /* POSIX.1b doesn't mention process groups. */
514+ return kill_proc_info(sig, info, pid);
515+@@ -3935,6 +3958,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
516+ if ((info->si_code >= 0 || info->si_code == SI_TKILL) &&
517+ (task_pid_vnr(current) != pid))
518+ return -EPERM;
519++ if (ccs_tgsigqueue_permission(tgid, pid, sig))
520++ return -EPERM;
521+
522+ return do_send_specific(tgid, pid, sig, info);
523+ }
524+--- linux-5.12-rc1.orig/kernel/sys.c
525++++ linux-5.12-rc1/kernel/sys.c
526+@@ -205,6 +205,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
527+
528+ if (which > PRIO_USER || which < PRIO_PROCESS)
529+ goto out;
530++ if (!ccs_capable(CCS_SYS_NICE)) {
531++ error = -EPERM;
532++ goto out;
533++ }
534+
535+ /* normalize: avoid signed division (rounding problems) */
536+ error = -ESRCH;
537+@@ -1328,6 +1332,8 @@ SYSCALL_DEFINE2(sethostname, char __user
538+
539+ if (len < 0 || len > __NEW_UTS_LEN)
540+ return -EINVAL;
541++ if (!ccs_capable(CCS_SYS_SETHOSTNAME))
542++ return -EPERM;
543+ errno = -EFAULT;
544+ if (!copy_from_user(tmp, name, len)) {
545+ struct new_utsname *u;
546+@@ -1380,6 +1386,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
547+ return -EPERM;
548+ if (len < 0 || len > __NEW_UTS_LEN)
549+ return -EINVAL;
550++ if (!ccs_capable(CCS_SYS_SETHOSTNAME))
551++ return -EPERM;
552+
553+ errno = -EFAULT;
554+ if (!copy_from_user(tmp, name, len)) {
555+--- linux-5.12-rc1.orig/kernel/time/timekeeping.c
556++++ linux-5.12-rc1/kernel/time/timekeeping.c
557+@@ -22,6 +22,7 @@
558+ #include <linux/pvclock_gtod.h>
559+ #include <linux/compiler.h>
560+ #include <linux/audit.h>
561++#include <linux/ccsecurity.h>
562+
563+ #include "tick-internal.h"
564+ #include "ntp_internal.h"
565+@@ -2315,10 +2316,15 @@ static int timekeeping_validate_timex(co
566+ if (!(txc->modes & ADJ_OFFSET_READONLY) &&
567+ !capable(CAP_SYS_TIME))
568+ return -EPERM;
569++ if (!(txc->modes & ADJ_OFFSET_READONLY) &&
570++ !ccs_capable(CCS_SYS_SETTIME))
571++ return -EPERM;
572+ } else {
573+ /* In order to modify anything, you gotta be super-user! */
574+ if (txc->modes && !capable(CAP_SYS_TIME))
575+ return -EPERM;
576++ if (txc->modes && !ccs_capable(CCS_SYS_SETTIME))
577++ return -EPERM;
578+ /*
579+ * if the quartz is off by more than 10% then
580+ * something is VERY wrong!
581+@@ -2333,6 +2339,8 @@ static int timekeeping_validate_timex(co
582+ /* In order to inject time, you gotta be super-user! */
583+ if (!capable(CAP_SYS_TIME))
584+ return -EPERM;
585++ if (!ccs_capable(CCS_SYS_SETTIME))
586++ return -EPERM;
587+
588+ /*
589+ * Validate if a timespec/timeval used to inject a time
590+--- linux-5.12-rc1.orig/net/ipv4/raw.c
591++++ linux-5.12-rc1/net/ipv4/raw.c
592+@@ -768,6 +768,10 @@ static int raw_recvmsg(struct sock *sk,
593+ skb = skb_recv_datagram(sk, flags, noblock, &err);
594+ if (!skb)
595+ goto out;
596++ if (ccs_socket_post_recvmsg_permission(sk, skb, flags)) {
597++ err = -EAGAIN; /* Hope less harmful than -EPERM. */
598++ goto out;
599++ }
600+
601+ copied = skb->len;
602+ if (len < copied) {
603+--- linux-5.12-rc1.orig/net/ipv4/udp.c
604++++ linux-5.12-rc1/net/ipv4/udp.c
605+@@ -1806,6 +1806,8 @@ try_again:
606+ skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
607+ if (!skb)
608+ return err;
609++ if (ccs_socket_post_recvmsg_permission(sk, skb, flags))
610++ return -EAGAIN; /* Hope less harmful than -EPERM. */
611+
612+ ulen = udp_skb_len(skb);
613+ copied = len;
614+--- linux-5.12-rc1.orig/net/ipv6/raw.c
615++++ linux-5.12-rc1/net/ipv6/raw.c
616+@@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk
617+ skb = skb_recv_datagram(sk, flags, noblock, &err);
618+ if (!skb)
619+ goto out;
620++ if (ccs_socket_post_recvmsg_permission(sk, skb, flags)) {
621++ err = -EAGAIN; /* Hope less harmful than -EPERM. */
622++ goto out;
623++ }
624+
625+ copied = skb->len;
626+ if (copied > len) {
627+--- linux-5.12-rc1.orig/net/ipv6/udp.c
628++++ linux-5.12-rc1/net/ipv6/udp.c
629+@@ -342,6 +342,8 @@ try_again:
630+ skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
631+ if (!skb)
632+ return err;
633++ if (ccs_socket_post_recvmsg_permission(sk, skb, flags))
634++ return -EAGAIN; /* Hope less harmful than -EPERM. */
635+
636+ ulen = udp6_skb_len(skb);
637+ copied = len;
638+--- linux-5.12-rc1.orig/net/socket.c
639++++ linux-5.12-rc1/net/socket.c
640+@@ -1738,6 +1738,10 @@ int __sys_accept4_file(struct file *file
641+ if (err < 0)
642+ goto out_fd;
643+
644++ if (ccs_socket_post_accept_permission(sock, newsock)) {
645++ err = -EAGAIN; /* Hope less harmful than -EPERM. */
646++ goto out_fd;
647++ }
648+ if (upeer_sockaddr) {
649+ len = newsock->ops->getname(newsock,
650+ (struct sockaddr *)&address, 2);
651+--- linux-5.12-rc1.orig/net/unix/af_unix.c
652++++ linux-5.12-rc1/net/unix/af_unix.c
653+@@ -2128,6 +2128,10 @@ static int unix_dgram_recvmsg(struct soc
654+ EPOLLOUT | EPOLLWRNORM |
655+ EPOLLWRBAND);
656+
657++ if (ccs_socket_post_recvmsg_permission(sk, skb, flags)) {
658++ err = -EAGAIN; /* Hope less harmful than -EPERM. */
659++ goto out_unlock;
660++ }
661+ if (msg->msg_name)
662+ unix_copy_addr(msg, skb->sk);
663+
664+@@ -2178,6 +2182,7 @@ static int unix_dgram_recvmsg(struct soc
665+
666+ out_free:
667+ skb_free_datagram(sk, skb);
668++out_unlock:
669+ mutex_unlock(&u->iolock);
670+ out:
671+ return err;
672+--- linux-5.12-rc1.orig/security/Kconfig
673++++ linux-5.12-rc1/security/Kconfig
674+@@ -291,5 +291,7 @@ config LSM
675+
676+ source "security/Kconfig.hardening"
677+
678++source "security/ccsecurity/Kconfig"
679++
680+ endmenu
681+
682+--- linux-5.12-rc1.orig/security/Makefile
683++++ linux-5.12-rc1/security/Makefile
684+@@ -36,3 +36,6 @@ obj-$(CONFIG_BPF_LSM) += bpf/
685+ # Object integrity file lists
686+ subdir-$(CONFIG_INTEGRITY) += integrity
687+ obj-$(CONFIG_INTEGRITY) += integrity/
688++
689++subdir-$(CONFIG_CCSECURITY) += ccsecurity
690++obj-$(CONFIG_CCSECURITY) += ccsecurity/
691+--- linux-5.12-rc1.orig/security/security.c
692++++ linux-5.12-rc1/security/security.c
693+@@ -1599,7 +1599,9 @@ int security_task_alloc(struct task_stru
694+
695+ if (rc)
696+ return rc;
697+- rc = call_int_hook(task_alloc, 0, task, clone_flags);
698++ rc = ccs_alloc_task_security(task);
699++ if (likely(!rc))
700++ rc = call_int_hook(task_alloc, 0, task, clone_flags);
701+ if (unlikely(rc))
702+ security_task_free(task);
703+ return rc;
704+@@ -1608,6 +1610,7 @@ int security_task_alloc(struct task_stru
705+ void security_task_free(struct task_struct *task)
706+ {
707+ call_void_hook(task_free, task);
708++ ccs_free_task_security(task);
709+
710+ kfree(task->security);
711+ task->security = NULL;
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-5.4.diff (revision 6857)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-5.4.diff (revision 6858)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 5.4.99.
1+This is TOMOYO Linux patch for kernel 5.4.101.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.99.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.101.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.99.orig/fs/exec.c
32-+++ linux-5.4.99/fs/exec.c
31+--- linux-5.4.101.orig/fs/exec.c
32++++ linux-5.4.101/fs/exec.c
3333 @@ -1730,7 +1730,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.99.orig/fs/open.c
43-+++ linux-5.4.99/fs/open.c
42+--- linux-5.4.101.orig/fs/open.c
43++++ linux-5.4.101/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.99.orig/fs/proc/version.c
54-+++ linux-5.4.99/fs/proc/version.c
53+--- linux-5.4.101.orig/fs/proc/version.c
54++++ linux-5.4.101/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.99 2021/02/22\n");
62++ printk(KERN_INFO "Hook version: 5.4.101 2021/03/01\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-5.4.99.orig/include/linux/sched.h
67-+++ linux-5.4.99/include/linux/sched.h
66+--- linux-5.4.101.orig/include/linux/sched.h
67++++ linux-5.4.101/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.99.orig/include/linux/security.h
88-+++ linux-5.4.99/include/linux/security.h
87+--- linux-5.4.101.orig/include/linux/security.h
88++++ linux-5.4.101/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.99.orig/include/net/ip.h
319-+++ linux-5.4.99/include/net/ip.h
318+--- linux-5.4.101.orig/include/net/ip.h
319++++ linux-5.4.101/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.99.orig/init/init_task.c
339-+++ linux-5.4.99/init/init_task.c
338+--- linux-5.4.101.orig/init/init_task.c
339++++ linux-5.4.101/init/init_task.c
340340 @@ -183,6 +183,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.99.orig/kernel/kexec.c
352-+++ linux-5.4.99/kernel/kexec.c
351+--- linux-5.4.101.orig/kernel/kexec.c
352++++ linux-5.4.101/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.99.orig/kernel/module.c
372-+++ linux-5.4.99/kernel/module.c
371+--- linux-5.4.101.orig/kernel/module.c
372++++ linux-5.4.101/kernel/module.c
373373 @@ -55,6 +55,7 @@
374374 #include <linux/audit.h>
375375 #include <uapi/linux/module.h>
@@ -396,8 +396,8 @@
396396
397397 return 0;
398398 }
399---- linux-5.4.99.orig/kernel/ptrace.c
400-+++ linux-5.4.99/kernel/ptrace.c
399+--- linux-5.4.101.orig/kernel/ptrace.c
400++++ linux-5.4.101/kernel/ptrace.c
401401 @@ -1238,6 +1238,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.99.orig/kernel/reboot.c
426-+++ linux-5.4.99/kernel/reboot.c
425+--- linux-5.4.101.orig/kernel/reboot.c
426++++ linux-5.4.101/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.99.orig/kernel/sched/core.c
445-+++ linux-5.4.99/kernel/sched/core.c
444+--- linux-5.4.101.orig/kernel/sched/core.c
445++++ linux-5.4.101/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.99.orig/kernel/signal.c
456-+++ linux-5.4.99/kernel/signal.c
455+--- linux-5.4.101.orig/kernel/signal.c
456++++ linux-5.4.101/kernel/signal.c
457457 @@ -3644,6 +3644,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.99.orig/kernel/sys.c
525-+++ linux-5.4.99/kernel/sys.c
524+--- linux-5.4.101.orig/kernel/sys.c
525++++ linux-5.4.101/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.99.orig/kernel/time/timekeeping.c
556-+++ linux-5.4.99/kernel/time/timekeeping.c
555+--- linux-5.4.101.orig/kernel/time/timekeeping.c
556++++ linux-5.4.101/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.99.orig/net/ipv4/raw.c
591-+++ linux-5.4.99/net/ipv4/raw.c
590+--- linux-5.4.101.orig/net/ipv4/raw.c
591++++ linux-5.4.101/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.99.orig/net/ipv4/udp.c
604-+++ linux-5.4.99/net/ipv4/udp.c
603+--- linux-5.4.101.orig/net/ipv4/udp.c
604++++ linux-5.4.101/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.99.orig/net/ipv6/raw.c
615-+++ linux-5.4.99/net/ipv6/raw.c
614+--- linux-5.4.101.orig/net/ipv6/raw.c
615++++ linux-5.4.101/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.99.orig/net/ipv6/udp.c
628-+++ linux-5.4.99/net/ipv6/udp.c
627+--- linux-5.4.101.orig/net/ipv6/udp.c
628++++ linux-5.4.101/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.99.orig/net/socket.c
639-+++ linux-5.4.99/net/socket.c
638+--- linux-5.4.101.orig/net/socket.c
639++++ linux-5.4.101/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.99.orig/net/unix/af_unix.c
652-+++ linux-5.4.99/net/unix/af_unix.c
651+--- linux-5.4.101.orig/net/unix/af_unix.c
652++++ linux-5.4.101/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.99.orig/security/Kconfig
673-+++ linux-5.4.99/security/Kconfig
672+--- linux-5.4.101.orig/security/Kconfig
673++++ linux-5.4.101/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.99.orig/security/Makefile
683-+++ linux-5.4.99/security/Makefile
682+--- linux-5.4.101.orig/security/Makefile
683++++ linux-5.4.101/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.99.orig/security/security.c
692-+++ linux-5.4.99/security/security.c
691+--- linux-5.4.101.orig/security/security.c
692++++ linux-5.4.101/security/security.c
693693 @@ -1507,7 +1507,9 @@ int security_task_alloc(struct task_stru
694694
695695 if (rc)
Show on old repository browser