• R/O
  • SSH
  • HTTPS

tomoyo: コミット


コミットメタ情報

リビジョン6841 (tree)
日時2020-11-10 23:19:30
作者kumaneko

ログメッセージ

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

変更サマリ

差分

--- trunk/1.7.x/ccs-patch/patches/ccs-patch-2.6.32-centos-6.diff (revision 6840)
+++ trunk/1.7.x/ccs-patch/patches/ccs-patch-2.6.32-centos-6.diff (revision 6841)
@@ -1,6 +1,6 @@
11 This is TOMOYO Linux patch for CentOS 6.
22
3-Source code for this patch is http://vault.centos.org/centos/6/updates/Source/SPackages/kernel-2.6.32-754.33.1.el6.src.rpm
3+Source code for this patch is http://vault.centos.org/centos/6/updates/Source/SPackages/kernel-2.6.32-754.35.1.el6.src.rpm
44 ---
55 fs/compat.c | 3 ++-
66 fs/compat_ioctl.c | 7 +++++++
@@ -35,8 +35,8 @@
3535 security/Makefile | 3 +++
3636 31 files changed, 228 insertions(+), 2 deletions(-)
3737
38---- linux-2.6.32-754.33.1.el6.orig/fs/compat.c
39-+++ linux-2.6.32-754.33.1.el6/fs/compat.c
38+--- linux-2.6.32-754.35.1.el6.orig/fs/compat.c
39++++ linux-2.6.32-754.35.1.el6/fs/compat.c
4040 @@ -55,6 +55,7 @@
4141 #include <asm/mmu_context.h>
4242 #include <asm/ioctls.h>
@@ -54,8 +54,8 @@
5454 if (retval < 0)
5555 goto out;
5656
57---- linux-2.6.32-754.33.1.el6.orig/fs/compat_ioctl.c
58-+++ linux-2.6.32-754.33.1.el6/fs/compat_ioctl.c
57+--- linux-2.6.32-754.35.1.el6.orig/fs/compat_ioctl.c
58++++ linux-2.6.32-754.35.1.el6/fs/compat_ioctl.c
5959 @@ -114,6 +114,7 @@
6060 #ifdef CONFIG_SPARC
6161 #include <asm/fbio.h>
@@ -84,8 +84,8 @@
8484 if (filp->f_op && filp->f_op->compat_ioctl) {
8585 error = filp->f_op->compat_ioctl(filp, cmd, arg);
8686 if (error != -ENOIOCTLCMD)
87---- linux-2.6.32-754.33.1.el6.orig/fs/exec.c
88-+++ linux-2.6.32-754.33.1.el6/fs/exec.c
87+--- linux-2.6.32-754.35.1.el6.orig/fs/exec.c
88++++ linux-2.6.32-754.35.1.el6/fs/exec.c
8989 @@ -61,6 +61,7 @@
9090 #include <asm/mmu_context.h>
9191 #include <asm/tlb.h>
@@ -103,8 +103,8 @@
103103 if (retval < 0)
104104 goto out;
105105
106---- linux-2.6.32-754.33.1.el6.orig/fs/fcntl.c
107-+++ linux-2.6.32-754.33.1.el6/fs/fcntl.c
106+--- linux-2.6.32-754.35.1.el6.orig/fs/fcntl.c
107++++ linux-2.6.32-754.35.1.el6/fs/fcntl.c
108108 @@ -24,6 +24,7 @@
109109 #include <asm/poll.h>
110110 #include <asm/siginfo.h>
@@ -123,8 +123,8 @@
123123 /* O_NOATIME can only be set by the owner or superuser */
124124 if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))
125125 if (!is_owner_or_cap(inode))
126---- linux-2.6.32-754.33.1.el6.orig/fs/ioctl.c
127-+++ linux-2.6.32-754.33.1.el6/fs/ioctl.c
126+--- linux-2.6.32-754.35.1.el6.orig/fs/ioctl.c
127++++ linux-2.6.32-754.35.1.el6/fs/ioctl.c
128128 @@ -18,6 +18,7 @@
129129 #include <linux/falloc.h>
130130
@@ -151,8 +151,8 @@
151151 if (error)
152152 goto out_fput;
153153
154---- linux-2.6.32-754.33.1.el6.orig/fs/namei.c
155-+++ linux-2.6.32-754.33.1.el6/fs/namei.c
154+--- linux-2.6.32-754.35.1.el6.orig/fs/namei.c
155++++ linux-2.6.32-754.35.1.el6/fs/namei.c
156156 @@ -40,6 +40,8 @@
157157
158158 #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])
@@ -256,8 +256,8 @@
256256 if (error)
257257 goto exit5;
258258 error = vfs_rename(old_dir->d_inode, old_dentry,
259---- linux-2.6.32-754.33.1.el6.orig/fs/namespace.c
260-+++ linux-2.6.32-754.33.1.el6/fs/namespace.c
259+--- linux-2.6.32-754.35.1.el6.orig/fs/namespace.c
260++++ linux-2.6.32-754.35.1.el6/fs/namespace.c
261261 @@ -34,6 +34,7 @@
262262 #include <asm/unistd.h>
263263 #include "pnode.h"
@@ -341,8 +341,8 @@
341341 if (error) {
342342 path_put(&old);
343343 goto out1;
344---- linux-2.6.32-754.33.1.el6.orig/fs/open.c
345-+++ linux-2.6.32-754.33.1.el6/fs/open.c
344+--- linux-2.6.32-754.35.1.el6.orig/fs/open.c
345++++ linux-2.6.32-754.35.1.el6/fs/open.c
346346 @@ -32,6 +32,7 @@
347347 #include <linux/fs_struct.h>
348348 #include <linux/ima.h>
@@ -443,8 +443,8 @@
443443 if (capable(CAP_SYS_TTY_CONFIG)) {
444444 tty_vhangup_self();
445445 return 0;
446---- linux-2.6.32-754.33.1.el6.orig/fs/proc/version.c
447-+++ linux-2.6.32-754.33.1.el6/fs/proc/version.c
446+--- linux-2.6.32-754.35.1.el6.orig/fs/proc/version.c
447++++ linux-2.6.32-754.35.1.el6/fs/proc/version.c
448448 @@ -32,3 +32,10 @@ static int __init proc_version_init(void
449449 return 0;
450450 }
@@ -452,12 +452,12 @@
452452 +
453453 +static int __init ccs_show_version(void)
454454 +{
455-+ printk(KERN_INFO "Hook version: 2.6.32-754.33.1.el6 2020/08/26\n");
455++ printk(KERN_INFO "Hook version: 2.6.32-754.35.1.el6 2020/11/10\n");
456456 + return 0;
457457 +}
458458 +module_init(ccs_show_version);
459---- linux-2.6.32-754.33.1.el6.orig/include/linux/init_task.h
460-+++ linux-2.6.32-754.33.1.el6/include/linux/init_task.h
459+--- linux-2.6.32-754.35.1.el6.orig/include/linux/init_task.h
460++++ linux-2.6.32-754.35.1.el6/include/linux/init_task.h
461461 @@ -123,6 +123,14 @@ extern struct cred init_cred;
462462 # define INIT_PERF_EVENTS(tsk)
463463 #endif
@@ -481,8 +481,8 @@
481481 }
482482
483483
484---- linux-2.6.32-754.33.1.el6.orig/include/linux/sched.h
485-+++ linux-2.6.32-754.33.1.el6/include/linux/sched.h
484+--- linux-2.6.32-754.35.1.el6.orig/include/linux/sched.h
485++++ linux-2.6.32-754.35.1.el6/include/linux/sched.h
486486 @@ -43,6 +43,8 @@
487487
488488 #ifdef __KERNEL__
@@ -503,8 +503,8 @@
503503 };
504504
505505 /* Future-safe accessor for struct task_struct's cpus_allowed. */
506---- linux-2.6.32-754.33.1.el6.orig/include/net/ip.h
507-+++ linux-2.6.32-754.33.1.el6/include/net/ip.h
506+--- linux-2.6.32-754.35.1.el6.orig/include/net/ip.h
507++++ linux-2.6.32-754.35.1.el6/include/net/ip.h
508508 @@ -33,6 +33,7 @@
509509 #endif
510510 #include <net/snmp.h>
@@ -522,8 +522,8 @@
522522 return test_bit(port, sysctl_local_reserved_ports);
523523 }
524524
525---- linux-2.6.32-754.33.1.el6.orig/kernel/compat.c
526-+++ linux-2.6.32-754.33.1.el6/kernel/compat.c
525+--- linux-2.6.32-754.35.1.el6.orig/kernel/compat.c
526++++ linux-2.6.32-754.35.1.el6/kernel/compat.c
527527 @@ -28,6 +28,7 @@
528528 #include <linux/module.h>
529529
@@ -541,8 +541,8 @@
541541
542542 do_settimeofday(&tv);
543543 return 0;
544---- linux-2.6.32-754.33.1.el6.orig/kernel/kexec.c
545-+++ linux-2.6.32-754.33.1.el6/kernel/kexec.c
544+--- linux-2.6.32-754.35.1.el6.orig/kernel/kexec.c
545++++ linux-2.6.32-754.35.1.el6/kernel/kexec.c
546546 @@ -41,6 +41,7 @@
547547 #include <asm/system.h>
548548 #include <asm/sections.h>
@@ -560,8 +560,8 @@
560560
561561 if (kexec_load_disabled)
562562 return -EPERM;
563---- linux-2.6.32-754.33.1.el6.orig/kernel/kmod.c
564-+++ linux-2.6.32-754.33.1.el6/kernel/kmod.c
563+--- linux-2.6.32-754.35.1.el6.orig/kernel/kmod.c
564++++ linux-2.6.32-754.35.1.el6/kernel/kmod.c
565565 @@ -210,6 +210,11 @@ static int ____call_usermodehelper(void
566566 */
567567 set_user_nice(current, 0);
@@ -574,8 +574,8 @@
574574 retval = kernel_execve(sub_info->path, sub_info->argv, sub_info->envp);
575575
576576 /* Exec failed? */
577---- linux-2.6.32-754.33.1.el6.orig/kernel/module.c
578-+++ linux-2.6.32-754.33.1.el6/kernel/module.c
577+--- linux-2.6.32-754.35.1.el6.orig/kernel/module.c
578++++ linux-2.6.32-754.35.1.el6/kernel/module.c
579579 @@ -57,6 +57,7 @@
580580 #include <linux/percpu.h>
581581 #include <linux/kmemleak.h>
@@ -602,8 +602,8 @@
602602
603603 /*
604604 * Make sure we don't speculate past the CAP_SYS_MODULE check. The
605---- linux-2.6.32-754.33.1.el6.orig/kernel/ptrace.c
606-+++ linux-2.6.32-754.33.1.el6/kernel/ptrace.c
605+--- linux-2.6.32-754.35.1.el6.orig/kernel/ptrace.c
606++++ linux-2.6.32-754.35.1.el6/kernel/ptrace.c
607607 @@ -23,6 +23,7 @@
608608 #include <linux/uaccess.h>
609609 #include <linux/regset.h>
@@ -630,8 +630,8 @@
630630
631631 if (request == PTRACE_TRACEME) {
632632 ret = ptrace_traceme();
633---- linux-2.6.32-754.33.1.el6.orig/kernel/sched.c
634-+++ linux-2.6.32-754.33.1.el6/kernel/sched.c
633+--- linux-2.6.32-754.35.1.el6.orig/kernel/sched.c
634++++ linux-2.6.32-754.35.1.el6/kernel/sched.c
635635 @@ -79,6 +79,7 @@
636636 #ifdef CONFIG_PARAVIRT
637637 #include <asm/paravirt.h>
@@ -649,8 +649,8 @@
649649
650650 /*
651651 * Setpriority might change our priority at the same moment.
652---- linux-2.6.32-754.33.1.el6.orig/kernel/signal.c
653-+++ linux-2.6.32-754.33.1.el6/kernel/signal.c
652+--- linux-2.6.32-754.35.1.el6.orig/kernel/signal.c
653++++ linux-2.6.32-754.35.1.el6/kernel/signal.c
654654 @@ -36,6 +36,7 @@
655655 #include <asm/unistd.h>
656656 #include <asm/siginfo.h>
@@ -704,8 +704,8 @@
704704
705705 return do_send_specific(tgid, pid, sig, info);
706706 }
707---- linux-2.6.32-754.33.1.el6.orig/kernel/sys.c
708-+++ linux-2.6.32-754.33.1.el6/kernel/sys.c
707+--- linux-2.6.32-754.35.1.el6.orig/kernel/sys.c
708++++ linux-2.6.32-754.35.1.el6/kernel/sys.c
709709 @@ -50,6 +50,7 @@
710710 #include <asm/uaccess.h>
711711 #include <asm/io.h>
@@ -752,8 +752,8 @@
752752
753753 down_write(&uts_sem);
754754 errno = -EFAULT;
755---- linux-2.6.32-754.33.1.el6.orig/kernel/sysctl.c
756-+++ linux-2.6.32-754.33.1.el6/kernel/sysctl.c
755+--- linux-2.6.32-754.35.1.el6.orig/kernel/sysctl.c
756++++ linux-2.6.32-754.35.1.el6/kernel/sysctl.c
757757 @@ -57,6 +57,7 @@
758758
759759 #include <asm/uaccess.h>
@@ -772,8 +772,8 @@
772772 error = parse_table(name, nlen, oldval, oldlenp,
773773 newval, newlen,
774774 head->root, head->ctl_table);
775---- linux-2.6.32-754.33.1.el6.orig/kernel/time.c
776-+++ linux-2.6.32-754.33.1.el6/kernel/time.c
775+--- linux-2.6.32-754.35.1.el6.orig/kernel/time.c
776++++ linux-2.6.32-754.35.1.el6/kernel/time.c
777777 @@ -41,6 +41,7 @@
778778
779779 #include <asm/uaccess.h>
@@ -800,8 +800,8 @@
800800
801801 if (tz) {
802802 /* SMP safe, global irq locking makes it work. */
803---- linux-2.6.32-754.33.1.el6.orig/kernel/time/ntp.c
804-+++ linux-2.6.32-754.33.1.el6/kernel/time/ntp.c
803+--- linux-2.6.32-754.35.1.el6.orig/kernel/time/ntp.c
804++++ linux-2.6.32-754.35.1.el6/kernel/time/ntp.c
805805 @@ -14,6 +14,7 @@
806806 #include <linux/timex.h>
807807 #include <linux/time.h>
@@ -826,8 +826,8 @@
826826
827827 /*
828828 * if the quartz is off by more than 10% then
829---- linux-2.6.32-754.33.1.el6.orig/net/ipv4/raw.c
830-+++ linux-2.6.32-754.33.1.el6/net/ipv4/raw.c
829+--- linux-2.6.32-754.35.1.el6.orig/net/ipv4/raw.c
830++++ linux-2.6.32-754.35.1.el6/net/ipv4/raw.c
831831 @@ -77,6 +77,7 @@
832832 #include <linux/seq_file.h>
833833 #include <linux/netfilter.h>
@@ -846,8 +846,8 @@
846846
847847 copied = skb->len;
848848 if (len < copied) {
849---- linux-2.6.32-754.33.1.el6.orig/net/ipv4/udp.c
850-+++ linux-2.6.32-754.33.1.el6/net/ipv4/udp.c
849+--- linux-2.6.32-754.35.1.el6.orig/net/ipv4/udp.c
850++++ linux-2.6.32-754.35.1.el6/net/ipv4/udp.c
851851 @@ -108,6 +108,7 @@
852852 #include <trace/events/udp.h>
853853 #include <net/busy_poll.h>
@@ -866,8 +866,8 @@
866866
867867 ulen = skb->len - sizeof(struct udphdr);
868868 copied = len;
869---- linux-2.6.32-754.33.1.el6.orig/net/ipv6/raw.c
870-+++ linux-2.6.32-754.33.1.el6/net/ipv6/raw.c
869+--- linux-2.6.32-754.35.1.el6.orig/net/ipv6/raw.c
870++++ linux-2.6.32-754.35.1.el6/net/ipv6/raw.c
871871 @@ -59,6 +59,7 @@
872872
873873 #include <linux/proc_fs.h>
@@ -886,8 +886,8 @@
886886
887887 copied = skb->len;
888888 if (copied > len) {
889---- linux-2.6.32-754.33.1.el6.orig/net/ipv6/udp.c
890-+++ linux-2.6.32-754.33.1.el6/net/ipv6/udp.c
889+--- linux-2.6.32-754.35.1.el6.orig/net/ipv6/udp.c
890++++ linux-2.6.32-754.35.1.el6/net/ipv6/udp.c
891891 @@ -50,6 +50,7 @@
892892 #include <linux/proc_fs.h>
893893 #include <linux/seq_file.h>
@@ -906,8 +906,8 @@
906906
907907 ulen = skb->len - sizeof(struct udphdr);
908908 copied = len;
909---- linux-2.6.32-754.33.1.el6.orig/net/socket.c
910-+++ linux-2.6.32-754.33.1.el6/net/socket.c
909+--- linux-2.6.32-754.35.1.el6.orig/net/socket.c
910++++ linux-2.6.32-754.35.1.el6/net/socket.c
911911 @@ -101,6 +101,7 @@
912912 #ifndef __GENKSYMS__
913913 #include <net/busy_poll.h>
@@ -977,8 +977,8 @@
977977 if (err)
978978 goto out_put;
979979
980---- linux-2.6.32-754.33.1.el6.orig/net/unix/af_unix.c
981-+++ linux-2.6.32-754.33.1.el6/net/unix/af_unix.c
980+--- linux-2.6.32-754.35.1.el6.orig/net/unix/af_unix.c
981++++ linux-2.6.32-754.35.1.el6/net/unix/af_unix.c
982982 @@ -115,6 +115,7 @@
983983 #include <linux/mount.h>
984984 #include <net/checksum.h>
@@ -998,8 +998,8 @@
998998 if (err)
999999 goto out_mknod_dput;
10001000 err = vfs_mknod(nd.path.dentry->d_inode, dentry, mode, 0);
1001---- linux-2.6.32-754.33.1.el6.orig/security/Kconfig
1002-+++ linux-2.6.32-754.33.1.el6/security/Kconfig
1001+--- linux-2.6.32-754.35.1.el6.orig/security/Kconfig
1002++++ linux-2.6.32-754.35.1.el6/security/Kconfig
10031003 @@ -188,5 +188,7 @@ source security/tomoyo/Kconfig
10041004
10051005 source security/integrity/ima/Kconfig
@@ -1008,8 +1008,8 @@
10081008 +
10091009 endmenu
10101010
1011---- linux-2.6.32-754.33.1.el6.orig/security/Makefile
1012-+++ linux-2.6.32-754.33.1.el6/security/Makefile
1011+--- linux-2.6.32-754.35.1.el6.orig/security/Makefile
1012++++ linux-2.6.32-754.35.1.el6/security/Makefile
10131013 @@ -25,3 +25,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
10141014 # Object integrity file lists
10151015 subdir-$(CONFIG_IMA) += integrity/ima
--- trunk/1.7.x/ccs-patch/specs/build-c6-2.6.32.sh (revision 6840)
+++ trunk/1.7.x/ccs-patch/specs/build-c6-2.6.32.sh (revision 6841)
@@ -10,12 +10,12 @@
1010
1111 cd /tmp/ || die "Can't chdir to /tmp/ ."
1212
13-if [ ! -r kernel-2.6.32-754.33.1.el6.src.rpm ]
13+if [ ! -r kernel-2.6.32-754.35.1.el6.src.rpm ]
1414 then
15- wget http://vault.centos.org/centos/6/updates/Source/SPackages/kernel-2.6.32-754.33.1.el6.src.rpm || die "Can't download source package."
15+ wget http://vault.centos.org/centos/6/updates/Source/SPackages/kernel-2.6.32-754.35.1.el6.src.rpm || die "Can't download source package."
1616 fi
17-LANG=C rpm --checksig kernel-2.6.32-754.33.1.el6.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature."
18-rpm -ivh kernel-2.6.32-754.33.1.el6.src.rpm || die "Can't install source package."
17+LANG=C rpm --checksig kernel-2.6.32-754.35.1.el6.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature."
18+rpm -ivh kernel-2.6.32-754.35.1.el6.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.7.3-20171111.tar.gz ]
@@ -35,7 +35,7 @@
3535 -# % define buildid .local
3636 +%define buildid _tomoyo_1.7.3p5
3737
38- %define distro_build 754.33.1
38+ %define distro_build 754.35.1
3939 %define kabi_build 754
4040 @@ -438,7 +438,7 @@
4141 # Packages that need to be installed before the kernel is, because the %post
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-2.6.32-centos-6.diff (revision 6840)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-2.6.32-centos-6.diff (revision 6841)
@@ -1,6 +1,6 @@
11 This is TOMOYO Linux patch for CentOS 6.
22
3-Source code for this patch is http://vault.centos.org/centos/6/updates/Source/SPackages/kernel-2.6.32-754.33.1.el6.src.rpm
3+Source code for this patch is http://vault.centos.org/centos/6/updates/Source/SPackages/kernel-2.6.32-754.35.1.el6.src.rpm
44 ---
55 fs/compat.c | 2 +-
66 fs/compat_ioctl.c | 3 +++
@@ -37,8 +37,8 @@
3737 security/Makefile | 3 +++
3838 33 files changed, 201 insertions(+), 2 deletions(-)
3939
40---- linux-2.6.32-754.33.1.el6.orig/fs/compat.c
41-+++ linux-2.6.32-754.33.1.el6/fs/compat.c
40+--- linux-2.6.32-754.35.1.el6.orig/fs/compat.c
41++++ linux-2.6.32-754.35.1.el6/fs/compat.c
4242 @@ -1524,7 +1524,7 @@ int compat_do_execve(const char * filena
4343 if (retval < 0)
4444 goto out;
@@ -48,8 +48,8 @@
4848 if (retval < 0)
4949 goto out;
5050
51---- linux-2.6.32-754.33.1.el6.orig/fs/compat_ioctl.c
52-+++ linux-2.6.32-754.33.1.el6/fs/compat_ioctl.c
51+--- linux-2.6.32-754.35.1.el6.orig/fs/compat_ioctl.c
52++++ linux-2.6.32-754.35.1.el6/fs/compat_ioctl.c
5353 @@ -114,6 +114,7 @@
5454 #ifdef CONFIG_SPARC
5555 #include <asm/fbio.h>
@@ -67,8 +67,8 @@
6767 if (error)
6868 goto out_fput;
6969
70---- linux-2.6.32-754.33.1.el6.orig/fs/exec.c
71-+++ linux-2.6.32-754.33.1.el6/fs/exec.c
70+--- linux-2.6.32-754.35.1.el6.orig/fs/exec.c
71++++ linux-2.6.32-754.35.1.el6/fs/exec.c
7272 @@ -1511,7 +1511,7 @@ int do_execve(const char * filename,
7373 goto out;
7474
@@ -78,8 +78,8 @@
7878 if (retval < 0)
7979 goto out;
8080
81---- linux-2.6.32-754.33.1.el6.orig/fs/fcntl.c
82-+++ linux-2.6.32-754.33.1.el6/fs/fcntl.c
81+--- linux-2.6.32-754.35.1.el6.orig/fs/fcntl.c
82++++ linux-2.6.32-754.35.1.el6/fs/fcntl.c
8383 @@ -431,6 +431,8 @@ SYSCALL_DEFINE3(fcntl, unsigned int, fd,
8484 goto out;
8585
@@ -98,8 +98,8 @@
9898 if (err) {
9999 fput(filp);
100100 return err;
101---- linux-2.6.32-754.33.1.el6.orig/fs/ioctl.c
102-+++ linux-2.6.32-754.33.1.el6/fs/ioctl.c
101+--- linux-2.6.32-754.35.1.el6.orig/fs/ioctl.c
102++++ linux-2.6.32-754.35.1.el6/fs/ioctl.c
103103 @@ -639,6 +639,8 @@ SYSCALL_DEFINE3(ioctl, unsigned int, fd,
104104 goto out;
105105
@@ -109,8 +109,8 @@
109109 if (error)
110110 goto out_fput;
111111
112---- linux-2.6.32-754.33.1.el6.orig/fs/namei.c
113-+++ linux-2.6.32-754.33.1.el6/fs/namei.c
112+--- linux-2.6.32-754.35.1.el6.orig/fs/namei.c
113++++ linux-2.6.32-754.35.1.el6/fs/namei.c
114114 @@ -2070,6 +2070,11 @@ int may_open(struct path *path, int acc_
115115 if (flag & O_NOATIME && !is_owner_or_cap(inode))
116116 return -EPERM;
@@ -198,8 +198,8 @@
198198 if (error)
199199 goto exit5;
200200 error = vfs_rename(old_dir->d_inode, old_dentry,
201---- linux-2.6.32-754.33.1.el6.orig/fs/namespace.c
202-+++ linux-2.6.32-754.33.1.el6/fs/namespace.c
201+--- linux-2.6.32-754.35.1.el6.orig/fs/namespace.c
202++++ linux-2.6.32-754.35.1.el6/fs/namespace.c
203203 @@ -1097,6 +1097,8 @@ static int do_umount(struct vfsmount *mn
204204 LIST_HEAD(umount_list);
205205
@@ -236,8 +236,8 @@
236236 if (error) {
237237 path_put(&old);
238238 goto out1;
239---- linux-2.6.32-754.33.1.el6.orig/fs/open.c
240-+++ linux-2.6.32-754.33.1.el6/fs/open.c
239+--- linux-2.6.32-754.35.1.el6.orig/fs/open.c
240++++ linux-2.6.32-754.35.1.el6/fs/open.c
241241 @@ -103,6 +103,8 @@ long vfs_truncate(struct path *path, lof
242242 error = locks_verify_truncate(inode, NULL, length);
243243 if (!error)
@@ -328,8 +328,8 @@
328328 if (capable(CAP_SYS_TTY_CONFIG)) {
329329 tty_vhangup_self();
330330 return 0;
331---- linux-2.6.32-754.33.1.el6.orig/fs/proc/version.c
332-+++ linux-2.6.32-754.33.1.el6/fs/proc/version.c
331+--- linux-2.6.32-754.35.1.el6.orig/fs/proc/version.c
332++++ linux-2.6.32-754.35.1.el6/fs/proc/version.c
333333 @@ -32,3 +32,10 @@ static int __init proc_version_init(void
334334 return 0;
335335 }
@@ -337,12 +337,12 @@
337337 +
338338 +static int __init ccs_show_version(void)
339339 +{
340-+ printk(KERN_INFO "Hook version: 2.6.32-754.33.1.el6 2020/08/26\n");
340++ printk(KERN_INFO "Hook version: 2.6.32-754.35.1.el6 2020/11/10\n");
341341 + return 0;
342342 +}
343343 +module_init(ccs_show_version);
344---- linux-2.6.32-754.33.1.el6.orig/fs/stat.c
345-+++ linux-2.6.32-754.33.1.el6/fs/stat.c
344+--- linux-2.6.32-754.35.1.el6.orig/fs/stat.c
345++++ linux-2.6.32-754.35.1.el6/fs/stat.c
346346 @@ -43,6 +43,8 @@ int vfs_getattr(struct vfsmount *mnt, st
347347 int retval;
348348
@@ -352,8 +352,8 @@
352352 if (retval)
353353 return retval;
354354
355---- linux-2.6.32-754.33.1.el6.orig/include/linux/init_task.h
356-+++ linux-2.6.32-754.33.1.el6/include/linux/init_task.h
355+--- linux-2.6.32-754.35.1.el6.orig/include/linux/init_task.h
356++++ linux-2.6.32-754.35.1.el6/include/linux/init_task.h
357357 @@ -123,6 +123,14 @@ extern struct cred init_cred;
358358 # define INIT_PERF_EVENTS(tsk)
359359 #endif
@@ -377,8 +377,8 @@
377377 }
378378
379379
380---- linux-2.6.32-754.33.1.el6.orig/include/linux/sched.h
381-+++ linux-2.6.32-754.33.1.el6/include/linux/sched.h
380+--- linux-2.6.32-754.35.1.el6.orig/include/linux/sched.h
381++++ linux-2.6.32-754.35.1.el6/include/linux/sched.h
382382 @@ -43,6 +43,8 @@
383383
384384 #ifdef __KERNEL__
@@ -399,8 +399,8 @@
399399 };
400400
401401 /* Future-safe accessor for struct task_struct's cpus_allowed. */
402---- linux-2.6.32-754.33.1.el6.orig/include/linux/security.h
403-+++ linux-2.6.32-754.33.1.el6/include/linux/security.h
402+--- linux-2.6.32-754.35.1.el6.orig/include/linux/security.h
403++++ linux-2.6.32-754.35.1.el6/include/linux/security.h
404404 @@ -35,6 +35,7 @@
405405 #include <linux/xfrm.h>
406406 #include <linux/gfp.h>
@@ -409,8 +409,8 @@
409409
410410 /* Maximum number of letters for an LSM name string */
411411 #define SECURITY_NAME_MAX 10
412---- linux-2.6.32-754.33.1.el6.orig/include/net/ip.h
413-+++ linux-2.6.32-754.33.1.el6/include/net/ip.h
412+--- linux-2.6.32-754.35.1.el6.orig/include/net/ip.h
413++++ linux-2.6.32-754.35.1.el6/include/net/ip.h
414414 @@ -33,6 +33,7 @@
415415 #endif
416416 #include <net/snmp.h>
@@ -428,8 +428,8 @@
428428 return test_bit(port, sysctl_local_reserved_ports);
429429 }
430430
431---- linux-2.6.32-754.33.1.el6.orig/kernel/compat.c
432-+++ linux-2.6.32-754.33.1.el6/kernel/compat.c
431+--- linux-2.6.32-754.35.1.el6.orig/kernel/compat.c
432++++ linux-2.6.32-754.35.1.el6/kernel/compat.c
433433 @@ -1005,6 +1005,8 @@ asmlinkage long compat_sys_stime(compat_
434434 err = security_settime(&tv, NULL);
435435 if (err)
@@ -439,8 +439,8 @@
439439
440440 do_settimeofday(&tv);
441441 return 0;
442---- linux-2.6.32-754.33.1.el6.orig/kernel/fork.c
443-+++ linux-2.6.32-754.33.1.el6/kernel/fork.c
442+--- linux-2.6.32-754.35.1.el6.orig/kernel/fork.c
443++++ linux-2.6.32-754.35.1.el6/kernel/fork.c
444444 @@ -206,6 +206,7 @@ void __put_task_struct(struct task_struc
445445 exit_creds(tsk);
446446 delayacct_tsk_free(tsk);
@@ -467,8 +467,8 @@
467467 bad_fork_cleanup_perf:
468468 perf_event_free_task(p);
469469 bad_fork_cleanup_policy:
470---- linux-2.6.32-754.33.1.el6.orig/kernel/kexec.c
471-+++ linux-2.6.32-754.33.1.el6/kernel/kexec.c
470+--- linux-2.6.32-754.35.1.el6.orig/kernel/kexec.c
471++++ linux-2.6.32-754.35.1.el6/kernel/kexec.c
472472 @@ -41,6 +41,7 @@
473473 #include <asm/system.h>
474474 #include <asm/sections.h>
@@ -486,8 +486,8 @@
486486
487487 if (kexec_load_disabled)
488488 return -EPERM;
489---- linux-2.6.32-754.33.1.el6.orig/kernel/module.c
490-+++ linux-2.6.32-754.33.1.el6/kernel/module.c
489+--- linux-2.6.32-754.35.1.el6.orig/kernel/module.c
490++++ linux-2.6.32-754.35.1.el6/kernel/module.c
491491 @@ -57,6 +57,7 @@
492492 #include <linux/percpu.h>
493493 #include <linux/kmemleak.h>
@@ -514,8 +514,8 @@
514514
515515 /*
516516 * Make sure we don't speculate past the CAP_SYS_MODULE check. The
517---- linux-2.6.32-754.33.1.el6.orig/kernel/ptrace.c
518-+++ linux-2.6.32-754.33.1.el6/kernel/ptrace.c
517+--- linux-2.6.32-754.35.1.el6.orig/kernel/ptrace.c
518++++ linux-2.6.32-754.35.1.el6/kernel/ptrace.c
519519 @@ -199,6 +199,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
520520 {
521521 struct task_struct *child;
@@ -540,8 +540,8 @@
540540
541541 if (request == PTRACE_TRACEME) {
542542 ret = ptrace_traceme();
543---- linux-2.6.32-754.33.1.el6.orig/kernel/sched.c
544-+++ linux-2.6.32-754.33.1.el6/kernel/sched.c
543+--- linux-2.6.32-754.35.1.el6.orig/kernel/sched.c
544++++ linux-2.6.32-754.35.1.el6/kernel/sched.c
545545 @@ -6869,6 +6869,8 @@ int can_nice(const struct task_struct *p
546546 SYSCALL_DEFINE1(nice, int, increment)
547547 {
@@ -551,8 +551,8 @@
551551
552552 /*
553553 * Setpriority might change our priority at the same moment.
554---- linux-2.6.32-754.33.1.el6.orig/kernel/signal.c
555-+++ linux-2.6.32-754.33.1.el6/kernel/signal.c
554+--- linux-2.6.32-754.35.1.el6.orig/kernel/signal.c
555++++ linux-2.6.32-754.35.1.el6/kernel/signal.c
556556 @@ -2316,6 +2316,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
557557 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
558558 {
@@ -598,8 +598,8 @@
598598
599599 return do_send_specific(tgid, pid, sig, info);
600600 }
601---- linux-2.6.32-754.33.1.el6.orig/kernel/sys.c
602-+++ linux-2.6.32-754.33.1.el6/kernel/sys.c
601+--- linux-2.6.32-754.35.1.el6.orig/kernel/sys.c
602++++ linux-2.6.32-754.35.1.el6/kernel/sys.c
603603 @@ -163,6 +163,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
604604
605605 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -638,8 +638,8 @@
638638
639639 down_write(&uts_sem);
640640 errno = -EFAULT;
641---- linux-2.6.32-754.33.1.el6.orig/kernel/sysctl.c
642-+++ linux-2.6.32-754.33.1.el6/kernel/sysctl.c
641+--- linux-2.6.32-754.35.1.el6.orig/kernel/sysctl.c
642++++ linux-2.6.32-754.35.1.el6/kernel/sysctl.c
643643 @@ -2154,6 +2154,9 @@ int do_sysctl(int __user *name, int nlen
644644
645645 for (head = sysctl_head_next(NULL); head;
@@ -650,8 +650,8 @@
650650 error = parse_table(name, nlen, oldval, oldlenp,
651651 newval, newlen,
652652 head->root, head->ctl_table);
653---- linux-2.6.32-754.33.1.el6.orig/kernel/time.c
654-+++ linux-2.6.32-754.33.1.el6/kernel/time.c
653+--- linux-2.6.32-754.35.1.el6.orig/kernel/time.c
654++++ linux-2.6.32-754.35.1.el6/kernel/time.c
655655 @@ -92,6 +92,8 @@ SYSCALL_DEFINE1(stime, time_t __user *,
656656 err = security_settime(&tv, NULL);
657657 if (err)
@@ -670,8 +670,8 @@
670670
671671 if (tz) {
672672 /* SMP safe, global irq locking makes it work. */
673---- linux-2.6.32-754.33.1.el6.orig/kernel/time/ntp.c
674-+++ linux-2.6.32-754.33.1.el6/kernel/time/ntp.c
673+--- linux-2.6.32-754.35.1.el6.orig/kernel/time/ntp.c
674++++ linux-2.6.32-754.35.1.el6/kernel/time/ntp.c
675675 @@ -14,6 +14,7 @@
676676 #include <linux/timex.h>
677677 #include <linux/time.h>
@@ -696,8 +696,8 @@
696696
697697 /*
698698 * if the quartz is off by more than 10% then
699---- linux-2.6.32-754.33.1.el6.orig/net/ipv4/raw.c
700-+++ linux-2.6.32-754.33.1.el6/net/ipv4/raw.c
699+--- linux-2.6.32-754.35.1.el6.orig/net/ipv4/raw.c
700++++ linux-2.6.32-754.35.1.el6/net/ipv4/raw.c
701701 @@ -77,6 +77,7 @@
702702 #include <linux/seq_file.h>
703703 #include <linux/netfilter.h>
@@ -717,8 +717,8 @@
717717
718718 copied = skb->len;
719719 if (len < copied) {
720---- linux-2.6.32-754.33.1.el6.orig/net/ipv4/udp.c
721-+++ linux-2.6.32-754.33.1.el6/net/ipv4/udp.c
720+--- linux-2.6.32-754.35.1.el6.orig/net/ipv4/udp.c
721++++ linux-2.6.32-754.35.1.el6/net/ipv4/udp.c
722722 @@ -108,6 +108,7 @@
723723 #include <trace/events/udp.h>
724724 #include <net/busy_poll.h>
@@ -738,8 +738,8 @@
738738
739739 ulen = skb->len - sizeof(struct udphdr);
740740 copied = len;
741---- linux-2.6.32-754.33.1.el6.orig/net/ipv6/raw.c
742-+++ linux-2.6.32-754.33.1.el6/net/ipv6/raw.c
741+--- linux-2.6.32-754.35.1.el6.orig/net/ipv6/raw.c
742++++ linux-2.6.32-754.35.1.el6/net/ipv6/raw.c
743743 @@ -59,6 +59,7 @@
744744
745745 #include <linux/proc_fs.h>
@@ -759,8 +759,8 @@
759759
760760 copied = skb->len;
761761 if (copied > len) {
762---- linux-2.6.32-754.33.1.el6.orig/net/ipv6/udp.c
763-+++ linux-2.6.32-754.33.1.el6/net/ipv6/udp.c
762+--- linux-2.6.32-754.35.1.el6.orig/net/ipv6/udp.c
763++++ linux-2.6.32-754.35.1.el6/net/ipv6/udp.c
764764 @@ -50,6 +50,7 @@
765765 #include <linux/proc_fs.h>
766766 #include <linux/seq_file.h>
@@ -780,8 +780,8 @@
780780
781781 ulen = skb->len - sizeof(struct udphdr);
782782 copied = len;
783---- linux-2.6.32-754.33.1.el6.orig/net/socket.c
784-+++ linux-2.6.32-754.33.1.el6/net/socket.c
783+--- linux-2.6.32-754.35.1.el6.orig/net/socket.c
784++++ linux-2.6.32-754.35.1.el6/net/socket.c
785785 @@ -579,6 +579,8 @@ static inline int __sock_sendmsg(struct
786786 struct msghdr *msg, size_t size)
787787 {
@@ -842,8 +842,8 @@
842842 if (err)
843843 goto out_put;
844844
845---- linux-2.6.32-754.33.1.el6.orig/net/unix/af_unix.c
846-+++ linux-2.6.32-754.33.1.el6/net/unix/af_unix.c
845+--- linux-2.6.32-754.35.1.el6.orig/net/unix/af_unix.c
846++++ linux-2.6.32-754.35.1.el6/net/unix/af_unix.c
847847 @@ -984,6 +984,9 @@ static int unix_bind(struct socket *sock
848848 mode = S_IFSOCK |
849849 (SOCK_INODE(sock)->i_mode & ~current_umask());
@@ -865,8 +865,8 @@
865865 if (msg->msg_name)
866866 unix_copy_addr(msg, skb->sk);
867867
868---- linux-2.6.32-754.33.1.el6.orig/security/Kconfig
869-+++ linux-2.6.32-754.33.1.el6/security/Kconfig
868+--- linux-2.6.32-754.35.1.el6.orig/security/Kconfig
869++++ linux-2.6.32-754.35.1.el6/security/Kconfig
870870 @@ -188,5 +188,7 @@ source security/tomoyo/Kconfig
871871
872872 source security/integrity/ima/Kconfig
@@ -875,8 +875,8 @@
875875 +
876876 endmenu
877877
878---- linux-2.6.32-754.33.1.el6.orig/security/Makefile
879-+++ linux-2.6.32-754.33.1.el6/security/Makefile
878+--- linux-2.6.32-754.35.1.el6.orig/security/Makefile
879++++ linux-2.6.32-754.35.1.el6/security/Makefile
880880 @@ -25,3 +25,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
881881 # Object integrity file lists
882882 subdir-$(CONFIG_IMA) += integrity/ima
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.14.diff (revision 6840)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.14.diff (revision 6841)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.14.203.
1+This is TOMOYO Linux patch for kernel 4.14.205.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.203.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.205.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.203.orig/fs/exec.c
32-+++ linux-4.14.203/fs/exec.c
31+--- linux-4.14.205.orig/fs/exec.c
32++++ linux-4.14.205/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.203.orig/fs/open.c
43-+++ linux-4.14.203/fs/open.c
42+--- linux-4.14.205.orig/fs/open.c
43++++ linux-4.14.205/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.203.orig/fs/proc/version.c
54-+++ linux-4.14.203/fs/proc/version.c
53+--- linux-4.14.205.orig/fs/proc/version.c
54++++ linux-4.14.205/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.203 2020/11/03\n");
62++ printk(KERN_INFO "Hook version: 4.14.205 2020/11/10\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.14.203.orig/include/linux/init_task.h
67-+++ linux-4.14.203/include/linux/init_task.h
66+--- linux-4.14.205.orig/include/linux/init_task.h
67++++ linux-4.14.205/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.203.orig/include/linux/sched.h
92-+++ linux-4.14.203/include/linux/sched.h
91+--- linux-4.14.205.orig/include/linux/sched.h
92++++ linux-4.14.205/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.203.orig/include/linux/security.h
113-+++ linux-4.14.203/include/linux/security.h
112+--- linux-4.14.205.orig/include/linux/security.h
113++++ linux-4.14.205/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.203.orig/include/net/ip.h
335-+++ linux-4.14.203/include/net/ip.h
334+--- linux-4.14.205.orig/include/net/ip.h
335++++ linux-4.14.205/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.203.orig/kernel/kexec.c
355-+++ linux-4.14.203/kernel/kexec.c
354+--- linux-4.14.205.orig/kernel/kexec.c
355++++ linux-4.14.205/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.203.orig/kernel/module.c
375-+++ linux-4.14.203/kernel/module.c
374+--- linux-4.14.205.orig/kernel/module.c
375++++ linux-4.14.205/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.203.orig/kernel/ptrace.c
403-+++ linux-4.14.203/kernel/ptrace.c
402+--- linux-4.14.205.orig/kernel/ptrace.c
403++++ linux-4.14.205/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.203.orig/kernel/reboot.c
429-+++ linux-4.14.203/kernel/reboot.c
428+--- linux-4.14.205.orig/kernel/reboot.c
429++++ linux-4.14.205/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.203.orig/kernel/sched/core.c
448-+++ linux-4.14.203/kernel/sched/core.c
447+--- linux-4.14.205.orig/kernel/sched/core.c
448++++ linux-4.14.205/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.203.orig/kernel/signal.c
459-+++ linux-4.14.203/kernel/signal.c
458+--- linux-4.14.205.orig/kernel/signal.c
459++++ linux-4.14.205/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.203.orig/kernel/sys.c
506-+++ linux-4.14.203/kernel/sys.c
505+--- linux-4.14.205.orig/kernel/sys.c
506++++ linux-4.14.205/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.203.orig/kernel/time/ntp.c
537-+++ linux-4.14.203/kernel/time/ntp.c
536+--- linux-4.14.205.orig/kernel/time/ntp.c
537++++ linux-4.14.205/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.203.orig/net/ipv4/raw.c
572-+++ linux-4.14.203/net/ipv4/raw.c
571+--- linux-4.14.205.orig/net/ipv4/raw.c
572++++ linux-4.14.205/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.203.orig/net/ipv4/udp.c
585-+++ linux-4.14.203/net/ipv4/udp.c
584+--- linux-4.14.205.orig/net/ipv4/udp.c
585++++ linux-4.14.205/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.203.orig/net/ipv6/raw.c
596-+++ linux-4.14.203/net/ipv6/raw.c
595+--- linux-4.14.205.orig/net/ipv6/raw.c
596++++ linux-4.14.205/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.203.orig/net/ipv6/udp.c
609-+++ linux-4.14.203/net/ipv6/udp.c
608+--- linux-4.14.205.orig/net/ipv6/udp.c
609++++ linux-4.14.205/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.203.orig/net/socket.c
620-+++ linux-4.14.203/net/socket.c
619+--- linux-4.14.205.orig/net/socket.c
620++++ linux-4.14.205/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.203.orig/net/unix/af_unix.c
633-+++ linux-4.14.203/net/unix/af_unix.c
632+--- linux-4.14.205.orig/net/unix/af_unix.c
633++++ linux-4.14.205/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.203.orig/security/Kconfig
654-+++ linux-4.14.203/security/Kconfig
653+--- linux-4.14.205.orig/security/Kconfig
654++++ linux-4.14.205/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.203.orig/security/Makefile
664-+++ linux-4.14.203/security/Makefile
663+--- linux-4.14.205.orig/security/Makefile
664++++ linux-4.14.205/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.203.orig/security/security.c
673-+++ linux-4.14.203/security/security.c
672+--- linux-4.14.205.orig/security/security.c
673++++ linux-4.14.205/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 6840)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.19.diff (revision 6841)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.19.154.
1+This is TOMOYO Linux patch for kernel 4.19.155.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.154.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.155.tar.xz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,9 +28,9 @@
2828 security/security.c | 9 +++++-
2929 24 files changed, 148 insertions(+), 29 deletions(-)
3030
31---- linux-4.19.154.orig/fs/exec.c
32-+++ linux-4.19.154/fs/exec.c
33-@@ -1694,7 +1694,7 @@ static int exec_binprm(struct linux_binp
31+--- linux-4.19.155.orig/fs/exec.c
32++++ linux-4.19.155/fs/exec.c
33+@@ -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();
3636
@@ -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.154.orig/fs/open.c
43-+++ linux-4.19.154/fs/open.c
42+--- linux-4.19.155.orig/fs/open.c
43++++ linux-4.19.155/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.154.orig/fs/proc/version.c
54-+++ linux-4.19.154/fs/proc/version.c
53+--- linux-4.19.155.orig/fs/proc/version.c
54++++ linux-4.19.155/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.154 2020/11/03\n");
62++ printk(KERN_INFO "Hook version: 4.19.155 2020/11/10\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.19.154.orig/include/linux/sched.h
67-+++ linux-4.19.154/include/linux/sched.h
66+--- linux-4.19.155.orig/include/linux/sched.h
67++++ linux-4.19.155/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.154.orig/include/linux/security.h
88-+++ linux-4.19.154/include/linux/security.h
87+--- linux-4.19.155.orig/include/linux/security.h
88++++ linux-4.19.155/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.154.orig/include/net/ip.h
310-+++ linux-4.19.154/include/net/ip.h
309+--- linux-4.19.155.orig/include/net/ip.h
310++++ linux-4.19.155/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.154.orig/init/init_task.c
330-+++ linux-4.19.154/init/init_task.c
329+--- linux-4.19.155.orig/init/init_task.c
330++++ linux-4.19.155/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.154.orig/kernel/kexec.c
343-+++ linux-4.19.154/kernel/kexec.c
342+--- linux-4.19.155.orig/kernel/kexec.c
343++++ linux-4.19.155/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.154.orig/kernel/module.c
363-+++ linux-4.19.154/kernel/module.c
362+--- linux-4.19.155.orig/kernel/module.c
363++++ linux-4.19.155/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.154.orig/kernel/ptrace.c
391-+++ linux-4.19.154/kernel/ptrace.c
390+--- linux-4.19.155.orig/kernel/ptrace.c
391++++ linux-4.19.155/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.154.orig/kernel/reboot.c
417-+++ linux-4.19.154/kernel/reboot.c
416+--- linux-4.19.155.orig/kernel/reboot.c
417++++ linux-4.19.155/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.154.orig/kernel/sched/core.c
436-+++ linux-4.19.154/kernel/sched/core.c
435+--- linux-4.19.155.orig/kernel/sched/core.c
436++++ linux-4.19.155/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.154.orig/kernel/signal.c
447-+++ linux-4.19.154/kernel/signal.c
446+--- linux-4.19.155.orig/kernel/signal.c
447++++ linux-4.19.155/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.154.orig/kernel/sys.c
494-+++ linux-4.19.154/kernel/sys.c
493+--- linux-4.19.155.orig/kernel/sys.c
494++++ linux-4.19.155/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.154.orig/kernel/time/timekeeping.c
525-+++ linux-4.19.154/kernel/time/timekeeping.c
524+--- linux-4.19.155.orig/kernel/time/timekeeping.c
525++++ linux-4.19.155/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.154.orig/net/ipv4/raw.c
560-+++ linux-4.19.154/net/ipv4/raw.c
559+--- linux-4.19.155.orig/net/ipv4/raw.c
560++++ linux-4.19.155/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.154.orig/net/ipv4/udp.c
573-+++ linux-4.19.154/net/ipv4/udp.c
572+--- linux-4.19.155.orig/net/ipv4/udp.c
573++++ linux-4.19.155/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.154.orig/net/ipv6/raw.c
584-+++ linux-4.19.154/net/ipv6/raw.c
583+--- linux-4.19.155.orig/net/ipv6/raw.c
584++++ linux-4.19.155/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.154.orig/net/ipv6/udp.c
597-+++ linux-4.19.154/net/ipv6/udp.c
596+--- linux-4.19.155.orig/net/ipv6/udp.c
597++++ linux-4.19.155/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.154.orig/net/socket.c
608-+++ linux-4.19.154/net/socket.c
607+--- linux-4.19.155.orig/net/socket.c
608++++ linux-4.19.155/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.154.orig/net/unix/af_unix.c
621-+++ linux-4.19.154/net/unix/af_unix.c
620+--- linux-4.19.155.orig/net/unix/af_unix.c
621++++ linux-4.19.155/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.154.orig/security/Kconfig
642-+++ linux-4.19.154/security/Kconfig
641+--- linux-4.19.155.orig/security/Kconfig
642++++ linux-4.19.155/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.154.orig/security/Makefile
652-+++ linux-4.19.154/security/Makefile
651+--- linux-4.19.155.orig/security/Makefile
652++++ linux-4.19.155/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.154.orig/security/security.c
661-+++ linux-4.19.154/security/security.c
660+--- linux-4.19.155.orig/security/security.c
661++++ linux-4.19.155/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 6840)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.4.diff (revision 6841)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.4.241.
1+This is TOMOYO Linux patch for kernel 4.4.242.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.241.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.242.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.241.orig/fs/exec.c
32-+++ linux-4.4.241/fs/exec.c
31+--- linux-4.4.242.orig/fs/exec.c
32++++ linux-4.4.242/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.241.orig/fs/open.c
43-+++ linux-4.4.241/fs/open.c
42+--- linux-4.4.242.orig/fs/open.c
43++++ linux-4.4.242/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.241.orig/fs/proc/version.c
54-+++ linux-4.4.241/fs/proc/version.c
53+--- linux-4.4.242.orig/fs/proc/version.c
54++++ linux-4.4.242/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.241 2020/11/03\n");
62++ printk(KERN_INFO "Hook version: 4.4.242 2020/11/10\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.4.241.orig/include/linux/init_task.h
67-+++ linux-4.4.241/include/linux/init_task.h
66+--- linux-4.4.242.orig/include/linux/init_task.h
67++++ linux-4.4.242/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.241.orig/include/linux/sched.h
92-+++ linux-4.4.241/include/linux/sched.h
91+--- linux-4.4.242.orig/include/linux/sched.h
92++++ linux-4.4.242/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.241.orig/include/linux/security.h
114-+++ linux-4.4.241/include/linux/security.h
113+--- linux-4.4.242.orig/include/linux/security.h
114++++ linux-4.4.242/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.241.orig/include/net/ip.h
322-+++ linux-4.4.241/include/net/ip.h
321+--- linux-4.4.242.orig/include/net/ip.h
322++++ linux-4.4.242/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.241.orig/kernel/fork.c
342-+++ linux-4.4.241/kernel/fork.c
341+--- linux-4.4.242.orig/kernel/fork.c
342++++ linux-4.4.242/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.241.orig/kernel/kexec.c
370-+++ linux-4.4.241/kernel/kexec.c
369+--- linux-4.4.242.orig/kernel/kexec.c
370++++ linux-4.4.242/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.241.orig/kernel/module.c
390-+++ linux-4.4.241/kernel/module.c
389+--- linux-4.4.242.orig/kernel/module.c
390++++ linux-4.4.242/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.241.orig/kernel/ptrace.c
418-+++ linux-4.4.241/kernel/ptrace.c
417+--- linux-4.4.242.orig/kernel/ptrace.c
418++++ linux-4.4.242/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.241.orig/kernel/reboot.c
444-+++ linux-4.4.241/kernel/reboot.c
443+--- linux-4.4.242.orig/kernel/reboot.c
444++++ linux-4.4.242/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.241.orig/kernel/sched/core.c
463-+++ linux-4.4.241/kernel/sched/core.c
462+--- linux-4.4.242.orig/kernel/sched/core.c
463++++ linux-4.4.242/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.241.orig/kernel/signal.c
474-+++ linux-4.4.241/kernel/signal.c
473+--- linux-4.4.242.orig/kernel/signal.c
474++++ linux-4.4.242/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.241.orig/kernel/sys.c
521-+++ linux-4.4.241/kernel/sys.c
520+--- linux-4.4.242.orig/kernel/sys.c
521++++ linux-4.4.242/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.241.orig/kernel/time/ntp.c
552-+++ linux-4.4.241/kernel/time/ntp.c
551+--- linux-4.4.242.orig/kernel/time/ntp.c
552++++ linux-4.4.242/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.241.orig/net/ipv4/raw.c
587-+++ linux-4.4.241/net/ipv4/raw.c
586+--- linux-4.4.242.orig/net/ipv4/raw.c
587++++ linux-4.4.242/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.241.orig/net/ipv4/udp.c
600-+++ linux-4.4.241/net/ipv4/udp.c
599+--- linux-4.4.242.orig/net/ipv4/udp.c
600++++ linux-4.4.242/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.241.orig/net/ipv6/raw.c
613-+++ linux-4.4.241/net/ipv6/raw.c
612+--- linux-4.4.242.orig/net/ipv6/raw.c
613++++ linux-4.4.242/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.241.orig/net/ipv6/udp.c
626-+++ linux-4.4.241/net/ipv6/udp.c
625+--- linux-4.4.242.orig/net/ipv6/udp.c
626++++ linux-4.4.242/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.241.orig/net/socket.c
639-+++ linux-4.4.241/net/socket.c
638+--- linux-4.4.242.orig/net/socket.c
639++++ linux-4.4.242/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.241.orig/net/unix/af_unix.c
652-+++ linux-4.4.241/net/unix/af_unix.c
651+--- linux-4.4.242.orig/net/unix/af_unix.c
652++++ linux-4.4.242/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.241.orig/security/Kconfig
665-+++ linux-4.4.241/security/Kconfig
664+--- linux-4.4.242.orig/security/Kconfig
665++++ linux-4.4.242/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.241.orig/security/Makefile
675-+++ linux-4.4.241/security/Makefile
674+--- linux-4.4.242.orig/security/Makefile
675++++ linux-4.4.242/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 6840)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.9.diff (revision 6841)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.9.241.
1+This is TOMOYO Linux patch for kernel 4.9.242.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.241.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.242.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.241.orig/fs/exec.c
32-+++ linux-4.9.241/fs/exec.c
31+--- linux-4.9.242.orig/fs/exec.c
32++++ linux-4.9.242/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.241.orig/fs/open.c
43-+++ linux-4.9.241/fs/open.c
42+--- linux-4.9.242.orig/fs/open.c
43++++ linux-4.9.242/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.241.orig/fs/proc/version.c
54-+++ linux-4.9.241/fs/proc/version.c
53+--- linux-4.9.242.orig/fs/proc/version.c
54++++ linux-4.9.242/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.241 2020/11/03\n");
62++ printk(KERN_INFO "Hook version: 4.9.242 2020/11/10\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.9.241.orig/include/linux/init_task.h
67-+++ linux-4.9.241/include/linux/init_task.h
66+--- linux-4.9.242.orig/include/linux/init_task.h
67++++ linux-4.9.242/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.241.orig/include/linux/sched.h
92-+++ linux-4.9.241/include/linux/sched.h
91+--- linux-4.9.242.orig/include/linux/sched.h
92++++ linux-4.9.242/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.241.orig/include/linux/security.h
114-+++ linux-4.9.241/include/linux/security.h
113+--- linux-4.9.242.orig/include/linux/security.h
114++++ linux-4.9.242/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.241.orig/include/net/ip.h
322-+++ linux-4.9.241/include/net/ip.h
321+--- linux-4.9.242.orig/include/net/ip.h
322++++ linux-4.9.242/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.241.orig/kernel/fork.c
342-+++ linux-4.9.241/kernel/fork.c
341+--- linux-4.9.242.orig/kernel/fork.c
342++++ linux-4.9.242/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.241.orig/kernel/kexec.c
370-+++ linux-4.9.241/kernel/kexec.c
369+--- linux-4.9.242.orig/kernel/kexec.c
370++++ linux-4.9.242/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.241.orig/kernel/module.c
390-+++ linux-4.9.241/kernel/module.c
389+--- linux-4.9.242.orig/kernel/module.c
390++++ linux-4.9.242/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.241.orig/kernel/ptrace.c
418-+++ linux-4.9.241/kernel/ptrace.c
417+--- linux-4.9.242.orig/kernel/ptrace.c
418++++ linux-4.9.242/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.241.orig/kernel/reboot.c
444-+++ linux-4.9.241/kernel/reboot.c
443+--- linux-4.9.242.orig/kernel/reboot.c
444++++ linux-4.9.242/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.241.orig/kernel/sched/core.c
463-+++ linux-4.9.241/kernel/sched/core.c
462+--- linux-4.9.242.orig/kernel/sched/core.c
463++++ linux-4.9.242/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.241.orig/kernel/signal.c
474-+++ linux-4.9.241/kernel/signal.c
473+--- linux-4.9.242.orig/kernel/signal.c
474++++ linux-4.9.242/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.241.orig/kernel/sys.c
521-+++ linux-4.9.241/kernel/sys.c
520+--- linux-4.9.242.orig/kernel/sys.c
521++++ linux-4.9.242/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.241.orig/kernel/time/ntp.c
552-+++ linux-4.9.241/kernel/time/ntp.c
551+--- linux-4.9.242.orig/kernel/time/ntp.c
552++++ linux-4.9.242/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.241.orig/net/ipv4/raw.c
587-+++ linux-4.9.241/net/ipv4/raw.c
586+--- linux-4.9.242.orig/net/ipv4/raw.c
587++++ linux-4.9.242/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.241.orig/net/ipv4/udp.c
600-+++ linux-4.9.241/net/ipv4/udp.c
599+--- linux-4.9.242.orig/net/ipv4/udp.c
600++++ linux-4.9.242/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.241.orig/net/ipv6/raw.c
611-+++ linux-4.9.241/net/ipv6/raw.c
610+--- linux-4.9.242.orig/net/ipv6/raw.c
611++++ linux-4.9.242/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.241.orig/net/ipv6/udp.c
624-+++ linux-4.9.241/net/ipv6/udp.c
623+--- linux-4.9.242.orig/net/ipv6/udp.c
624++++ linux-4.9.242/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.241.orig/net/socket.c
635-+++ linux-4.9.241/net/socket.c
634+--- linux-4.9.242.orig/net/socket.c
635++++ linux-4.9.242/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.241.orig/net/unix/af_unix.c
648-+++ linux-4.9.241/net/unix/af_unix.c
647+--- linux-4.9.242.orig/net/unix/af_unix.c
648++++ linux-4.9.242/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.241.orig/security/Kconfig
669-+++ linux-4.9.241/security/Kconfig
668+--- linux-4.9.242.orig/security/Kconfig
669++++ linux-4.9.242/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.241.orig/security/Makefile
679-+++ linux-4.9.241/security/Makefile
678+--- linux-4.9.242.orig/security/Makefile
679++++ linux-4.9.242/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 6840)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-5.10.diff (revision 6841)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 5.10-rc2.
1+This is TOMOYO Linux patch for kernel 5.10-rc3.
22
3-Source code for this patch is https://git.kernel.org/torvalds/t/linux-5.10-rc2.tar.gz
3+Source code for this patch is https://git.kernel.org/torvalds/t/linux-5.10-rc3.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-rc2.orig/fs/exec.c
32-+++ linux-5.10-rc2/fs/exec.c
31+--- linux-5.10-rc3.orig/fs/exec.c
32++++ linux-5.10-rc3/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-rc2.orig/fs/open.c
43-+++ linux-5.10-rc2/fs/open.c
42+--- linux-5.10-rc3.orig/fs/open.c
43++++ linux-5.10-rc3/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-rc2.orig/fs/proc/version.c
54-+++ linux-5.10-rc2/fs/proc/version.c
53+--- linux-5.10-rc3.orig/fs/proc/version.c
54++++ linux-5.10-rc3/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-rc2 2020/11/03\n");
62++ printk(KERN_INFO "Hook version: 5.10-rc3 2020/11/10\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-5.10-rc2.orig/include/linux/sched.h
67-+++ linux-5.10-rc2/include/linux/sched.h
66+--- linux-5.10-rc3.orig/include/linux/sched.h
67++++ linux-5.10-rc3/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-rc2.orig/include/linux/security.h
88-+++ linux-5.10-rc2/include/linux/security.h
87+--- linux-5.10-rc3.orig/include/linux/security.h
88++++ linux-5.10-rc3/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-rc2.orig/include/net/ip.h
319-+++ linux-5.10-rc2/include/net/ip.h
318+--- linux-5.10-rc3.orig/include/net/ip.h
319++++ linux-5.10-rc3/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-rc2.orig/init/init_task.c
339-+++ linux-5.10-rc2/init/init_task.c
338+--- linux-5.10-rc3.orig/init/init_task.c
339++++ linux-5.10-rc3/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-rc2.orig/kernel/kexec.c
352-+++ linux-5.10-rc2/kernel/kexec.c
351+--- linux-5.10-rc3.orig/kernel/kexec.c
352++++ linux-5.10-rc3/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-rc2.orig/kernel/module.c
372-+++ linux-5.10-rc2/kernel/module.c
371+--- linux-5.10-rc3.orig/kernel/module.c
372++++ linux-5.10-rc3/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-rc2.orig/kernel/ptrace.c
400-+++ linux-5.10-rc2/kernel/ptrace.c
399+--- linux-5.10-rc3.orig/kernel/ptrace.c
400++++ linux-5.10-rc3/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-rc2.orig/kernel/reboot.c
426-+++ linux-5.10-rc2/kernel/reboot.c
425+--- linux-5.10-rc3.orig/kernel/reboot.c
426++++ linux-5.10-rc3/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-rc2.orig/kernel/sched/core.c
445-+++ linux-5.10-rc2/kernel/sched/core.c
444+--- linux-5.10-rc3.orig/kernel/sched/core.c
445++++ linux-5.10-rc3/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,9 +452,9 @@
452452
453453 /*
454454 * Setpriority might change our priority at the same moment.
455---- linux-5.10-rc2.orig/kernel/signal.c
456-+++ linux-5.10-rc2/kernel/signal.c
457-@@ -3657,6 +3657,8 @@ static inline void prepare_kill_siginfo(
455+--- linux-5.10-rc3.orig/kernel/signal.c
456++++ linux-5.10-rc3/kernel/signal.c
457+@@ -3658,6 +3658,8 @@ static inline void prepare_kill_siginfo(
458458 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
459459 {
460460 struct kernel_siginfo info;
@@ -463,7 +463,7 @@
463463
464464 prepare_kill_siginfo(sig, &info);
465465
466-@@ -3755,6 +3757,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int,
466+@@ -3756,6 +3758,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int,
467467 if (!access_pidfd_pidns(pid))
468468 goto err;
469469
@@ -485,7 +485,7 @@
485485 if (info) {
486486 ret = copy_siginfo_from_user_any(&kinfo, info);
487487 if (unlikely(ret))
488-@@ -3839,6 +3856,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
488+@@ -3840,6 +3857,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
489489 /* This is only valid for single tasks */
490490 if (pid <= 0 || tgid <= 0)
491491 return -EINVAL;
@@ -494,7 +494,7 @@
494494
495495 return do_tkill(tgid, pid, sig);
496496 }
497-@@ -3855,6 +3874,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
497+@@ -3856,6 +3875,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
498498 /* This is only valid for single tasks */
499499 if (pid <= 0)
500500 return -EINVAL;
@@ -503,7 +503,7 @@
503503
504504 return do_tkill(0, pid, sig);
505505 }
506-@@ -3867,6 +3888,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
506+@@ -3868,6 +3889,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
507507 if ((info->si_code >= 0 || info->si_code == SI_TKILL) &&
508508 (task_pid_vnr(current) != pid))
509509 return -EPERM;
@@ -512,7 +512,7 @@
512512
513513 /* POSIX.1b doesn't mention process groups. */
514514 return kill_proc_info(sig, info, pid);
515-@@ -3914,6 +3937,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
515+@@ -3915,6 +3938,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
516516 if ((info->si_code >= 0 || info->si_code == SI_TKILL) &&
517517 (task_pid_vnr(current) != pid))
518518 return -EPERM;
@@ -521,8 +521,8 @@
521521
522522 return do_send_specific(tgid, pid, sig, info);
523523 }
524---- linux-5.10-rc2.orig/kernel/sys.c
525-+++ linux-5.10-rc2/kernel/sys.c
524+--- linux-5.10-rc3.orig/kernel/sys.c
525++++ linux-5.10-rc3/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-rc2.orig/kernel/time/timekeeping.c
556-+++ linux-5.10-rc2/kernel/time/timekeeping.c
555+--- linux-5.10-rc3.orig/kernel/time/timekeeping.c
556++++ linux-5.10-rc3/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-rc2.orig/net/ipv4/raw.c
591-+++ linux-5.10-rc2/net/ipv4/raw.c
590+--- linux-5.10-rc3.orig/net/ipv4/raw.c
591++++ linux-5.10-rc3/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-rc2.orig/net/ipv4/udp.c
604-+++ linux-5.10-rc2/net/ipv4/udp.c
603+--- linux-5.10-rc3.orig/net/ipv4/udp.c
604++++ linux-5.10-rc3/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-rc2.orig/net/ipv6/raw.c
615-+++ linux-5.10-rc2/net/ipv6/raw.c
614+--- linux-5.10-rc3.orig/net/ipv6/raw.c
615++++ linux-5.10-rc3/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-rc2.orig/net/ipv6/udp.c
628-+++ linux-5.10-rc2/net/ipv6/udp.c
627+--- linux-5.10-rc3.orig/net/ipv6/udp.c
628++++ linux-5.10-rc3/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-rc2.orig/net/socket.c
639-+++ linux-5.10-rc2/net/socket.c
638+--- linux-5.10-rc3.orig/net/socket.c
639++++ linux-5.10-rc3/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-rc2.orig/net/unix/af_unix.c
652-+++ linux-5.10-rc2/net/unix/af_unix.c
651+--- linux-5.10-rc3.orig/net/unix/af_unix.c
652++++ linux-5.10-rc3/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-rc2.orig/security/Kconfig
673-+++ linux-5.10-rc2/security/Kconfig
672+--- linux-5.10-rc3.orig/security/Kconfig
673++++ linux-5.10-rc3/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-rc2.orig/security/Makefile
683-+++ linux-5.10-rc2/security/Makefile
682+--- linux-5.10-rc3.orig/security/Makefile
683++++ linux-5.10-rc3/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-rc2.orig/security/security.c
692-+++ linux-5.10-rc2/security/security.c
691+--- linux-5.10-rc3.orig/security/security.c
692++++ linux-5.10-rc3/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 6840)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-5.4.diff (revision 6841)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 5.4.74.
1+This is TOMOYO Linux patch for kernel 5.4.75.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.74.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.75.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.4.74.orig/fs/exec.c
32-+++ linux-5.4.74/fs/exec.c
33-@@ -1717,7 +1717,7 @@ static int exec_binprm(struct linux_binp
31+--- linux-5.4.75.orig/fs/exec.c
32++++ linux-5.4.75/fs/exec.c
33+@@ -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();
3636
@@ -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.74.orig/fs/open.c
43-+++ linux-5.4.74/fs/open.c
42+--- linux-5.4.75.orig/fs/open.c
43++++ linux-5.4.75/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.74.orig/fs/proc/version.c
54-+++ linux-5.4.74/fs/proc/version.c
53+--- linux-5.4.75.orig/fs/proc/version.c
54++++ linux-5.4.75/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.74 2020/11/03\n");
62++ printk(KERN_INFO "Hook version: 5.4.75 2020/11/10\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-5.4.74.orig/include/linux/sched.h
67-+++ linux-5.4.74/include/linux/sched.h
66+--- linux-5.4.75.orig/include/linux/sched.h
67++++ linux-5.4.75/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.74.orig/include/linux/security.h
88-+++ linux-5.4.74/include/linux/security.h
87+--- linux-5.4.75.orig/include/linux/security.h
88++++ linux-5.4.75/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.74.orig/include/net/ip.h
319-+++ linux-5.4.74/include/net/ip.h
318+--- linux-5.4.75.orig/include/net/ip.h
319++++ linux-5.4.75/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.74.orig/init/init_task.c
339-+++ linux-5.4.74/init/init_task.c
338+--- linux-5.4.75.orig/init/init_task.c
339++++ linux-5.4.75/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.74.orig/kernel/kexec.c
352-+++ linux-5.4.74/kernel/kexec.c
351+--- linux-5.4.75.orig/kernel/kexec.c
352++++ linux-5.4.75/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.74.orig/kernel/module.c
372-+++ linux-5.4.74/kernel/module.c
371+--- linux-5.4.75.orig/kernel/module.c
372++++ linux-5.4.75/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.74.orig/kernel/ptrace.c
400-+++ linux-5.4.74/kernel/ptrace.c
399+--- linux-5.4.75.orig/kernel/ptrace.c
400++++ linux-5.4.75/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.74.orig/kernel/reboot.c
426-+++ linux-5.4.74/kernel/reboot.c
425+--- linux-5.4.75.orig/kernel/reboot.c
426++++ linux-5.4.75/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.74.orig/kernel/sched/core.c
445-+++ linux-5.4.74/kernel/sched/core.c
444+--- linux-5.4.75.orig/kernel/sched/core.c
445++++ linux-5.4.75/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.74.orig/kernel/signal.c
456-+++ linux-5.4.74/kernel/signal.c
455+--- linux-5.4.75.orig/kernel/signal.c
456++++ linux-5.4.75/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.74.orig/kernel/sys.c
525-+++ linux-5.4.74/kernel/sys.c
524+--- linux-5.4.75.orig/kernel/sys.c
525++++ linux-5.4.75/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.74.orig/kernel/time/timekeeping.c
556-+++ linux-5.4.74/kernel/time/timekeeping.c
555+--- linux-5.4.75.orig/kernel/time/timekeeping.c
556++++ linux-5.4.75/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.74.orig/net/ipv4/raw.c
591-+++ linux-5.4.74/net/ipv4/raw.c
590+--- linux-5.4.75.orig/net/ipv4/raw.c
591++++ linux-5.4.75/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.74.orig/net/ipv4/udp.c
604-+++ linux-5.4.74/net/ipv4/udp.c
603+--- linux-5.4.75.orig/net/ipv4/udp.c
604++++ linux-5.4.75/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.74.orig/net/ipv6/raw.c
615-+++ linux-5.4.74/net/ipv6/raw.c
614+--- linux-5.4.75.orig/net/ipv6/raw.c
615++++ linux-5.4.75/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.74.orig/net/ipv6/udp.c
628-+++ linux-5.4.74/net/ipv6/udp.c
627+--- linux-5.4.75.orig/net/ipv6/udp.c
628++++ linux-5.4.75/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.74.orig/net/socket.c
639-+++ linux-5.4.74/net/socket.c
638+--- linux-5.4.75.orig/net/socket.c
639++++ linux-5.4.75/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.74.orig/net/unix/af_unix.c
652-+++ linux-5.4.74/net/unix/af_unix.c
651+--- linux-5.4.75.orig/net/unix/af_unix.c
652++++ linux-5.4.75/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.74.orig/security/Kconfig
673-+++ linux-5.4.74/security/Kconfig
672+--- linux-5.4.75.orig/security/Kconfig
673++++ linux-5.4.75/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.74.orig/security/Makefile
683-+++ linux-5.4.74/security/Makefile
682+--- linux-5.4.75.orig/security/Makefile
683++++ linux-5.4.75/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.74.orig/security/security.c
692-+++ linux-5.4.74/security/security.c
691+--- linux-5.4.75.orig/security/security.c
692++++ linux-5.4.75/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.9.diff (revision 6840)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-5.9.diff (revision 6841)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 5.9.3.
1+This is TOMOYO Linux patch for kernel 5.9.6.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.3.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.6.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.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
31+--- linux-5.9.6.orig/fs/exec.c
32++++ linux-5.9.6/fs/exec.c
33+@@ -1948,7 +1948,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.3.orig/fs/open.c
43-+++ linux-5.9.3/fs/open.c
42+--- linux-5.9.6.orig/fs/open.c
43++++ linux-5.9.6/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.3.orig/fs/proc/version.c
54-+++ linux-5.9.3/fs/proc/version.c
53+--- linux-5.9.6.orig/fs/proc/version.c
54++++ linux-5.9.6/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.3 2020/11/03\n");
62++ printk(KERN_INFO "Hook version: 5.9.6 2020/11/10\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-5.9.3.orig/include/linux/sched.h
67-+++ linux-5.9.3/include/linux/sched.h
66+--- linux-5.9.6.orig/include/linux/sched.h
67++++ linux-5.9.6/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.9.3.orig/include/linux/security.h
88-+++ linux-5.9.3/include/linux/security.h
87+--- linux-5.9.6.orig/include/linux/security.h
88++++ linux-5.9.6/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.3.orig/include/net/ip.h
319-+++ linux-5.9.3/include/net/ip.h
318+--- linux-5.9.6.orig/include/net/ip.h
319++++ linux-5.9.6/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.9.3.orig/init/init_task.c
339-+++ linux-5.9.3/init/init_task.c
338+--- linux-5.9.6.orig/init/init_task.c
339++++ linux-5.9.6/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.9.3.orig/kernel/kexec.c
352-+++ linux-5.9.3/kernel/kexec.c
351+--- linux-5.9.6.orig/kernel/kexec.c
352++++ linux-5.9.6/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.3.orig/kernel/module.c
372-+++ linux-5.9.3/kernel/module.c
371+--- linux-5.9.6.orig/kernel/module.c
372++++ linux-5.9.6/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.9.3.orig/kernel/ptrace.c
400-+++ linux-5.9.3/kernel/ptrace.c
399+--- linux-5.9.6.orig/kernel/ptrace.c
400++++ linux-5.9.6/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.3.orig/kernel/reboot.c
426-+++ linux-5.9.3/kernel/reboot.c
425+--- linux-5.9.6.orig/kernel/reboot.c
426++++ linux-5.9.6/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.3.orig/kernel/sched/core.c
445-+++ linux-5.9.3/kernel/sched/core.c
444+--- linux-5.9.6.orig/kernel/sched/core.c
445++++ linux-5.9.6/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.3.orig/kernel/signal.c
456-+++ linux-5.9.3/kernel/signal.c
455+--- linux-5.9.6.orig/kernel/signal.c
456++++ linux-5.9.6/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.3.orig/kernel/sys.c
525-+++ linux-5.9.3/kernel/sys.c
524+--- linux-5.9.6.orig/kernel/sys.c
525++++ linux-5.9.6/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.3.orig/kernel/time/timekeeping.c
556-+++ linux-5.9.3/kernel/time/timekeeping.c
555+--- linux-5.9.6.orig/kernel/time/timekeeping.c
556++++ linux-5.9.6/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.3.orig/net/ipv4/raw.c
591-+++ linux-5.9.3/net/ipv4/raw.c
590+--- linux-5.9.6.orig/net/ipv4/raw.c
591++++ linux-5.9.6/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.3.orig/net/ipv4/udp.c
604-+++ linux-5.9.3/net/ipv4/udp.c
603+--- linux-5.9.6.orig/net/ipv4/udp.c
604++++ linux-5.9.6/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.3.orig/net/ipv6/raw.c
615-+++ linux-5.9.3/net/ipv6/raw.c
614+--- linux-5.9.6.orig/net/ipv6/raw.c
615++++ linux-5.9.6/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.3.orig/net/ipv6/udp.c
628-+++ linux-5.9.3/net/ipv6/udp.c
627+--- linux-5.9.6.orig/net/ipv6/udp.c
628++++ linux-5.9.6/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.3.orig/net/socket.c
639-+++ linux-5.9.3/net/socket.c
638+--- linux-5.9.6.orig/net/socket.c
639++++ linux-5.9.6/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.3.orig/net/unix/af_unix.c
652-+++ linux-5.9.3/net/unix/af_unix.c
651+--- linux-5.9.6.orig/net/unix/af_unix.c
652++++ linux-5.9.6/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.3.orig/security/Kconfig
673-+++ linux-5.9.3/security/Kconfig
672+--- linux-5.9.6.orig/security/Kconfig
673++++ linux-5.9.6/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.3.orig/security/Makefile
683-+++ linux-5.9.3/security/Makefile
682+--- linux-5.9.6.orig/security/Makefile
683++++ linux-5.9.6/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.3.orig/security/security.c
692-+++ linux-5.9.3/security/security.c
691+--- linux-5.9.6.orig/security/security.c
692++++ linux-5.9.6/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-c6-2.6.32.sh (revision 6840)
+++ trunk/1.8.x/ccs-patch/specs/build-c6-2.6.32.sh (revision 6841)
@@ -10,12 +10,12 @@
1010
1111 cd /tmp/ || die "Can't chdir to /tmp/ ."
1212
13-if [ ! -r kernel-2.6.32-754.33.1.el6.src.rpm ]
13+if [ ! -r kernel-2.6.32-754.35.1.el6.src.rpm ]
1414 then
15- wget http://vault.centos.org/centos/6/updates/Source/SPackages/kernel-2.6.32-754.33.1.el6.src.rpm || die "Can't download source package."
15+ wget http://vault.centos.org/centos/6/updates/Source/SPackages/kernel-2.6.32-754.35.1.el6.src.rpm || die "Can't download source package."
1616 fi
17-LANG=C rpm --checksig kernel-2.6.32-754.33.1.el6.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature."
18-rpm -ivh kernel-2.6.32-754.33.1.el6.src.rpm || die "Can't install source package."
17+LANG=C rpm --checksig kernel-2.6.32-754.35.1.el6.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature."
18+rpm -ivh kernel-2.6.32-754.35.1.el6.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,7 +35,7 @@
3535 -# % define buildid .local
3636 +%define buildid _tomoyo_1.8.7p2
3737
38- %define distro_build 754.33.1
38+ %define distro_build 754.35.1
3939 %define kabi_build 754
4040 @@ -438,7 +438,7 @@
4141 # Packages that need to be installed before the kernel is, because the %post
旧リポジトリブラウザで表示