(empty log message)
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 4.14.210. | |
1 | +This is TOMOYO Linux patch for kernel 4.14.211. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.210.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.211.tar.xz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 - |
6 | 6 | fs/open.c | 2 + |
@@ -28,8 +28,8 @@ | ||
28 | 28 | security/security.c | 9 +++++- |
29 | 29 | 24 files changed, 153 insertions(+), 29 deletions(-) |
30 | 30 | |
31 | ---- linux-4.14.210.orig/fs/exec.c | |
32 | -+++ linux-4.14.210/fs/exec.c | |
31 | +--- linux-4.14.211.orig/fs/exec.c | |
32 | ++++ linux-4.14.211/fs/exec.c | |
33 | 33 | @@ -1692,7 +1692,7 @@ static int exec_binprm(struct linux_binp |
34 | 34 | old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent)); |
35 | 35 | rcu_read_unlock(); |
@@ -39,8 +39,8 @@ | ||
39 | 39 | if (ret >= 0) { |
40 | 40 | audit_bprm(bprm); |
41 | 41 | trace_sched_process_exec(current, old_pid, bprm); |
42 | ---- linux-4.14.210.orig/fs/open.c | |
43 | -+++ linux-4.14.210/fs/open.c | |
42 | +--- linux-4.14.211.orig/fs/open.c | |
43 | ++++ linux-4.14.211/fs/open.c | |
44 | 44 | @@ -1193,6 +1193,8 @@ EXPORT_SYMBOL(sys_close); |
45 | 45 | */ |
46 | 46 | SYSCALL_DEFINE0(vhangup) |
@@ -50,8 +50,8 @@ | ||
50 | 50 | if (capable(CAP_SYS_TTY_CONFIG)) { |
51 | 51 | tty_vhangup_self(); |
52 | 52 | return 0; |
53 | ---- linux-4.14.210.orig/fs/proc/version.c | |
54 | -+++ linux-4.14.210/fs/proc/version.c | |
53 | +--- linux-4.14.211.orig/fs/proc/version.c | |
54 | ++++ linux-4.14.211/fs/proc/version.c | |
55 | 55 | @@ -33,3 +33,10 @@ static int __init proc_version_init(void |
56 | 56 | return 0; |
57 | 57 | } |
@@ -59,12 +59,12 @@ | ||
59 | 59 | + |
60 | 60 | +static int __init ccs_show_version(void) |
61 | 61 | +{ |
62 | -+ printk(KERN_INFO "Hook version: 4.14.210 2020/12/02\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.14.211 2020/12/08\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-4.14.210.orig/include/linux/init_task.h | |
67 | -+++ linux-4.14.210/include/linux/init_task.h | |
66 | +--- linux-4.14.211.orig/include/linux/init_task.h | |
67 | ++++ linux-4.14.211/include/linux/init_task.h | |
68 | 68 | @@ -219,6 +219,14 @@ extern struct cred init_cred; |
69 | 69 | #define INIT_TASK_SECURITY |
70 | 70 | #endif |
@@ -88,8 +88,8 @@ | ||
88 | 88 | } |
89 | 89 | |
90 | 90 | |
91 | ---- linux-4.14.210.orig/include/linux/sched.h | |
92 | -+++ linux-4.14.210/include/linux/sched.h | |
91 | +--- linux-4.14.211.orig/include/linux/sched.h | |
92 | ++++ linux-4.14.211/include/linux/sched.h | |
93 | 93 | @@ -33,6 +33,7 @@ struct audit_context; |
94 | 94 | struct backing_dev_info; |
95 | 95 | struct bio_list; |
@@ -109,8 +109,8 @@ | ||
109 | 109 | |
110 | 110 | /* |
111 | 111 | * New fields for task_struct should be added above here, so that |
112 | ---- linux-4.14.210.orig/include/linux/security.h | |
113 | -+++ linux-4.14.210/include/linux/security.h | |
112 | +--- linux-4.14.211.orig/include/linux/security.h | |
113 | ++++ linux-4.14.211/include/linux/security.h | |
114 | 114 | @@ -56,6 +56,7 @@ struct msg_queue; |
115 | 115 | struct xattr; |
116 | 116 | struct xfrm_sec_ctx; |
@@ -331,8 +331,8 @@ | ||
331 | 331 | } |
332 | 332 | #endif /* CONFIG_SECURITY_PATH */ |
333 | 333 | |
334 | ---- linux-4.14.210.orig/include/net/ip.h | |
335 | -+++ linux-4.14.210/include/net/ip.h | |
334 | +--- linux-4.14.211.orig/include/net/ip.h | |
335 | ++++ linux-4.14.211/include/net/ip.h | |
336 | 336 | @@ -266,6 +266,8 @@ void inet_get_local_port_range(struct ne |
337 | 337 | #ifdef CONFIG_SYSCTL |
338 | 338 | static inline int inet_is_local_reserved_port(struct net *net, int port) |
@@ -351,8 +351,8 @@ | ||
351 | 351 | return 0; |
352 | 352 | } |
353 | 353 | |
354 | ---- linux-4.14.210.orig/kernel/kexec.c | |
355 | -+++ linux-4.14.210/kernel/kexec.c | |
354 | +--- linux-4.14.211.orig/kernel/kexec.c | |
355 | ++++ linux-4.14.211/kernel/kexec.c | |
356 | 356 | @@ -17,7 +17,7 @@ |
357 | 357 | #include <linux/syscalls.h> |
358 | 358 | #include <linux/vmalloc.h> |
@@ -371,8 +371,8 @@ | ||
371 | 371 | |
372 | 372 | /* |
373 | 373 | * Verify we have a legal set of flags |
374 | ---- linux-4.14.210.orig/kernel/module.c | |
375 | -+++ linux-4.14.210/kernel/module.c | |
374 | +--- linux-4.14.211.orig/kernel/module.c | |
375 | ++++ linux-4.14.211/kernel/module.c | |
376 | 376 | @@ -66,6 +66,7 @@ |
377 | 377 | #include <linux/audit.h> |
378 | 378 | #include <uapi/linux/module.h> |
@@ -399,8 +399,8 @@ | ||
399 | 399 | |
400 | 400 | return 0; |
401 | 401 | } |
402 | ---- linux-4.14.210.orig/kernel/ptrace.c | |
403 | -+++ linux-4.14.210/kernel/ptrace.c | |
402 | +--- linux-4.14.211.orig/kernel/ptrace.c | |
403 | ++++ linux-4.14.211/kernel/ptrace.c | |
404 | 404 | @@ -1153,6 +1153,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l |
405 | 405 | { |
406 | 406 | struct task_struct *child; |
@@ -425,8 +425,8 @@ | ||
425 | 425 | |
426 | 426 | if (request == PTRACE_TRACEME) { |
427 | 427 | ret = ptrace_traceme(); |
428 | ---- linux-4.14.210.orig/kernel/reboot.c | |
429 | -+++ linux-4.14.210/kernel/reboot.c | |
428 | +--- linux-4.14.211.orig/kernel/reboot.c | |
429 | ++++ linux-4.14.211/kernel/reboot.c | |
430 | 430 | @@ -16,6 +16,7 @@ |
431 | 431 | #include <linux/syscalls.h> |
432 | 432 | #include <linux/syscore_ops.h> |
@@ -444,8 +444,8 @@ | ||
444 | 444 | |
445 | 445 | /* |
446 | 446 | * If pid namespaces are enabled and the current task is in a child |
447 | ---- linux-4.14.210.orig/kernel/sched/core.c | |
448 | -+++ linux-4.14.210/kernel/sched/core.c | |
447 | +--- linux-4.14.211.orig/kernel/sched/core.c | |
448 | ++++ linux-4.14.211/kernel/sched/core.c | |
449 | 449 | @@ -3856,6 +3856,8 @@ int can_nice(const struct task_struct *p |
450 | 450 | SYSCALL_DEFINE1(nice, int, increment) |
451 | 451 | { |
@@ -455,8 +455,8 @@ | ||
455 | 455 | |
456 | 456 | /* |
457 | 457 | * Setpriority might change our priority at the same moment. |
458 | ---- linux-4.14.210.orig/kernel/signal.c | |
459 | -+++ linux-4.14.210/kernel/signal.c | |
458 | +--- linux-4.14.211.orig/kernel/signal.c | |
459 | ++++ linux-4.14.211/kernel/signal.c | |
460 | 460 | @@ -3042,6 +3042,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait, |
461 | 461 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
462 | 462 | { |
@@ -502,8 +502,8 @@ | ||
502 | 502 | |
503 | 503 | return do_send_specific(tgid, pid, sig, info); |
504 | 504 | } |
505 | ---- linux-4.14.210.orig/kernel/sys.c | |
506 | -+++ linux-4.14.210/kernel/sys.c | |
505 | +--- linux-4.14.211.orig/kernel/sys.c | |
506 | ++++ linux-4.14.211/kernel/sys.c | |
507 | 507 | @@ -193,6 +193,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
508 | 508 | |
509 | 509 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -533,8 +533,8 @@ | ||
533 | 533 | |
534 | 534 | errno = -EFAULT; |
535 | 535 | if (!copy_from_user(tmp, name, len)) { |
536 | ---- linux-4.14.210.orig/kernel/time/ntp.c | |
537 | -+++ linux-4.14.210/kernel/time/ntp.c | |
536 | +--- linux-4.14.211.orig/kernel/time/ntp.c | |
537 | ++++ linux-4.14.211/kernel/time/ntp.c | |
538 | 538 | @@ -18,6 +18,7 @@ |
539 | 539 | #include <linux/module.h> |
540 | 540 | #include <linux/rtc.h> |
@@ -568,8 +568,8 @@ | ||
568 | 568 | |
569 | 569 | if (txc->modes & ADJ_NANO) { |
570 | 570 | struct timespec ts; |
571 | ---- linux-4.14.210.orig/net/ipv4/raw.c | |
572 | -+++ linux-4.14.210/net/ipv4/raw.c | |
571 | +--- linux-4.14.211.orig/net/ipv4/raw.c | |
572 | ++++ linux-4.14.211/net/ipv4/raw.c | |
573 | 573 | @@ -768,6 +768,10 @@ static int raw_recvmsg(struct sock *sk, |
574 | 574 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
575 | 575 | if (!skb) |
@@ -581,8 +581,8 @@ | ||
581 | 581 | |
582 | 582 | copied = skb->len; |
583 | 583 | if (len < copied) { |
584 | ---- linux-4.14.210.orig/net/ipv4/udp.c | |
585 | -+++ linux-4.14.210/net/ipv4/udp.c | |
584 | +--- linux-4.14.211.orig/net/ipv4/udp.c | |
585 | ++++ linux-4.14.211/net/ipv4/udp.c | |
586 | 586 | @@ -1608,6 +1608,8 @@ try_again: |
587 | 587 | skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err); |
588 | 588 | if (!skb) |
@@ -592,8 +592,8 @@ | ||
592 | 592 | |
593 | 593 | ulen = udp_skb_len(skb); |
594 | 594 | copied = len; |
595 | ---- linux-4.14.210.orig/net/ipv6/raw.c | |
596 | -+++ linux-4.14.210/net/ipv6/raw.c | |
595 | +--- linux-4.14.211.orig/net/ipv6/raw.c | |
596 | ++++ linux-4.14.211/net/ipv6/raw.c | |
597 | 597 | @@ -485,6 +485,10 @@ static int rawv6_recvmsg(struct sock *sk |
598 | 598 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
599 | 599 | if (!skb) |
@@ -605,8 +605,8 @@ | ||
605 | 605 | |
606 | 606 | copied = skb->len; |
607 | 607 | if (copied > len) { |
608 | ---- linux-4.14.210.orig/net/ipv6/udp.c | |
609 | -+++ linux-4.14.210/net/ipv6/udp.c | |
608 | +--- linux-4.14.211.orig/net/ipv6/udp.c | |
609 | ++++ linux-4.14.211/net/ipv6/udp.c | |
610 | 610 | @@ -371,6 +371,8 @@ try_again: |
611 | 611 | skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err); |
612 | 612 | if (!skb) |
@@ -616,8 +616,8 @@ | ||
616 | 616 | |
617 | 617 | ulen = udp6_skb_len(skb); |
618 | 618 | copied = len; |
619 | ---- linux-4.14.210.orig/net/socket.c | |
620 | -+++ linux-4.14.210/net/socket.c | |
619 | +--- linux-4.14.211.orig/net/socket.c | |
620 | ++++ linux-4.14.211/net/socket.c | |
621 | 621 | @@ -1588,6 +1588,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct |
622 | 622 | if (err < 0) |
623 | 623 | goto out_fd; |
@@ -629,8 +629,8 @@ | ||
629 | 629 | if (upeer_sockaddr) { |
630 | 630 | if (newsock->ops->getname(newsock, (struct sockaddr *)&address, |
631 | 631 | &len, 2) < 0) { |
632 | ---- linux-4.14.210.orig/net/unix/af_unix.c | |
633 | -+++ linux-4.14.210/net/unix/af_unix.c | |
632 | +--- linux-4.14.211.orig/net/unix/af_unix.c | |
633 | ++++ linux-4.14.211/net/unix/af_unix.c | |
634 | 634 | @@ -2162,6 +2162,10 @@ static int unix_dgram_recvmsg(struct soc |
635 | 635 | POLLOUT | POLLWRNORM | |
636 | 636 | POLLWRBAND); |
@@ -650,8 +650,8 @@ | ||
650 | 650 | mutex_unlock(&u->iolock); |
651 | 651 | out: |
652 | 652 | return err; |
653 | ---- linux-4.14.210.orig/security/Kconfig | |
654 | -+++ linux-4.14.210/security/Kconfig | |
653 | +--- linux-4.14.211.orig/security/Kconfig | |
654 | ++++ linux-4.14.211/security/Kconfig | |
655 | 655 | @@ -263,5 +263,7 @@ config DEFAULT_SECURITY |
656 | 656 | default "apparmor" if DEFAULT_SECURITY_APPARMOR |
657 | 657 | default "" if DEFAULT_SECURITY_DAC |
@@ -660,8 +660,8 @@ | ||
660 | 660 | + |
661 | 661 | endmenu |
662 | 662 | |
663 | ---- linux-4.14.210.orig/security/Makefile | |
664 | -+++ linux-4.14.210/security/Makefile | |
663 | +--- linux-4.14.211.orig/security/Makefile | |
664 | ++++ linux-4.14.211/security/Makefile | |
665 | 665 | @@ -30,3 +30,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c |
666 | 666 | # Object integrity file lists |
667 | 667 | subdir-$(CONFIG_INTEGRITY) += integrity |
@@ -669,8 +669,8 @@ | ||
669 | 669 | + |
670 | 670 | +subdir-$(CONFIG_CCSECURITY) += ccsecurity |
671 | 671 | +obj-$(CONFIG_CCSECURITY) += ccsecurity/ |
672 | ---- linux-4.14.210.orig/security/security.c | |
673 | -+++ linux-4.14.210/security/security.c | |
672 | +--- linux-4.14.211.orig/security/security.c | |
673 | ++++ linux-4.14.211/security/security.c | |
674 | 674 | @@ -978,12 +978,19 @@ int security_file_open(struct file *file |
675 | 675 | |
676 | 676 | int security_task_alloc(struct task_struct *task, unsigned long clone_flags) |
@@ -1,6 +1,6 @@ | ||
1 | 1 | This is TOMOYO Linux patch for CentOS 8. |
2 | 2 | |
3 | -Source code for this patch is http://vault.centos.org/8.2.2004/BaseOS/Source/SPackages/kernel-4.18.0-193.28.1.el8_2.src.rpm | |
3 | +Source code for this patch is https://vault.centos.org/8.3.2011/BaseOS/Source/SPackages/kernel-4.18.0-240.1.1.el8_3.src.rpm | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 - |
6 | 6 | fs/open.c | 2 + |
@@ -28,9 +28,9 @@ | ||
28 | 28 | security/security.c | 9 +++++- |
29 | 29 | 24 files changed, 148 insertions(+), 29 deletions(-) |
30 | 30 | |
31 | ---- linux-4.18.0-193.28.1.el8.orig/fs/exec.c | |
32 | -+++ linux-4.18.0-193.28.1.el8/fs/exec.c | |
33 | -@@ -1692,7 +1692,7 @@ static int exec_binprm(struct linux_binp | |
31 | +--- linux-4.18.0-240.1.1.el8.orig/fs/exec.c | |
32 | ++++ linux-4.18.0-240.1.1.el8/fs/exec.c | |
33 | +@@ -1694,7 +1694,7 @@ static int exec_binprm(struct linux_binp | |
34 | 34 | old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent)); |
35 | 35 | rcu_read_unlock(); |
36 | 36 |
@@ -39,8 +39,8 @@ | ||
39 | 39 | if (ret >= 0) { |
40 | 40 | audit_bprm(bprm); |
41 | 41 | trace_sched_process_exec(current, old_pid, bprm); |
42 | ---- linux-4.18.0-193.28.1.el8.orig/fs/open.c | |
43 | -+++ linux-4.18.0-193.28.1.el8/fs/open.c | |
42 | +--- linux-4.18.0-240.1.1.el8.orig/fs/open.c | |
43 | ++++ linux-4.18.0-240.1.1.el8/fs/open.c | |
44 | 44 | @@ -1180,6 +1180,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd) |
45 | 45 | */ |
46 | 46 | SYSCALL_DEFINE0(vhangup) |
@@ -50,8 +50,8 @@ | ||
50 | 50 | if (capable(CAP_SYS_TTY_CONFIG)) { |
51 | 51 | tty_vhangup_self(); |
52 | 52 | return 0; |
53 | ---- linux-4.18.0-193.28.1.el8.orig/fs/proc/version.c | |
54 | -+++ linux-4.18.0-193.28.1.el8/fs/proc/version.c | |
53 | +--- linux-4.18.0-240.1.1.el8.orig/fs/proc/version.c | |
54 | ++++ linux-4.18.0-240.1.1.el8/fs/proc/version.c | |
55 | 55 | @@ -21,3 +21,10 @@ static int __init proc_version_init(void |
56 | 56 | return 0; |
57 | 57 | } |
@@ -59,13 +59,13 @@ | ||
59 | 59 | + |
60 | 60 | +static int __init ccs_show_version(void) |
61 | 61 | +{ |
62 | -+ printk(KERN_INFO "Hook version: 4.18.0-193.28.1.el8_2 2020/11/01\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.18.0-240.1.1.el8_3 2020/12/08\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-4.18.0-193.28.1.el8.orig/include/linux/sched.h | |
67 | -+++ linux-4.18.0-193.28.1.el8/include/linux/sched.h | |
68 | -@@ -35,6 +35,7 @@ struct audit_context; | |
66 | +--- linux-4.18.0-240.1.1.el8.orig/include/linux/sched.h | |
67 | ++++ linux-4.18.0-240.1.1.el8/include/linux/sched.h | |
68 | +@@ -38,6 +38,7 @@ struct audit_context; | |
69 | 69 | struct backing_dev_info; |
70 | 70 | struct bio_list; |
71 | 71 | struct blk_plug; |
@@ -73,7 +73,7 @@ | ||
73 | 73 | struct cfs_rq; |
74 | 74 | struct fs_struct; |
75 | 75 | struct futex_pi_state; |
76 | -@@ -1232,6 +1233,10 @@ struct task_struct { | |
76 | +@@ -1229,6 +1230,10 @@ struct task_struct { | |
77 | 77 | /* Used by LSM modules for access restriction: */ |
78 | 78 | void *security; |
79 | 79 | #endif |
@@ -84,8 +84,8 @@ | ||
84 | 84 | |
85 | 85 | /* |
86 | 86 | * New fields for task_struct should be added above here, so that |
87 | ---- linux-4.18.0-193.28.1.el8.orig/include/linux/security.h | |
88 | -+++ linux-4.18.0-193.28.1.el8/include/linux/security.h | |
87 | +--- linux-4.18.0-240.1.1.el8.orig/include/linux/security.h | |
88 | ++++ linux-4.18.0-240.1.1.el8/include/linux/security.h | |
89 | 89 | @@ -54,6 +54,7 @@ struct xattr; |
90 | 90 | struct kernfs_node; |
91 | 91 | struct xfrm_sec_ctx; |
@@ -94,7 +94,7 @@ | ||
94 | 94 | |
95 | 95 | /* Default (no) options for the capable function */ |
96 | 96 | #define CAP_OPT_NONE 0x0 |
97 | -@@ -502,7 +503,10 @@ static inline int security_syslog(int ty | |
97 | +@@ -524,7 +525,10 @@ static inline int security_syslog(int ty | |
98 | 98 | static inline int security_settime64(const struct timespec64 *ts, |
99 | 99 | const struct timezone *tz) |
100 | 100 | { |
@@ -106,7 +106,7 @@ | ||
106 | 106 | } |
107 | 107 | |
108 | 108 | static inline int security_vm_enough_memory_mm(struct mm_struct *mm, long pages) |
109 | -@@ -566,18 +570,18 @@ static inline int security_sb_mount(cons | |
109 | +@@ -588,18 +592,18 @@ static inline int security_sb_mount(cons | |
110 | 110 | const char *type, unsigned long flags, |
111 | 111 | void *data) |
112 | 112 | { |
@@ -128,7 +128,7 @@ | ||
128 | 128 | } |
129 | 129 | |
130 | 130 | static inline int security_sb_set_mnt_opts(struct super_block *sb, |
131 | -@@ -726,7 +730,7 @@ static inline int security_inode_setattr | |
131 | +@@ -748,7 +752,7 @@ static inline int security_inode_setattr | |
132 | 132 | |
133 | 133 | static inline int security_inode_getattr(const struct path *path) |
134 | 134 | { |
@@ -137,7 +137,7 @@ | ||
137 | 137 | } |
138 | 138 | |
139 | 139 | static inline int security_inode_setxattr(struct dentry *dentry, |
140 | -@@ -818,7 +822,7 @@ static inline void security_file_free(st | |
140 | +@@ -840,7 +844,7 @@ static inline void security_file_free(st | |
141 | 141 | static inline int security_file_ioctl(struct file *file, unsigned int cmd, |
142 | 142 | unsigned long arg) |
143 | 143 | { |
@@ -146,7 +146,7 @@ | ||
146 | 146 | } |
147 | 147 | |
148 | 148 | static inline int security_mmap_file(struct file *file, unsigned long prot, |
149 | -@@ -847,7 +851,7 @@ static inline int security_file_lock(str | |
149 | +@@ -869,7 +873,7 @@ static inline int security_file_lock(str | |
150 | 150 | static inline int security_file_fcntl(struct file *file, unsigned int cmd, |
151 | 151 | unsigned long arg) |
152 | 152 | { |
@@ -155,7 +155,7 @@ | ||
155 | 155 | } |
156 | 156 | |
157 | 157 | static inline void security_file_set_fowner(struct file *file) |
158 | -@@ -869,17 +873,19 @@ static inline int security_file_receive( | |
158 | +@@ -891,17 +895,19 @@ static inline int security_file_receive( | |
159 | 159 | |
160 | 160 | static inline int security_file_open(struct file *file) |
161 | 161 | { |
@@ -178,7 +178,7 @@ | ||
178 | 178 | |
179 | 179 | static inline int security_cred_alloc_blank(struct cred *cred, gfp_t gfp) |
180 | 180 | { |
181 | -@@ -1246,7 +1252,7 @@ static inline int security_unix_may_send | |
181 | +@@ -1273,7 +1279,7 @@ static inline int security_unix_may_send | |
182 | 182 | static inline int security_socket_create(int family, int type, |
183 | 183 | int protocol, int kern) |
184 | 184 | { |
@@ -187,7 +187,7 @@ | ||
187 | 187 | } |
188 | 188 | |
189 | 189 | static inline int security_socket_post_create(struct socket *sock, |
190 | -@@ -1267,19 +1273,19 @@ static inline int security_socket_bind(s | |
190 | +@@ -1294,19 +1300,19 @@ static inline int security_socket_bind(s | |
191 | 191 | struct sockaddr *address, |
192 | 192 | int addrlen) |
193 | 193 | { |
@@ -210,7 +210,7 @@ | ||
210 | 210 | } |
211 | 211 | |
212 | 212 | static inline int security_socket_accept(struct socket *sock, |
213 | -@@ -1291,7 +1297,7 @@ static inline int security_socket_accept | |
213 | +@@ -1318,7 +1324,7 @@ static inline int security_socket_accept | |
214 | 214 | static inline int security_socket_sendmsg(struct socket *sock, |
215 | 215 | struct msghdr *msg, int size) |
216 | 216 | { |
@@ -219,7 +219,7 @@ | ||
219 | 219 | } |
220 | 220 | |
221 | 221 | static inline int security_socket_recvmsg(struct socket *sock, |
222 | -@@ -1578,42 +1584,42 @@ int security_path_chroot(const struct pa | |
222 | +@@ -1605,42 +1611,42 @@ int security_path_chroot(const struct pa | |
223 | 223 | #else /* CONFIG_SECURITY_PATH */ |
224 | 224 | static inline int security_path_unlink(const struct path *dir, struct dentry *dentry) |
225 | 225 | { |
@@ -269,7 +269,7 @@ | ||
269 | 269 | } |
270 | 270 | |
271 | 271 | static inline int security_path_rename(const struct path *old_dir, |
272 | -@@ -1622,22 +1628,32 @@ static inline int security_path_rename(c | |
272 | +@@ -1649,22 +1655,32 @@ static inline int security_path_rename(c | |
273 | 273 | struct dentry *new_dentry, |
274 | 274 | unsigned int flags) |
275 | 275 | { |
@@ -306,8 +306,8 @@ | ||
306 | 306 | } |
307 | 307 | #endif /* CONFIG_SECURITY_PATH */ |
308 | 308 | |
309 | ---- linux-4.18.0-193.28.1.el8.orig/include/net/ip.h | |
310 | -+++ linux-4.18.0-193.28.1.el8/include/net/ip.h | |
309 | +--- linux-4.18.0-240.1.1.el8.orig/include/net/ip.h | |
310 | ++++ linux-4.18.0-240.1.1.el8/include/net/ip.h | |
311 | 311 | @@ -285,6 +285,8 @@ void inet_get_local_port_range(struct ne |
312 | 312 | #ifdef CONFIG_SYSCTL |
313 | 313 | static inline int inet_is_local_reserved_port(struct net *net, int port) |
@@ -326,9 +326,9 @@ | ||
326 | 326 | return 0; |
327 | 327 | } |
328 | 328 | |
329 | ---- linux-4.18.0-193.28.1.el8.orig/init/init_task.c | |
330 | -+++ linux-4.18.0-193.28.1.el8/init/init_task.c | |
331 | -@@ -183,6 +183,10 @@ struct task_struct init_task | |
329 | +--- linux-4.18.0-240.1.1.el8.orig/init/init_task.c | |
330 | ++++ linux-4.18.0-240.1.1.el8/init/init_task.c | |
331 | +@@ -186,6 +186,10 @@ struct task_struct init_task | |
332 | 332 | #ifdef CONFIG_SECURITY |
333 | 333 | .security = NULL, |
334 | 334 | #endif |
@@ -339,9 +339,9 @@ | ||
339 | 339 | }; |
340 | 340 | EXPORT_SYMBOL(init_task); |
341 | 341 | |
342 | ---- linux-4.18.0-193.28.1.el8.orig/kernel/kexec.c | |
343 | -+++ linux-4.18.0-193.28.1.el8/kernel/kexec.c | |
344 | -@@ -17,7 +17,7 @@ | |
342 | +--- linux-4.18.0-240.1.1.el8.orig/kernel/kexec.c | |
343 | ++++ linux-4.18.0-240.1.1.el8/kernel/kexec.c | |
344 | +@@ -18,7 +18,7 @@ | |
345 | 345 | #include <linux/syscalls.h> |
346 | 346 | #include <linux/vmalloc.h> |
347 | 347 | #include <linux/slab.h> |
@@ -350,7 +350,7 @@ | ||
350 | 350 | #include "kexec_internal.h" |
351 | 351 | |
352 | 352 | static int copy_user_segment_list(struct kimage *image, |
353 | -@@ -198,6 +198,8 @@ static inline int kexec_load_check(unsig | |
353 | +@@ -201,6 +201,8 @@ static inline int kexec_load_check(unsig | |
354 | 354 | /* We only trust the superuser with rebooting the system. */ |
355 | 355 | if (!capable(CAP_SYS_BOOT) || kexec_load_disabled) |
356 | 356 | return -EPERM; |
@@ -357,11 +357,11 @@ | ||
357 | 357 | + if (!ccs_capable(CCS_SYS_KEXEC_LOAD)) |
358 | 358 | + return -EPERM; |
359 | 359 | |
360 | - /* | |
361 | - * kexec can be used to circumvent module loading restrictions, so | |
362 | ---- linux-4.18.0-193.28.1.el8.orig/kernel/module.c | |
363 | -+++ linux-4.18.0-193.28.1.el8/kernel/module.c | |
364 | -@@ -66,6 +66,7 @@ | |
360 | + /* Permit LSMs and IMA to fail the kexec */ | |
361 | + result = security_kernel_load_data(LOADING_KEXEC_IMAGE); | |
362 | +--- linux-4.18.0-240.1.1.el8.orig/kernel/module.c | |
363 | ++++ linux-4.18.0-240.1.1.el8/kernel/module.c | |
364 | +@@ -67,6 +67,7 @@ | |
365 | 365 | #include <linux/audit.h> |
366 | 366 | #include <uapi/linux/module.h> |
367 | 367 | #include "module-internal.h" |
@@ -369,7 +369,7 @@ | ||
369 | 369 | |
370 | 370 | #define CREATE_TRACE_POINTS |
371 | 371 | #include <trace/events/module.h> |
372 | -@@ -973,6 +974,8 @@ SYSCALL_DEFINE2(delete_module, const cha | |
372 | +@@ -961,6 +962,8 @@ SYSCALL_DEFINE2(delete_module, const cha | |
373 | 373 | |
374 | 374 | if (!capable(CAP_SYS_MODULE) || modules_disabled) |
375 | 375 | return -EPERM; |
@@ -378,7 +378,7 @@ | ||
378 | 378 | |
379 | 379 | if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0) |
380 | 380 | return -EFAULT; |
381 | -@@ -3574,6 +3577,8 @@ static int may_init_module(void) | |
381 | +@@ -3562,6 +3565,8 @@ static int may_init_module(void) | |
382 | 382 | { |
383 | 383 | if (!capable(CAP_SYS_MODULE) || modules_disabled) |
384 | 384 | return -EPERM; |
@@ -387,9 +387,9 @@ | ||
387 | 387 | |
388 | 388 | return 0; |
389 | 389 | } |
390 | ---- linux-4.18.0-193.28.1.el8.orig/kernel/ptrace.c | |
391 | -+++ linux-4.18.0-193.28.1.el8/kernel/ptrace.c | |
392 | -@@ -1109,6 +1109,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l | |
390 | +--- linux-4.18.0-240.1.1.el8.orig/kernel/ptrace.c | |
391 | ++++ linux-4.18.0-240.1.1.el8/kernel/ptrace.c | |
392 | +@@ -1119,6 +1119,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l | |
393 | 393 | { |
394 | 394 | struct task_struct *child; |
395 | 395 | long ret; |
@@ -401,7 +401,7 @@ | ||
401 | 401 | |
402 | 402 | if (request == PTRACE_TRACEME) { |
403 | 403 | ret = ptrace_traceme(); |
404 | -@@ -1256,6 +1261,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo | |
404 | +@@ -1266,6 +1271,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo | |
405 | 405 | { |
406 | 406 | struct task_struct *child; |
407 | 407 | long ret; |
@@ -413,8 +413,8 @@ | ||
413 | 413 | |
414 | 414 | if (request == PTRACE_TRACEME) { |
415 | 415 | ret = ptrace_traceme(); |
416 | ---- linux-4.18.0-193.28.1.el8.orig/kernel/reboot.c | |
417 | -+++ linux-4.18.0-193.28.1.el8/kernel/reboot.c | |
416 | +--- linux-4.18.0-240.1.1.el8.orig/kernel/reboot.c | |
417 | ++++ linux-4.18.0-240.1.1.el8/kernel/reboot.c | |
418 | 418 | @@ -16,6 +16,7 @@ |
419 | 419 | #include <linux/syscalls.h> |
420 | 420 | #include <linux/syscore_ops.h> |
@@ -432,9 +432,9 @@ | ||
432 | 432 | |
433 | 433 | /* |
434 | 434 | * If pid namespaces are enabled and the current task is in a child |
435 | ---- linux-4.18.0-193.28.1.el8.orig/kernel/sched/core.c | |
436 | -+++ linux-4.18.0-193.28.1.el8/kernel/sched/core.c | |
437 | -@@ -3974,6 +3974,8 @@ int can_nice(const struct task_struct *p | |
435 | +--- linux-4.18.0-240.1.1.el8.orig/kernel/sched/core.c | |
436 | ++++ linux-4.18.0-240.1.1.el8/kernel/sched/core.c | |
437 | +@@ -4100,6 +4100,8 @@ int can_nice(const struct task_struct *p | |
438 | 438 | SYSCALL_DEFINE1(nice, int, increment) |
439 | 439 | { |
440 | 440 | long nice, retval; |
@@ -443,9 +443,9 @@ | ||
443 | 443 | |
444 | 444 | /* |
445 | 445 | * Setpriority might change our priority at the same moment. |
446 | ---- linux-4.18.0-193.28.1.el8.orig/kernel/signal.c | |
447 | -+++ linux-4.18.0-193.28.1.el8/kernel/signal.c | |
448 | -@@ -3497,6 +3497,8 @@ SYSCALL_DEFINE2(kill, pid_t, pid, int, s | |
446 | +--- linux-4.18.0-240.1.1.el8.orig/kernel/signal.c | |
447 | ++++ linux-4.18.0-240.1.1.el8/kernel/signal.c | |
448 | +@@ -3533,6 +3533,8 @@ SYSCALL_DEFINE2(kill, pid_t, pid, int, s | |
449 | 449 | { |
450 | 450 | struct kernel_siginfo info; |
451 | 451 |
@@ -454,7 +454,7 @@ | ||
454 | 454 | clear_siginfo(&info); |
455 | 455 | info.si_signo = sig; |
456 | 456 | info.si_errno = 0; |
457 | -@@ -3566,6 +3568,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid | |
457 | +@@ -3602,6 +3604,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid | |
458 | 458 | /* This is only valid for single tasks */ |
459 | 459 | if (pid <= 0 || tgid <= 0) |
460 | 460 | return -EINVAL; |
@@ -463,7 +463,7 @@ | ||
463 | 463 | |
464 | 464 | return do_tkill(tgid, pid, sig); |
465 | 465 | } |
466 | -@@ -3582,6 +3586,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int, | |
466 | +@@ -3618,6 +3622,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int, | |
467 | 467 | /* This is only valid for single tasks */ |
468 | 468 | if (pid <= 0) |
469 | 469 | return -EINVAL; |
@@ -472,7 +472,7 @@ | ||
472 | 472 | |
473 | 473 | return do_tkill(0, pid, sig); |
474 | 474 | } |
475 | -@@ -3595,6 +3601,8 @@ static int do_rt_sigqueueinfo(pid_t pid, | |
475 | +@@ -3631,6 +3637,8 @@ static int do_rt_sigqueueinfo(pid_t pid, | |
476 | 476 | (task_pid_vnr(current) != pid)) |
477 | 477 | return -EPERM; |
478 | 478 |
@@ -481,7 +481,7 @@ | ||
481 | 481 | /* POSIX.1b doesn't mention process groups. */ |
482 | 482 | return kill_proc_info(sig, info, pid); |
483 | 483 | } |
484 | -@@ -3642,6 +3650,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg | |
484 | +@@ -3678,6 +3686,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg | |
485 | 485 | (task_pid_vnr(current) != pid)) |
486 | 486 | return -EPERM; |
487 | 487 |
@@ -490,8 +490,8 @@ | ||
490 | 490 | return do_send_specific(tgid, pid, sig, info); |
491 | 491 | } |
492 | 492 | |
493 | ---- linux-4.18.0-193.28.1.el8.orig/kernel/sys.c | |
494 | -+++ linux-4.18.0-193.28.1.el8/kernel/sys.c | |
493 | +--- linux-4.18.0-240.1.1.el8.orig/kernel/sys.c | |
494 | ++++ linux-4.18.0-240.1.1.el8/kernel/sys.c | |
495 | 495 | @@ -207,6 +207,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
496 | 496 | |
497 | 497 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -521,8 +521,8 @@ | ||
521 | 521 | |
522 | 522 | down_write(&uts_sem); |
523 | 523 | errno = -EFAULT; |
524 | ---- linux-4.18.0-193.28.1.el8.orig/kernel/time/timekeeping.c | |
525 | -+++ linux-4.18.0-193.28.1.el8/kernel/time/timekeeping.c | |
524 | +--- linux-4.18.0-240.1.1.el8.orig/kernel/time/timekeeping.c | |
525 | ++++ linux-4.18.0-240.1.1.el8/kernel/time/timekeeping.c | |
526 | 526 | @@ -26,6 +26,7 @@ |
527 | 527 | #include <linux/pvclock_gtod.h> |
528 | 528 | #include <linux/compiler.h> |
@@ -556,8 +556,8 @@ | ||
556 | 556 | |
557 | 557 | /* |
558 | 558 | * Validate if a timespec/timeval used to inject a time |
559 | ---- linux-4.18.0-193.28.1.el8.orig/net/ipv4/raw.c | |
560 | -+++ linux-4.18.0-193.28.1.el8/net/ipv4/raw.c | |
559 | +--- linux-4.18.0-240.1.1.el8.orig/net/ipv4/raw.c | |
560 | ++++ linux-4.18.0-240.1.1.el8/net/ipv4/raw.c | |
561 | 561 | @@ -781,6 +781,10 @@ static int raw_recvmsg(struct sock *sk, |
562 | 562 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
563 | 563 | if (!skb) |
@@ -569,10 +569,10 @@ | ||
569 | 569 | |
570 | 570 | copied = skb->len; |
571 | 571 | if (len < copied) { |
572 | ---- linux-4.18.0-193.28.1.el8.orig/net/ipv4/udp.c | |
573 | -+++ linux-4.18.0-193.28.1.el8/net/ipv4/udp.c | |
574 | -@@ -1711,6 +1711,8 @@ try_again: | |
575 | - skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err); | |
572 | +--- linux-4.18.0-240.1.1.el8.orig/net/ipv4/udp.c | |
573 | ++++ linux-4.18.0-240.1.1.el8/net/ipv4/udp.c | |
574 | +@@ -1723,6 +1723,8 @@ try_again: | |
575 | + skb = __skb_recv_udp(sk, flags, noblock, &off, &err); | |
576 | 576 | if (!skb) |
577 | 577 | return err; |
578 | 578 | + if (ccs_socket_post_recvmsg_permission(sk, skb, flags)) |
@@ -580,8 +580,8 @@ | ||
580 | 580 | |
581 | 581 | ulen = udp_skb_len(skb); |
582 | 582 | copied = len; |
583 | ---- linux-4.18.0-193.28.1.el8.orig/net/ipv6/raw.c | |
584 | -+++ linux-4.18.0-193.28.1.el8/net/ipv6/raw.c | |
583 | +--- linux-4.18.0-240.1.1.el8.orig/net/ipv6/raw.c | |
584 | ++++ linux-4.18.0-240.1.1.el8/net/ipv6/raw.c | |
585 | 585 | @@ -485,6 +485,10 @@ static int rawv6_recvmsg(struct sock *sk |
586 | 586 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
587 | 587 | if (!skb) |
@@ -593,10 +593,10 @@ | ||
593 | 593 | |
594 | 594 | copied = skb->len; |
595 | 595 | if (copied > len) { |
596 | ---- linux-4.18.0-193.28.1.el8.orig/net/ipv6/udp.c | |
597 | -+++ linux-4.18.0-193.28.1.el8/net/ipv6/udp.c | |
598 | -@@ -308,6 +308,8 @@ try_again: | |
599 | - skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err); | |
596 | +--- linux-4.18.0-240.1.1.el8.orig/net/ipv6/udp.c | |
597 | ++++ linux-4.18.0-240.1.1.el8/net/ipv6/udp.c | |
598 | +@@ -306,6 +306,8 @@ try_again: | |
599 | + skb = __skb_recv_udp(sk, flags, noblock, &off, &err); | |
600 | 600 | if (!skb) |
601 | 601 | return err; |
602 | 602 | + if (ccs_socket_post_recvmsg_permission(sk, skb, flags)) |
@@ -604,9 +604,9 @@ | ||
604 | 604 | |
605 | 605 | ulen = udp6_skb_len(skb); |
606 | 606 | copied = len; |
607 | ---- linux-4.18.0-193.28.1.el8.orig/net/socket.c | |
608 | -+++ linux-4.18.0-193.28.1.el8/net/socket.c | |
609 | -@@ -1720,6 +1720,10 @@ int __sys_accept4(int fd, struct sockadd | |
607 | +--- linux-4.18.0-240.1.1.el8.orig/net/socket.c | |
608 | ++++ linux-4.18.0-240.1.1.el8/net/socket.c | |
609 | +@@ -1711,6 +1711,10 @@ int __sys_accept4_file(struct file *file | |
610 | 610 | if (err < 0) |
611 | 611 | goto out_fd; |
612 | 612 |
@@ -617,9 +617,9 @@ | ||
617 | 617 | if (upeer_sockaddr) { |
618 | 618 | len = newsock->ops->getname(newsock, |
619 | 619 | (struct sockaddr *)&address, 2); |
620 | ---- linux-4.18.0-193.28.1.el8.orig/net/unix/af_unix.c | |
621 | -+++ linux-4.18.0-193.28.1.el8/net/unix/af_unix.c | |
622 | -@@ -2063,6 +2063,10 @@ static int unix_dgram_recvmsg(struct soc | |
620 | +--- linux-4.18.0-240.1.1.el8.orig/net/unix/af_unix.c | |
621 | ++++ linux-4.18.0-240.1.1.el8/net/unix/af_unix.c | |
622 | +@@ -2064,6 +2064,10 @@ static int unix_dgram_recvmsg(struct soc | |
623 | 623 | EPOLLOUT | EPOLLWRNORM | |
624 | 624 | EPOLLWRBAND); |
625 | 625 |
@@ -630,7 +630,7 @@ | ||
630 | 630 | if (msg->msg_name) |
631 | 631 | unix_copy_addr(msg, skb->sk); |
632 | 632 | |
633 | -@@ -2113,6 +2117,7 @@ static int unix_dgram_recvmsg(struct soc | |
633 | +@@ -2114,6 +2118,7 @@ static int unix_dgram_recvmsg(struct soc | |
634 | 634 | |
635 | 635 | out_free: |
636 | 636 | skb_free_datagram(sk, skb); |
@@ -638,8 +638,8 @@ | ||
638 | 638 | mutex_unlock(&u->iolock); |
639 | 639 | out: |
640 | 640 | return err; |
641 | ---- linux-4.18.0-193.28.1.el8.orig/security/Kconfig | |
642 | -+++ linux-4.18.0-193.28.1.el8/security/Kconfig | |
641 | +--- linux-4.18.0-240.1.1.el8.orig/security/Kconfig | |
642 | ++++ linux-4.18.0-240.1.1.el8/security/Kconfig | |
643 | 643 | @@ -313,4 +313,6 @@ config DEFAULT_SECURITY |
644 | 644 | default "apparmor" if DEFAULT_SECURITY_APPARMOR |
645 | 645 | default "" if DEFAULT_SECURITY_DAC |
@@ -647,8 +647,8 @@ | ||
647 | 647 | +source security/ccsecurity/Kconfig |
648 | 648 | + |
649 | 649 | endmenu |
650 | ---- linux-4.18.0-193.28.1.el8.orig/security/Makefile | |
651 | -+++ linux-4.18.0-193.28.1.el8/security/Makefile | |
650 | +--- linux-4.18.0-240.1.1.el8.orig/security/Makefile | |
651 | ++++ linux-4.18.0-240.1.1.el8/security/Makefile | |
652 | 652 | @@ -33,3 +33,6 @@ obj-$(CONFIG_INTEGRITY) += integrity/ |
653 | 653 | |
654 | 654 | # Allow the kernel to be locked down |
@@ -656,8 +656,8 @@ | ||
656 | 656 | + |
657 | 657 | +subdir-$(CONFIG_CCSECURITY) += ccsecurity |
658 | 658 | +obj-$(CONFIG_CCSECURITY) += ccsecurity/ |
659 | ---- linux-4.18.0-193.28.1.el8.orig/security/security.c | |
660 | -+++ linux-4.18.0-193.28.1.el8/security/security.c | |
659 | +--- linux-4.18.0-240.1.1.el8.orig/security/security.c | |
660 | ++++ linux-4.18.0-240.1.1.el8/security/security.c | |
661 | 661 | @@ -988,12 +988,19 @@ int security_file_open(struct file *file |
662 | 662 | |
663 | 663 | int security_task_alloc(struct task_struct *task, unsigned long clone_flags) |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 4.19.161. | |
1 | +This is TOMOYO Linux patch for kernel 4.19.162. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.161.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.162.tar.xz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 - |
6 | 6 | fs/open.c | 2 + |
@@ -28,8 +28,8 @@ | ||
28 | 28 | security/security.c | 9 +++++- |
29 | 29 | 24 files changed, 148 insertions(+), 29 deletions(-) |
30 | 30 | |
31 | ---- linux-4.19.161.orig/fs/exec.c | |
32 | -+++ linux-4.19.161/fs/exec.c | |
31 | +--- linux-4.19.162.orig/fs/exec.c | |
32 | ++++ linux-4.19.162/fs/exec.c | |
33 | 33 | @@ -1707,7 +1707,7 @@ static int exec_binprm(struct linux_binp |
34 | 34 | old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent)); |
35 | 35 | rcu_read_unlock(); |
@@ -39,8 +39,8 @@ | ||
39 | 39 | if (ret >= 0) { |
40 | 40 | audit_bprm(bprm); |
41 | 41 | trace_sched_process_exec(current, old_pid, bprm); |
42 | ---- linux-4.19.161.orig/fs/open.c | |
43 | -+++ linux-4.19.161/fs/open.c | |
42 | +--- linux-4.19.162.orig/fs/open.c | |
43 | ++++ linux-4.19.162/fs/open.c | |
44 | 44 | @@ -1196,6 +1196,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd) |
45 | 45 | */ |
46 | 46 | SYSCALL_DEFINE0(vhangup) |
@@ -50,8 +50,8 @@ | ||
50 | 50 | if (capable(CAP_SYS_TTY_CONFIG)) { |
51 | 51 | tty_vhangup_self(); |
52 | 52 | return 0; |
53 | ---- linux-4.19.161.orig/fs/proc/version.c | |
54 | -+++ linux-4.19.161/fs/proc/version.c | |
53 | +--- linux-4.19.162.orig/fs/proc/version.c | |
54 | ++++ linux-4.19.162/fs/proc/version.c | |
55 | 55 | @@ -21,3 +21,10 @@ static int __init proc_version_init(void |
56 | 56 | return 0; |
57 | 57 | } |
@@ -59,12 +59,12 @@ | ||
59 | 59 | + |
60 | 60 | +static int __init ccs_show_version(void) |
61 | 61 | +{ |
62 | -+ printk(KERN_INFO "Hook version: 4.19.161 2020/12/02\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.19.162 2020/12/08\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-4.19.161.orig/include/linux/sched.h | |
67 | -+++ linux-4.19.161/include/linux/sched.h | |
66 | +--- linux-4.19.162.orig/include/linux/sched.h | |
67 | ++++ linux-4.19.162/include/linux/sched.h | |
68 | 68 | @@ -34,6 +34,7 @@ struct audit_context; |
69 | 69 | struct backing_dev_info; |
70 | 70 | struct bio_list; |
@@ -84,8 +84,8 @@ | ||
84 | 84 | |
85 | 85 | /* |
86 | 86 | * New fields for task_struct should be added above here, so that |
87 | ---- linux-4.19.161.orig/include/linux/security.h | |
88 | -+++ linux-4.19.161/include/linux/security.h | |
87 | +--- linux-4.19.162.orig/include/linux/security.h | |
88 | ++++ linux-4.19.162/include/linux/security.h | |
89 | 89 | @@ -53,6 +53,7 @@ struct msg_msg; |
90 | 90 | struct xattr; |
91 | 91 | struct xfrm_sec_ctx; |
@@ -306,8 +306,8 @@ | ||
306 | 306 | } |
307 | 307 | #endif /* CONFIG_SECURITY_PATH */ |
308 | 308 | |
309 | ---- linux-4.19.161.orig/include/net/ip.h | |
310 | -+++ linux-4.19.161/include/net/ip.h | |
309 | +--- linux-4.19.162.orig/include/net/ip.h | |
310 | ++++ linux-4.19.162/include/net/ip.h | |
311 | 311 | @@ -301,6 +301,8 @@ void inet_get_local_port_range(struct ne |
312 | 312 | #ifdef CONFIG_SYSCTL |
313 | 313 | static inline int inet_is_local_reserved_port(struct net *net, int port) |
@@ -326,8 +326,8 @@ | ||
326 | 326 | return 0; |
327 | 327 | } |
328 | 328 | |
329 | ---- linux-4.19.161.orig/init/init_task.c | |
330 | -+++ linux-4.19.161/init/init_task.c | |
329 | +--- linux-4.19.162.orig/init/init_task.c | |
330 | ++++ linux-4.19.162/init/init_task.c | |
331 | 331 | @@ -179,6 +179,10 @@ struct task_struct init_task |
332 | 332 | #ifdef CONFIG_SECURITY |
333 | 333 | .security = NULL, |
@@ -339,8 +339,8 @@ | ||
339 | 339 | }; |
340 | 340 | EXPORT_SYMBOL(init_task); |
341 | 341 | |
342 | ---- linux-4.19.161.orig/kernel/kexec.c | |
343 | -+++ linux-4.19.161/kernel/kexec.c | |
342 | +--- linux-4.19.162.orig/kernel/kexec.c | |
343 | ++++ linux-4.19.162/kernel/kexec.c | |
344 | 344 | @@ -18,7 +18,7 @@ |
345 | 345 | #include <linux/syscalls.h> |
346 | 346 | #include <linux/vmalloc.h> |
@@ -359,8 +359,8 @@ | ||
359 | 359 | |
360 | 360 | /* Permit LSMs and IMA to fail the kexec */ |
361 | 361 | result = security_kernel_load_data(LOADING_KEXEC_IMAGE); |
362 | ---- linux-4.19.161.orig/kernel/module.c | |
363 | -+++ linux-4.19.161/kernel/module.c | |
362 | +--- linux-4.19.162.orig/kernel/module.c | |
363 | ++++ linux-4.19.162/kernel/module.c | |
364 | 364 | @@ -66,6 +66,7 @@ |
365 | 365 | #include <linux/audit.h> |
366 | 366 | #include <uapi/linux/module.h> |
@@ -387,8 +387,8 @@ | ||
387 | 387 | |
388 | 388 | return 0; |
389 | 389 | } |
390 | ---- linux-4.19.161.orig/kernel/ptrace.c | |
391 | -+++ linux-4.19.161/kernel/ptrace.c | |
390 | +--- linux-4.19.162.orig/kernel/ptrace.c | |
391 | ++++ linux-4.19.162/kernel/ptrace.c | |
392 | 392 | @@ -1136,6 +1136,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l |
393 | 393 | { |
394 | 394 | struct task_struct *child; |
@@ -413,8 +413,8 @@ | ||
413 | 413 | |
414 | 414 | if (request == PTRACE_TRACEME) { |
415 | 415 | ret = ptrace_traceme(); |
416 | ---- linux-4.19.161.orig/kernel/reboot.c | |
417 | -+++ linux-4.19.161/kernel/reboot.c | |
416 | +--- linux-4.19.162.orig/kernel/reboot.c | |
417 | ++++ linux-4.19.162/kernel/reboot.c | |
418 | 418 | @@ -16,6 +16,7 @@ |
419 | 419 | #include <linux/syscalls.h> |
420 | 420 | #include <linux/syscore_ops.h> |
@@ -432,8 +432,8 @@ | ||
432 | 432 | |
433 | 433 | /* |
434 | 434 | * If pid namespaces are enabled and the current task is in a child |
435 | ---- linux-4.19.161.orig/kernel/sched/core.c | |
436 | -+++ linux-4.19.161/kernel/sched/core.c | |
435 | +--- linux-4.19.162.orig/kernel/sched/core.c | |
436 | ++++ linux-4.19.162/kernel/sched/core.c | |
437 | 437 | @@ -3989,6 +3989,8 @@ int can_nice(const struct task_struct *p |
438 | 438 | SYSCALL_DEFINE1(nice, int, increment) |
439 | 439 | { |
@@ -443,8 +443,8 @@ | ||
443 | 443 | |
444 | 444 | /* |
445 | 445 | * Setpriority might change our priority at the same moment. |
446 | ---- linux-4.19.161.orig/kernel/signal.c | |
447 | -+++ linux-4.19.161/kernel/signal.c | |
446 | +--- linux-4.19.162.orig/kernel/signal.c | |
447 | ++++ linux-4.19.162/kernel/signal.c | |
448 | 448 | @@ -3286,6 +3286,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait, |
449 | 449 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
450 | 450 | { |
@@ -490,8 +490,8 @@ | ||
490 | 490 | |
491 | 491 | return do_send_specific(tgid, pid, sig, info); |
492 | 492 | } |
493 | ---- linux-4.19.161.orig/kernel/sys.c | |
494 | -+++ linux-4.19.161/kernel/sys.c | |
493 | +--- linux-4.19.162.orig/kernel/sys.c | |
494 | ++++ linux-4.19.162/kernel/sys.c | |
495 | 495 | @@ -201,6 +201,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
496 | 496 | |
497 | 497 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -521,8 +521,8 @@ | ||
521 | 521 | |
522 | 522 | errno = -EFAULT; |
523 | 523 | if (!copy_from_user(tmp, name, len)) { |
524 | ---- linux-4.19.161.orig/kernel/time/timekeeping.c | |
525 | -+++ linux-4.19.161/kernel/time/timekeeping.c | |
524 | +--- linux-4.19.162.orig/kernel/time/timekeeping.c | |
525 | ++++ linux-4.19.162/kernel/time/timekeeping.c | |
526 | 526 | @@ -26,6 +26,7 @@ |
527 | 527 | #include <linux/stop_machine.h> |
528 | 528 | #include <linux/pvclock_gtod.h> |
@@ -556,8 +556,8 @@ | ||
556 | 556 | |
557 | 557 | /* |
558 | 558 | * Validate if a timespec/timeval used to inject a time |
559 | ---- linux-4.19.161.orig/net/ipv4/raw.c | |
560 | -+++ linux-4.19.161/net/ipv4/raw.c | |
559 | +--- linux-4.19.162.orig/net/ipv4/raw.c | |
560 | ++++ linux-4.19.162/net/ipv4/raw.c | |
561 | 561 | @@ -772,6 +772,10 @@ static int raw_recvmsg(struct sock *sk, |
562 | 562 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
563 | 563 | if (!skb) |
@@ -569,8 +569,8 @@ | ||
569 | 569 | |
570 | 570 | copied = skb->len; |
571 | 571 | if (len < copied) { |
572 | ---- linux-4.19.161.orig/net/ipv4/udp.c | |
573 | -+++ linux-4.19.161/net/ipv4/udp.c | |
572 | +--- linux-4.19.162.orig/net/ipv4/udp.c | |
573 | ++++ linux-4.19.162/net/ipv4/udp.c | |
574 | 574 | @@ -1686,6 +1686,8 @@ try_again: |
575 | 575 | skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err); |
576 | 576 | if (!skb) |
@@ -580,8 +580,8 @@ | ||
580 | 580 | |
581 | 581 | ulen = udp_skb_len(skb); |
582 | 582 | copied = len; |
583 | ---- linux-4.19.161.orig/net/ipv6/raw.c | |
584 | -+++ linux-4.19.161/net/ipv6/raw.c | |
583 | +--- linux-4.19.162.orig/net/ipv6/raw.c | |
584 | ++++ linux-4.19.162/net/ipv6/raw.c | |
585 | 585 | @@ -485,6 +485,10 @@ static int rawv6_recvmsg(struct sock *sk |
586 | 586 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
587 | 587 | if (!skb) |
@@ -593,8 +593,8 @@ | ||
593 | 593 | |
594 | 594 | copied = skb->len; |
595 | 595 | if (copied > len) { |
596 | ---- linux-4.19.161.orig/net/ipv6/udp.c | |
597 | -+++ linux-4.19.161/net/ipv6/udp.c | |
596 | +--- linux-4.19.162.orig/net/ipv6/udp.c | |
597 | ++++ linux-4.19.162/net/ipv6/udp.c | |
598 | 598 | @@ -347,6 +347,8 @@ try_again: |
599 | 599 | skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err); |
600 | 600 | if (!skb) |
@@ -604,8 +604,8 @@ | ||
604 | 604 | |
605 | 605 | ulen = udp6_skb_len(skb); |
606 | 606 | copied = len; |
607 | ---- linux-4.19.161.orig/net/socket.c | |
608 | -+++ linux-4.19.161/net/socket.c | |
607 | +--- linux-4.19.162.orig/net/socket.c | |
608 | ++++ linux-4.19.162/net/socket.c | |
609 | 609 | @@ -1590,6 +1590,10 @@ int __sys_accept4(int fd, struct sockadd |
610 | 610 | if (err < 0) |
611 | 611 | goto out_fd; |
@@ -617,8 +617,8 @@ | ||
617 | 617 | if (upeer_sockaddr) { |
618 | 618 | len = newsock->ops->getname(newsock, |
619 | 619 | (struct sockaddr *)&address, 2); |
620 | ---- linux-4.19.161.orig/net/unix/af_unix.c | |
621 | -+++ linux-4.19.161/net/unix/af_unix.c | |
620 | +--- linux-4.19.162.orig/net/unix/af_unix.c | |
621 | ++++ linux-4.19.162/net/unix/af_unix.c | |
622 | 622 | @@ -2158,6 +2158,10 @@ static int unix_dgram_recvmsg(struct soc |
623 | 623 | EPOLLOUT | EPOLLWRNORM | |
624 | 624 | EPOLLWRBAND); |
@@ -638,8 +638,8 @@ | ||
638 | 638 | mutex_unlock(&u->iolock); |
639 | 639 | out: |
640 | 640 | return err; |
641 | ---- linux-4.19.161.orig/security/Kconfig | |
642 | -+++ linux-4.19.161/security/Kconfig | |
641 | +--- linux-4.19.162.orig/security/Kconfig | |
642 | ++++ linux-4.19.162/security/Kconfig | |
643 | 643 | @@ -276,5 +276,7 @@ config DEFAULT_SECURITY |
644 | 644 | default "apparmor" if DEFAULT_SECURITY_APPARMOR |
645 | 645 | default "" if DEFAULT_SECURITY_DAC |
@@ -648,8 +648,8 @@ | ||
648 | 648 | + |
649 | 649 | endmenu |
650 | 650 | |
651 | ---- linux-4.19.161.orig/security/Makefile | |
652 | -+++ linux-4.19.161/security/Makefile | |
651 | +--- linux-4.19.162.orig/security/Makefile | |
652 | ++++ linux-4.19.162/security/Makefile | |
653 | 653 | @@ -30,3 +30,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c |
654 | 654 | # Object integrity file lists |
655 | 655 | subdir-$(CONFIG_INTEGRITY) += integrity |
@@ -657,8 +657,8 @@ | ||
657 | 657 | + |
658 | 658 | +subdir-$(CONFIG_CCSECURITY) += ccsecurity |
659 | 659 | +obj-$(CONFIG_CCSECURITY) += ccsecurity/ |
660 | ---- linux-4.19.161.orig/security/security.c | |
661 | -+++ linux-4.19.161/security/security.c | |
660 | +--- linux-4.19.162.orig/security/security.c | |
661 | ++++ linux-4.19.162/security/security.c | |
662 | 662 | @@ -984,12 +984,19 @@ int security_file_open(struct file *file |
663 | 663 | |
664 | 664 | int security_task_alloc(struct task_struct *task, unsigned long clone_flags) |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 5.10-rc6. | |
1 | +This is TOMOYO Linux patch for kernel 5.10-rc7. | |
2 | 2 | |
3 | -Source code for this patch is https://git.kernel.org/torvalds/t/linux-5.10-rc6.tar.gz | |
3 | +Source code for this patch is https://git.kernel.org/torvalds/t/linux-5.10-rc7.tar.gz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 - |
6 | 6 | fs/open.c | 2 + |
@@ -28,8 +28,8 @@ | ||
28 | 28 | security/security.c | 5 ++- |
29 | 29 | 24 files changed, 160 insertions(+), 30 deletions(-) |
30 | 30 | |
31 | ---- linux-5.10-rc6.orig/fs/exec.c | |
32 | -+++ linux-5.10-rc6/fs/exec.c | |
31 | +--- linux-5.10-rc7.orig/fs/exec.c | |
32 | ++++ linux-5.10-rc7/fs/exec.c | |
33 | 33 | @@ -1817,7 +1817,7 @@ static int bprm_execve(struct linux_binp |
34 | 34 | if (retval) |
35 | 35 | goto out; |
@@ -39,8 +39,8 @@ | ||
39 | 39 | if (retval < 0) |
40 | 40 | goto out; |
41 | 41 | |
42 | ---- linux-5.10-rc6.orig/fs/open.c | |
43 | -+++ linux-5.10-rc6/fs/open.c | |
42 | +--- linux-5.10-rc7.orig/fs/open.c | |
43 | ++++ linux-5.10-rc7/fs/open.c | |
44 | 44 | @@ -1327,6 +1327,8 @@ SYSCALL_DEFINE3(close_range, unsigned in |
45 | 45 | */ |
46 | 46 | SYSCALL_DEFINE0(vhangup) |
@@ -50,8 +50,8 @@ | ||
50 | 50 | if (capable(CAP_SYS_TTY_CONFIG)) { |
51 | 51 | tty_vhangup_self(); |
52 | 52 | return 0; |
53 | ---- linux-5.10-rc6.orig/fs/proc/version.c | |
54 | -+++ linux-5.10-rc6/fs/proc/version.c | |
53 | +--- linux-5.10-rc7.orig/fs/proc/version.c | |
54 | ++++ linux-5.10-rc7/fs/proc/version.c | |
55 | 55 | @@ -21,3 +21,10 @@ static int __init proc_version_init(void |
56 | 56 | return 0; |
57 | 57 | } |
@@ -59,12 +59,12 @@ | ||
59 | 59 | + |
60 | 60 | +static int __init ccs_show_version(void) |
61 | 61 | +{ |
62 | -+ printk(KERN_INFO "Hook version: 5.10-rc6 2020/12/02\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 5.10-rc7 2020/12/08\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-5.10-rc6.orig/include/linux/sched.h | |
67 | -+++ linux-5.10-rc6/include/linux/sched.h | |
66 | +--- linux-5.10-rc7.orig/include/linux/sched.h | |
67 | ++++ linux-5.10-rc7/include/linux/sched.h | |
68 | 68 | @@ -41,6 +41,7 @@ struct backing_dev_info; |
69 | 69 | struct bio_list; |
70 | 70 | struct blk_plug; |
@@ -84,8 +84,8 @@ | ||
84 | 84 | |
85 | 85 | #ifdef CONFIG_GCC_PLUGIN_STACKLEAK |
86 | 86 | unsigned long lowest_stack; |
87 | ---- linux-5.10-rc6.orig/include/linux/security.h | |
88 | -+++ linux-5.10-rc6/include/linux/security.h | |
87 | +--- linux-5.10-rc7.orig/include/linux/security.h | |
88 | ++++ linux-5.10-rc7/include/linux/security.h | |
89 | 89 | @@ -59,6 +59,7 @@ struct fs_parameter; |
90 | 90 | enum fs_value_type; |
91 | 91 | struct watch; |
@@ -315,8 +315,8 @@ | ||
315 | 315 | } |
316 | 316 | #endif /* CONFIG_SECURITY_PATH */ |
317 | 317 | |
318 | ---- linux-5.10-rc6.orig/include/net/ip.h | |
319 | -+++ linux-5.10-rc6/include/net/ip.h | |
318 | +--- linux-5.10-rc7.orig/include/net/ip.h | |
319 | ++++ linux-5.10-rc7/include/net/ip.h | |
320 | 320 | @@ -338,6 +338,8 @@ void inet_get_local_port_range(struct ne |
321 | 321 | #ifdef CONFIG_SYSCTL |
322 | 322 | static inline bool inet_is_local_reserved_port(struct net *net, unsigned short port) |
@@ -335,8 +335,8 @@ | ||
335 | 335 | return false; |
336 | 336 | } |
337 | 337 | |
338 | ---- linux-5.10-rc6.orig/init/init_task.c | |
339 | -+++ linux-5.10-rc6/init/init_task.c | |
338 | +--- linux-5.10-rc7.orig/init/init_task.c | |
339 | ++++ linux-5.10-rc7/init/init_task.c | |
340 | 340 | @@ -212,6 +212,10 @@ struct task_struct init_task |
341 | 341 | #ifdef CONFIG_SECCOMP |
342 | 342 | .seccomp = { .filter_count = ATOMIC_INIT(0) }, |
@@ -348,8 +348,8 @@ | ||
348 | 348 | }; |
349 | 349 | EXPORT_SYMBOL(init_task); |
350 | 350 | |
351 | ---- linux-5.10-rc6.orig/kernel/kexec.c | |
352 | -+++ linux-5.10-rc6/kernel/kexec.c | |
351 | +--- linux-5.10-rc7.orig/kernel/kexec.c | |
352 | ++++ linux-5.10-rc7/kernel/kexec.c | |
353 | 353 | @@ -16,7 +16,7 @@ |
354 | 354 | #include <linux/syscalls.h> |
355 | 355 | #include <linux/vmalloc.h> |
@@ -368,8 +368,8 @@ | ||
368 | 368 | |
369 | 369 | /* Permit LSMs and IMA to fail the kexec */ |
370 | 370 | result = security_kernel_load_data(LOADING_KEXEC_IMAGE, false); |
371 | ---- linux-5.10-rc6.orig/kernel/module.c | |
372 | -+++ linux-5.10-rc6/kernel/module.c | |
371 | +--- linux-5.10-rc7.orig/kernel/module.c | |
372 | ++++ linux-5.10-rc7/kernel/module.c | |
373 | 373 | @@ -59,6 +59,7 @@ |
374 | 374 | #include <linux/audit.h> |
375 | 375 | #include <uapi/linux/module.h> |
@@ -396,8 +396,8 @@ | ||
396 | 396 | |
397 | 397 | return 0; |
398 | 398 | } |
399 | ---- linux-5.10-rc6.orig/kernel/ptrace.c | |
400 | -+++ linux-5.10-rc6/kernel/ptrace.c | |
399 | +--- linux-5.10-rc7.orig/kernel/ptrace.c | |
400 | ++++ linux-5.10-rc7/kernel/ptrace.c | |
401 | 401 | @@ -1238,6 +1238,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l |
402 | 402 | { |
403 | 403 | struct task_struct *child; |
@@ -422,8 +422,8 @@ | ||
422 | 422 | |
423 | 423 | if (request == PTRACE_TRACEME) { |
424 | 424 | ret = ptrace_traceme(); |
425 | ---- linux-5.10-rc6.orig/kernel/reboot.c | |
426 | -+++ linux-5.10-rc6/kernel/reboot.c | |
425 | +--- linux-5.10-rc7.orig/kernel/reboot.c | |
426 | ++++ linux-5.10-rc7/kernel/reboot.c | |
427 | 427 | @@ -17,6 +17,7 @@ |
428 | 428 | #include <linux/syscalls.h> |
429 | 429 | #include <linux/syscore_ops.h> |
@@ -441,8 +441,8 @@ | ||
441 | 441 | |
442 | 442 | /* |
443 | 443 | * If pid namespaces are enabled and the current task is in a child |
444 | ---- linux-5.10-rc6.orig/kernel/sched/core.c | |
445 | -+++ linux-5.10-rc6/kernel/sched/core.c | |
444 | +--- linux-5.10-rc7.orig/kernel/sched/core.c | |
445 | ++++ linux-5.10-rc7/kernel/sched/core.c | |
446 | 446 | @@ -5035,6 +5035,8 @@ int can_nice(const struct task_struct *p |
447 | 447 | SYSCALL_DEFINE1(nice, int, increment) |
448 | 448 | { |
@@ -452,8 +452,8 @@ | ||
452 | 452 | |
453 | 453 | /* |
454 | 454 | * Setpriority might change our priority at the same moment. |
455 | ---- linux-5.10-rc6.orig/kernel/signal.c | |
456 | -+++ linux-5.10-rc6/kernel/signal.c | |
455 | +--- linux-5.10-rc7.orig/kernel/signal.c | |
456 | ++++ linux-5.10-rc7/kernel/signal.c | |
457 | 457 | @@ -3658,6 +3658,8 @@ static inline void prepare_kill_siginfo( |
458 | 458 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
459 | 459 | { |
@@ -521,8 +521,8 @@ | ||
521 | 521 | |
522 | 522 | return do_send_specific(tgid, pid, sig, info); |
523 | 523 | } |
524 | ---- linux-5.10-rc6.orig/kernel/sys.c | |
525 | -+++ linux-5.10-rc6/kernel/sys.c | |
524 | +--- linux-5.10-rc7.orig/kernel/sys.c | |
525 | ++++ linux-5.10-rc7/kernel/sys.c | |
526 | 526 | @@ -205,6 +205,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
527 | 527 | |
528 | 528 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -552,8 +552,8 @@ | ||
552 | 552 | |
553 | 553 | errno = -EFAULT; |
554 | 554 | if (!copy_from_user(tmp, name, len)) { |
555 | ---- linux-5.10-rc6.orig/kernel/time/timekeeping.c | |
556 | -+++ linux-5.10-rc6/kernel/time/timekeeping.c | |
555 | +--- linux-5.10-rc7.orig/kernel/time/timekeeping.c | |
556 | ++++ linux-5.10-rc7/kernel/time/timekeeping.c | |
557 | 557 | @@ -22,6 +22,7 @@ |
558 | 558 | #include <linux/pvclock_gtod.h> |
559 | 559 | #include <linux/compiler.h> |
@@ -587,8 +587,8 @@ | ||
587 | 587 | |
588 | 588 | /* |
589 | 589 | * Validate if a timespec/timeval used to inject a time |
590 | ---- linux-5.10-rc6.orig/net/ipv4/raw.c | |
591 | -+++ linux-5.10-rc6/net/ipv4/raw.c | |
590 | +--- linux-5.10-rc7.orig/net/ipv4/raw.c | |
591 | ++++ linux-5.10-rc7/net/ipv4/raw.c | |
592 | 592 | @@ -768,6 +768,10 @@ static int raw_recvmsg(struct sock *sk, |
593 | 593 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
594 | 594 | if (!skb) |
@@ -600,8 +600,8 @@ | ||
600 | 600 | |
601 | 601 | copied = skb->len; |
602 | 602 | if (len < copied) { |
603 | ---- linux-5.10-rc6.orig/net/ipv4/udp.c | |
604 | -+++ linux-5.10-rc6/net/ipv4/udp.c | |
603 | +--- linux-5.10-rc7.orig/net/ipv4/udp.c | |
604 | ++++ linux-5.10-rc7/net/ipv4/udp.c | |
605 | 605 | @@ -1801,6 +1801,8 @@ try_again: |
606 | 606 | skb = __skb_recv_udp(sk, flags, noblock, &off, &err); |
607 | 607 | if (!skb) |
@@ -611,8 +611,8 @@ | ||
611 | 611 | |
612 | 612 | ulen = udp_skb_len(skb); |
613 | 613 | copied = len; |
614 | ---- linux-5.10-rc6.orig/net/ipv6/raw.c | |
615 | -+++ linux-5.10-rc6/net/ipv6/raw.c | |
614 | +--- linux-5.10-rc7.orig/net/ipv6/raw.c | |
615 | ++++ linux-5.10-rc7/net/ipv6/raw.c | |
616 | 616 | @@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk |
617 | 617 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
618 | 618 | if (!skb) |
@@ -624,8 +624,8 @@ | ||
624 | 624 | |
625 | 625 | copied = skb->len; |
626 | 626 | if (copied > len) { |
627 | ---- linux-5.10-rc6.orig/net/ipv6/udp.c | |
628 | -+++ linux-5.10-rc6/net/ipv6/udp.c | |
627 | +--- linux-5.10-rc7.orig/net/ipv6/udp.c | |
628 | ++++ linux-5.10-rc7/net/ipv6/udp.c | |
629 | 629 | @@ -343,6 +343,8 @@ try_again: |
630 | 630 | skb = __skb_recv_udp(sk, flags, noblock, &off, &err); |
631 | 631 | if (!skb) |
@@ -635,8 +635,8 @@ | ||
635 | 635 | |
636 | 636 | ulen = udp6_skb_len(skb); |
637 | 637 | copied = len; |
638 | ---- linux-5.10-rc6.orig/net/socket.c | |
639 | -+++ linux-5.10-rc6/net/socket.c | |
638 | +--- linux-5.10-rc7.orig/net/socket.c | |
639 | ++++ linux-5.10-rc7/net/socket.c | |
640 | 640 | @@ -1755,6 +1755,10 @@ int __sys_accept4_file(struct file *file |
641 | 641 | if (err < 0) |
642 | 642 | goto out_fd; |
@@ -648,8 +648,8 @@ | ||
648 | 648 | if (upeer_sockaddr) { |
649 | 649 | len = newsock->ops->getname(newsock, |
650 | 650 | (struct sockaddr *)&address, 2); |
651 | ---- linux-5.10-rc6.orig/net/unix/af_unix.c | |
652 | -+++ linux-5.10-rc6/net/unix/af_unix.c | |
651 | +--- linux-5.10-rc7.orig/net/unix/af_unix.c | |
652 | ++++ linux-5.10-rc7/net/unix/af_unix.c | |
653 | 653 | @@ -2127,6 +2127,10 @@ static int unix_dgram_recvmsg(struct soc |
654 | 654 | EPOLLOUT | EPOLLWRNORM | |
655 | 655 | EPOLLWRBAND); |
@@ -669,8 +669,8 @@ | ||
669 | 669 | mutex_unlock(&u->iolock); |
670 | 670 | out: |
671 | 671 | return err; |
672 | ---- linux-5.10-rc6.orig/security/Kconfig | |
673 | -+++ linux-5.10-rc6/security/Kconfig | |
672 | +--- linux-5.10-rc7.orig/security/Kconfig | |
673 | ++++ linux-5.10-rc7/security/Kconfig | |
674 | 674 | @@ -291,5 +291,7 @@ config LSM |
675 | 675 | |
676 | 676 | source "security/Kconfig.hardening" |
@@ -679,8 +679,8 @@ | ||
679 | 679 | + |
680 | 680 | endmenu |
681 | 681 | |
682 | ---- linux-5.10-rc6.orig/security/Makefile | |
683 | -+++ linux-5.10-rc6/security/Makefile | |
682 | +--- linux-5.10-rc7.orig/security/Makefile | |
683 | ++++ linux-5.10-rc7/security/Makefile | |
684 | 684 | @@ -36,3 +36,6 @@ obj-$(CONFIG_BPF_LSM) += bpf/ |
685 | 685 | # Object integrity file lists |
686 | 686 | subdir-$(CONFIG_INTEGRITY) += integrity |
@@ -688,8 +688,8 @@ | ||
688 | 688 | + |
689 | 689 | +subdir-$(CONFIG_CCSECURITY) += ccsecurity |
690 | 690 | +obj-$(CONFIG_CCSECURITY) += ccsecurity/ |
691 | ---- linux-5.10-rc6.orig/security/security.c | |
692 | -+++ linux-5.10-rc6/security/security.c | |
691 | +--- linux-5.10-rc7.orig/security/security.c | |
692 | ++++ linux-5.10-rc7/security/security.c | |
693 | 693 | @@ -1585,7 +1585,9 @@ int security_task_alloc(struct task_stru |
694 | 694 | |
695 | 695 | if (rc) |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 5.4.81. | |
1 | +This is TOMOYO Linux patch for kernel 5.4.82. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.81.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.82.tar.xz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 - |
6 | 6 | fs/open.c | 2 + |
@@ -28,8 +28,8 @@ | ||
28 | 28 | security/security.c | 5 ++- |
29 | 29 | 24 files changed, 160 insertions(+), 30 deletions(-) |
30 | 30 | |
31 | ---- linux-5.4.81.orig/fs/exec.c | |
32 | -+++ linux-5.4.81/fs/exec.c | |
31 | +--- linux-5.4.82.orig/fs/exec.c | |
32 | ++++ linux-5.4.82/fs/exec.c | |
33 | 33 | @@ -1730,7 +1730,7 @@ static int exec_binprm(struct linux_binp |
34 | 34 | old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent)); |
35 | 35 | rcu_read_unlock(); |
@@ -39,8 +39,8 @@ | ||
39 | 39 | if (ret >= 0) { |
40 | 40 | audit_bprm(bprm); |
41 | 41 | trace_sched_process_exec(current, old_pid, bprm); |
42 | ---- linux-5.4.81.orig/fs/open.c | |
43 | -+++ linux-5.4.81/fs/open.c | |
42 | +--- linux-5.4.82.orig/fs/open.c | |
43 | ++++ linux-5.4.82/fs/open.c | |
44 | 44 | @@ -1205,6 +1205,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd) |
45 | 45 | */ |
46 | 46 | SYSCALL_DEFINE0(vhangup) |
@@ -50,8 +50,8 @@ | ||
50 | 50 | if (capable(CAP_SYS_TTY_CONFIG)) { |
51 | 51 | tty_vhangup_self(); |
52 | 52 | return 0; |
53 | ---- linux-5.4.81.orig/fs/proc/version.c | |
54 | -+++ linux-5.4.81/fs/proc/version.c | |
53 | +--- linux-5.4.82.orig/fs/proc/version.c | |
54 | ++++ linux-5.4.82/fs/proc/version.c | |
55 | 55 | @@ -21,3 +21,10 @@ static int __init proc_version_init(void |
56 | 56 | return 0; |
57 | 57 | } |
@@ -59,12 +59,12 @@ | ||
59 | 59 | + |
60 | 60 | +static int __init ccs_show_version(void) |
61 | 61 | +{ |
62 | -+ printk(KERN_INFO "Hook version: 5.4.81 2020/12/02\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 5.4.82 2020/12/08\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-5.4.81.orig/include/linux/sched.h | |
67 | -+++ linux-5.4.81/include/linux/sched.h | |
66 | +--- linux-5.4.82.orig/include/linux/sched.h | |
67 | ++++ linux-5.4.82/include/linux/sched.h | |
68 | 68 | @@ -38,6 +38,7 @@ struct backing_dev_info; |
69 | 69 | struct bio_list; |
70 | 70 | struct blk_plug; |
@@ -84,8 +84,8 @@ | ||
84 | 84 | |
85 | 85 | #ifdef CONFIG_GCC_PLUGIN_STACKLEAK |
86 | 86 | unsigned long lowest_stack; |
87 | ---- linux-5.4.81.orig/include/linux/security.h | |
88 | -+++ linux-5.4.81/include/linux/security.h | |
87 | +--- linux-5.4.82.orig/include/linux/security.h | |
88 | ++++ linux-5.4.82/include/linux/security.h | |
89 | 89 | @@ -57,6 +57,7 @@ struct mm_struct; |
90 | 90 | struct fs_context; |
91 | 91 | struct fs_parameter; |
@@ -315,8 +315,8 @@ | ||
315 | 315 | } |
316 | 316 | #endif /* CONFIG_SECURITY_PATH */ |
317 | 317 | |
318 | ---- linux-5.4.81.orig/include/net/ip.h | |
319 | -+++ linux-5.4.81/include/net/ip.h | |
318 | +--- linux-5.4.82.orig/include/net/ip.h | |
319 | ++++ linux-5.4.82/include/net/ip.h | |
320 | 320 | @@ -341,6 +341,8 @@ void inet_get_local_port_range(struct ne |
321 | 321 | #ifdef CONFIG_SYSCTL |
322 | 322 | static inline int inet_is_local_reserved_port(struct net *net, int port) |
@@ -335,8 +335,8 @@ | ||
335 | 335 | return 0; |
336 | 336 | } |
337 | 337 | |
338 | ---- linux-5.4.81.orig/init/init_task.c | |
339 | -+++ linux-5.4.81/init/init_task.c | |
338 | +--- linux-5.4.82.orig/init/init_task.c | |
339 | ++++ linux-5.4.82/init/init_task.c | |
340 | 340 | @@ -182,6 +182,10 @@ struct task_struct init_task |
341 | 341 | #ifdef CONFIG_SECURITY |
342 | 342 | .security = NULL, |
@@ -348,8 +348,8 @@ | ||
348 | 348 | }; |
349 | 349 | EXPORT_SYMBOL(init_task); |
350 | 350 | |
351 | ---- linux-5.4.81.orig/kernel/kexec.c | |
352 | -+++ linux-5.4.81/kernel/kexec.c | |
351 | +--- linux-5.4.82.orig/kernel/kexec.c | |
352 | ++++ linux-5.4.82/kernel/kexec.c | |
353 | 353 | @@ -16,7 +16,7 @@ |
354 | 354 | #include <linux/syscalls.h> |
355 | 355 | #include <linux/vmalloc.h> |
@@ -368,8 +368,8 @@ | ||
368 | 368 | |
369 | 369 | /* Permit LSMs and IMA to fail the kexec */ |
370 | 370 | result = security_kernel_load_data(LOADING_KEXEC_IMAGE); |
371 | ---- linux-5.4.81.orig/kernel/module.c | |
372 | -+++ linux-5.4.81/kernel/module.c | |
371 | +--- linux-5.4.82.orig/kernel/module.c | |
372 | ++++ linux-5.4.82/kernel/module.c | |
373 | 373 | @@ -55,6 +55,7 @@ |
374 | 374 | #include <linux/audit.h> |
375 | 375 | #include <uapi/linux/module.h> |
@@ -396,8 +396,8 @@ | ||
396 | 396 | |
397 | 397 | return 0; |
398 | 398 | } |
399 | ---- linux-5.4.81.orig/kernel/ptrace.c | |
400 | -+++ linux-5.4.81/kernel/ptrace.c | |
399 | +--- linux-5.4.82.orig/kernel/ptrace.c | |
400 | ++++ linux-5.4.82/kernel/ptrace.c | |
401 | 401 | @@ -1238,6 +1238,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l |
402 | 402 | { |
403 | 403 | struct task_struct *child; |
@@ -422,8 +422,8 @@ | ||
422 | 422 | |
423 | 423 | if (request == PTRACE_TRACEME) { |
424 | 424 | ret = ptrace_traceme(); |
425 | ---- linux-5.4.81.orig/kernel/reboot.c | |
426 | -+++ linux-5.4.81/kernel/reboot.c | |
425 | +--- linux-5.4.82.orig/kernel/reboot.c | |
426 | ++++ linux-5.4.82/kernel/reboot.c | |
427 | 427 | @@ -17,6 +17,7 @@ |
428 | 428 | #include <linux/syscalls.h> |
429 | 429 | #include <linux/syscore_ops.h> |
@@ -441,8 +441,8 @@ | ||
441 | 441 | |
442 | 442 | /* |
443 | 443 | * If pid namespaces are enabled and the current task is in a child |
444 | ---- linux-5.4.81.orig/kernel/sched/core.c | |
445 | -+++ linux-5.4.81/kernel/sched/core.c | |
444 | +--- linux-5.4.82.orig/kernel/sched/core.c | |
445 | ++++ linux-5.4.82/kernel/sched/core.c | |
446 | 446 | @@ -4663,6 +4663,8 @@ int can_nice(const struct task_struct *p |
447 | 447 | SYSCALL_DEFINE1(nice, int, increment) |
448 | 448 | { |
@@ -452,8 +452,8 @@ | ||
452 | 452 | |
453 | 453 | /* |
454 | 454 | * Setpriority might change our priority at the same moment. |
455 | ---- linux-5.4.81.orig/kernel/signal.c | |
456 | -+++ linux-5.4.81/kernel/signal.c | |
455 | +--- linux-5.4.82.orig/kernel/signal.c | |
456 | ++++ linux-5.4.82/kernel/signal.c | |
457 | 457 | @@ -3644,6 +3644,8 @@ static inline void prepare_kill_siginfo( |
458 | 458 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
459 | 459 | { |
@@ -521,8 +521,8 @@ | ||
521 | 521 | |
522 | 522 | return do_send_specific(tgid, pid, sig, info); |
523 | 523 | } |
524 | ---- linux-5.4.81.orig/kernel/sys.c | |
525 | -+++ linux-5.4.81/kernel/sys.c | |
524 | +--- linux-5.4.82.orig/kernel/sys.c | |
525 | ++++ linux-5.4.82/kernel/sys.c | |
526 | 526 | @@ -204,6 +204,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
527 | 527 | |
528 | 528 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -552,8 +552,8 @@ | ||
552 | 552 | |
553 | 553 | errno = -EFAULT; |
554 | 554 | if (!copy_from_user(tmp, name, len)) { |
555 | ---- linux-5.4.81.orig/kernel/time/timekeeping.c | |
556 | -+++ linux-5.4.81/kernel/time/timekeeping.c | |
555 | +--- linux-5.4.82.orig/kernel/time/timekeeping.c | |
556 | ++++ linux-5.4.82/kernel/time/timekeeping.c | |
557 | 557 | @@ -22,6 +22,7 @@ |
558 | 558 | #include <linux/pvclock_gtod.h> |
559 | 559 | #include <linux/compiler.h> |
@@ -587,8 +587,8 @@ | ||
587 | 587 | |
588 | 588 | /* |
589 | 589 | * Validate if a timespec/timeval used to inject a time |
590 | ---- linux-5.4.81.orig/net/ipv4/raw.c | |
591 | -+++ linux-5.4.81/net/ipv4/raw.c | |
590 | +--- linux-5.4.82.orig/net/ipv4/raw.c | |
591 | ++++ linux-5.4.82/net/ipv4/raw.c | |
592 | 592 | @@ -767,6 +767,10 @@ static int raw_recvmsg(struct sock *sk, |
593 | 593 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
594 | 594 | if (!skb) |
@@ -600,8 +600,8 @@ | ||
600 | 600 | |
601 | 601 | copied = skb->len; |
602 | 602 | if (len < copied) { |
603 | ---- linux-5.4.81.orig/net/ipv4/udp.c | |
604 | -+++ linux-5.4.81/net/ipv4/udp.c | |
603 | +--- linux-5.4.82.orig/net/ipv4/udp.c | |
604 | ++++ linux-5.4.82/net/ipv4/udp.c | |
605 | 605 | @@ -1744,6 +1744,8 @@ try_again: |
606 | 606 | skb = __skb_recv_udp(sk, flags, noblock, &off, &err); |
607 | 607 | if (!skb) |
@@ -611,8 +611,8 @@ | ||
611 | 611 | |
612 | 612 | ulen = udp_skb_len(skb); |
613 | 613 | copied = len; |
614 | ---- linux-5.4.81.orig/net/ipv6/raw.c | |
615 | -+++ linux-5.4.81/net/ipv6/raw.c | |
614 | +--- linux-5.4.82.orig/net/ipv6/raw.c | |
615 | ++++ linux-5.4.82/net/ipv6/raw.c | |
616 | 616 | @@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk |
617 | 617 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
618 | 618 | if (!skb) |
@@ -624,8 +624,8 @@ | ||
624 | 624 | |
625 | 625 | copied = skb->len; |
626 | 626 | if (copied > len) { |
627 | ---- linux-5.4.81.orig/net/ipv6/udp.c | |
628 | -+++ linux-5.4.81/net/ipv6/udp.c | |
627 | +--- linux-5.4.82.orig/net/ipv6/udp.c | |
628 | ++++ linux-5.4.82/net/ipv6/udp.c | |
629 | 629 | @@ -291,6 +291,8 @@ try_again: |
630 | 630 | skb = __skb_recv_udp(sk, flags, noblock, &off, &err); |
631 | 631 | if (!skb) |
@@ -635,8 +635,8 @@ | ||
635 | 635 | |
636 | 636 | ulen = udp6_skb_len(skb); |
637 | 637 | copied = len; |
638 | ---- linux-5.4.81.orig/net/socket.c | |
639 | -+++ linux-5.4.81/net/socket.c | |
638 | +--- linux-5.4.82.orig/net/socket.c | |
639 | ++++ linux-5.4.82/net/socket.c | |
640 | 640 | @@ -1755,6 +1755,10 @@ int __sys_accept4(int fd, struct sockadd |
641 | 641 | if (err < 0) |
642 | 642 | goto out_fd; |
@@ -648,8 +648,8 @@ | ||
648 | 648 | if (upeer_sockaddr) { |
649 | 649 | len = newsock->ops->getname(newsock, |
650 | 650 | (struct sockaddr *)&address, 2); |
651 | ---- linux-5.4.81.orig/net/unix/af_unix.c | |
652 | -+++ linux-5.4.81/net/unix/af_unix.c | |
651 | +--- linux-5.4.82.orig/net/unix/af_unix.c | |
652 | ++++ linux-5.4.82/net/unix/af_unix.c | |
653 | 653 | @@ -2094,6 +2094,10 @@ static int unix_dgram_recvmsg(struct soc |
654 | 654 | EPOLLOUT | EPOLLWRNORM | |
655 | 655 | EPOLLWRBAND); |
@@ -669,8 +669,8 @@ | ||
669 | 669 | mutex_unlock(&u->iolock); |
670 | 670 | out: |
671 | 671 | return err; |
672 | ---- linux-5.4.81.orig/security/Kconfig | |
673 | -+++ linux-5.4.81/security/Kconfig | |
672 | +--- linux-5.4.82.orig/security/Kconfig | |
673 | ++++ linux-5.4.82/security/Kconfig | |
674 | 674 | @@ -291,5 +291,7 @@ config LSM |
675 | 675 | |
676 | 676 | source "security/Kconfig.hardening" |
@@ -679,8 +679,8 @@ | ||
679 | 679 | + |
680 | 680 | endmenu |
681 | 681 | |
682 | ---- linux-5.4.81.orig/security/Makefile | |
683 | -+++ linux-5.4.81/security/Makefile | |
682 | +--- linux-5.4.82.orig/security/Makefile | |
683 | ++++ linux-5.4.82/security/Makefile | |
684 | 684 | @@ -34,3 +34,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c |
685 | 685 | # Object integrity file lists |
686 | 686 | subdir-$(CONFIG_INTEGRITY) += integrity |
@@ -688,8 +688,8 @@ | ||
688 | 688 | + |
689 | 689 | +subdir-$(CONFIG_CCSECURITY) += ccsecurity |
690 | 690 | +obj-$(CONFIG_CCSECURITY) += ccsecurity/ |
691 | ---- linux-5.4.81.orig/security/security.c | |
692 | -+++ linux-5.4.81/security/security.c | |
691 | +--- linux-5.4.82.orig/security/security.c | |
692 | ++++ linux-5.4.82/security/security.c | |
693 | 693 | @@ -1507,7 +1507,9 @@ int security_task_alloc(struct task_stru |
694 | 694 | |
695 | 695 | if (rc) |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 5.9.12. | |
1 | +This is TOMOYO Linux patch for kernel 5.9.13. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.12.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.13.tar.xz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 - |
6 | 6 | fs/open.c | 2 + |
@@ -28,8 +28,8 @@ | ||
28 | 28 | security/security.c | 5 ++- |
29 | 29 | 24 files changed, 160 insertions(+), 30 deletions(-) |
30 | 30 | |
31 | ---- linux-5.9.12.orig/fs/exec.c | |
32 | -+++ linux-5.9.12/fs/exec.c | |
31 | +--- linux-5.9.13.orig/fs/exec.c | |
32 | ++++ linux-5.9.13/fs/exec.c | |
33 | 33 | @@ -1948,7 +1948,7 @@ static int bprm_execve(struct linux_binp |
34 | 34 | if (retval) |
35 | 35 | goto out; |
@@ -39,8 +39,8 @@ | ||
39 | 39 | if (retval < 0) |
40 | 40 | goto out; |
41 | 41 | |
42 | ---- linux-5.9.12.orig/fs/open.c | |
43 | -+++ linux-5.9.12/fs/open.c | |
42 | +--- linux-5.9.13.orig/fs/open.c | |
43 | ++++ linux-5.9.13/fs/open.c | |
44 | 44 | @@ -1327,6 +1327,8 @@ SYSCALL_DEFINE3(close_range, unsigned in |
45 | 45 | */ |
46 | 46 | SYSCALL_DEFINE0(vhangup) |
@@ -50,8 +50,8 @@ | ||
50 | 50 | if (capable(CAP_SYS_TTY_CONFIG)) { |
51 | 51 | tty_vhangup_self(); |
52 | 52 | return 0; |
53 | ---- linux-5.9.12.orig/fs/proc/version.c | |
54 | -+++ linux-5.9.12/fs/proc/version.c | |
53 | +--- linux-5.9.13.orig/fs/proc/version.c | |
54 | ++++ linux-5.9.13/fs/proc/version.c | |
55 | 55 | @@ -21,3 +21,10 @@ static int __init proc_version_init(void |
56 | 56 | return 0; |
57 | 57 | } |
@@ -59,12 +59,12 @@ | ||
59 | 59 | + |
60 | 60 | +static int __init ccs_show_version(void) |
61 | 61 | +{ |
62 | -+ printk(KERN_INFO "Hook version: 5.9.12 2020/12/02\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 5.9.13 2020/12/08\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-5.9.12.orig/include/linux/sched.h | |
67 | -+++ linux-5.9.12/include/linux/sched.h | |
66 | +--- linux-5.9.13.orig/include/linux/sched.h | |
67 | ++++ linux-5.9.13/include/linux/sched.h | |
68 | 68 | @@ -41,6 +41,7 @@ struct backing_dev_info; |
69 | 69 | struct bio_list; |
70 | 70 | struct blk_plug; |
@@ -84,8 +84,8 @@ | ||
84 | 84 | |
85 | 85 | #ifdef CONFIG_GCC_PLUGIN_STACKLEAK |
86 | 86 | unsigned long lowest_stack; |
87 | ---- linux-5.9.12.orig/include/linux/security.h | |
88 | -+++ linux-5.9.12/include/linux/security.h | |
87 | +--- linux-5.9.13.orig/include/linux/security.h | |
88 | ++++ linux-5.9.13/include/linux/security.h | |
89 | 89 | @@ -58,6 +58,7 @@ struct fs_parameter; |
90 | 90 | enum fs_value_type; |
91 | 91 | struct watch; |
@@ -315,8 +315,8 @@ | ||
315 | 315 | } |
316 | 316 | #endif /* CONFIG_SECURITY_PATH */ |
317 | 317 | |
318 | ---- linux-5.9.12.orig/include/net/ip.h | |
319 | -+++ linux-5.9.12/include/net/ip.h | |
318 | +--- linux-5.9.13.orig/include/net/ip.h | |
319 | ++++ linux-5.9.13/include/net/ip.h | |
320 | 320 | @@ -338,6 +338,8 @@ void inet_get_local_port_range(struct ne |
321 | 321 | #ifdef CONFIG_SYSCTL |
322 | 322 | static inline bool inet_is_local_reserved_port(struct net *net, unsigned short port) |
@@ -335,8 +335,8 @@ | ||
335 | 335 | return false; |
336 | 336 | } |
337 | 337 | |
338 | ---- linux-5.9.12.orig/init/init_task.c | |
339 | -+++ linux-5.9.12/init/init_task.c | |
338 | +--- linux-5.9.13.orig/init/init_task.c | |
339 | ++++ linux-5.9.13/init/init_task.c | |
340 | 340 | @@ -212,6 +212,10 @@ struct task_struct init_task |
341 | 341 | #ifdef CONFIG_SECCOMP |
342 | 342 | .seccomp = { .filter_count = ATOMIC_INIT(0) }, |
@@ -348,8 +348,8 @@ | ||
348 | 348 | }; |
349 | 349 | EXPORT_SYMBOL(init_task); |
350 | 350 | |
351 | ---- linux-5.9.12.orig/kernel/kexec.c | |
352 | -+++ linux-5.9.12/kernel/kexec.c | |
351 | +--- linux-5.9.13.orig/kernel/kexec.c | |
352 | ++++ linux-5.9.13/kernel/kexec.c | |
353 | 353 | @@ -16,7 +16,7 @@ |
354 | 354 | #include <linux/syscalls.h> |
355 | 355 | #include <linux/vmalloc.h> |
@@ -368,8 +368,8 @@ | ||
368 | 368 | |
369 | 369 | /* Permit LSMs and IMA to fail the kexec */ |
370 | 370 | result = security_kernel_load_data(LOADING_KEXEC_IMAGE); |
371 | ---- linux-5.9.12.orig/kernel/module.c | |
372 | -+++ linux-5.9.12/kernel/module.c | |
371 | +--- linux-5.9.13.orig/kernel/module.c | |
372 | ++++ linux-5.9.13/kernel/module.c | |
373 | 373 | @@ -58,6 +58,7 @@ |
374 | 374 | #include <linux/audit.h> |
375 | 375 | #include <uapi/linux/module.h> |
@@ -396,8 +396,8 @@ | ||
396 | 396 | |
397 | 397 | return 0; |
398 | 398 | } |
399 | ---- linux-5.9.12.orig/kernel/ptrace.c | |
400 | -+++ linux-5.9.12/kernel/ptrace.c | |
399 | +--- linux-5.9.13.orig/kernel/ptrace.c | |
400 | ++++ linux-5.9.13/kernel/ptrace.c | |
401 | 401 | @@ -1238,6 +1238,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l |
402 | 402 | { |
403 | 403 | struct task_struct *child; |
@@ -422,8 +422,8 @@ | ||
422 | 422 | |
423 | 423 | if (request == PTRACE_TRACEME) { |
424 | 424 | ret = ptrace_traceme(); |
425 | ---- linux-5.9.12.orig/kernel/reboot.c | |
426 | -+++ linux-5.9.12/kernel/reboot.c | |
425 | +--- linux-5.9.13.orig/kernel/reboot.c | |
426 | ++++ linux-5.9.13/kernel/reboot.c | |
427 | 427 | @@ -17,6 +17,7 @@ |
428 | 428 | #include <linux/syscalls.h> |
429 | 429 | #include <linux/syscore_ops.h> |
@@ -441,8 +441,8 @@ | ||
441 | 441 | |
442 | 442 | /* |
443 | 443 | * If pid namespaces are enabled and the current task is in a child |
444 | ---- linux-5.9.12.orig/kernel/sched/core.c | |
445 | -+++ linux-5.9.12/kernel/sched/core.c | |
444 | +--- linux-5.9.13.orig/kernel/sched/core.c | |
445 | ++++ linux-5.9.13/kernel/sched/core.c | |
446 | 446 | @@ -5035,6 +5035,8 @@ int can_nice(const struct task_struct *p |
447 | 447 | SYSCALL_DEFINE1(nice, int, increment) |
448 | 448 | { |
@@ -452,8 +452,8 @@ | ||
452 | 452 | |
453 | 453 | /* |
454 | 454 | * Setpriority might change our priority at the same moment. |
455 | ---- linux-5.9.12.orig/kernel/signal.c | |
456 | -+++ linux-5.9.12/kernel/signal.c | |
455 | +--- linux-5.9.13.orig/kernel/signal.c | |
456 | ++++ linux-5.9.13/kernel/signal.c | |
457 | 457 | @@ -3658,6 +3658,8 @@ static inline void prepare_kill_siginfo( |
458 | 458 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
459 | 459 | { |
@@ -521,8 +521,8 @@ | ||
521 | 521 | |
522 | 522 | return do_send_specific(tgid, pid, sig, info); |
523 | 523 | } |
524 | ---- linux-5.9.12.orig/kernel/sys.c | |
525 | -+++ linux-5.9.12/kernel/sys.c | |
524 | +--- linux-5.9.13.orig/kernel/sys.c | |
525 | ++++ linux-5.9.13/kernel/sys.c | |
526 | 526 | @@ -205,6 +205,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
527 | 527 | |
528 | 528 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -552,8 +552,8 @@ | ||
552 | 552 | |
553 | 553 | errno = -EFAULT; |
554 | 554 | if (!copy_from_user(tmp, name, len)) { |
555 | ---- linux-5.9.12.orig/kernel/time/timekeeping.c | |
556 | -+++ linux-5.9.12/kernel/time/timekeeping.c | |
555 | +--- linux-5.9.13.orig/kernel/time/timekeeping.c | |
556 | ++++ linux-5.9.13/kernel/time/timekeeping.c | |
557 | 557 | @@ -22,6 +22,7 @@ |
558 | 558 | #include <linux/pvclock_gtod.h> |
559 | 559 | #include <linux/compiler.h> |
@@ -587,8 +587,8 @@ | ||
587 | 587 | |
588 | 588 | /* |
589 | 589 | * Validate if a timespec/timeval used to inject a time |
590 | ---- linux-5.9.12.orig/net/ipv4/raw.c | |
591 | -+++ linux-5.9.12/net/ipv4/raw.c | |
590 | +--- linux-5.9.13.orig/net/ipv4/raw.c | |
591 | ++++ linux-5.9.13/net/ipv4/raw.c | |
592 | 592 | @@ -767,6 +767,10 @@ static int raw_recvmsg(struct sock *sk, |
593 | 593 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
594 | 594 | if (!skb) |
@@ -600,8 +600,8 @@ | ||
600 | 600 | |
601 | 601 | copied = skb->len; |
602 | 602 | if (len < copied) { |
603 | ---- linux-5.9.12.orig/net/ipv4/udp.c | |
604 | -+++ linux-5.9.12/net/ipv4/udp.c | |
603 | +--- linux-5.9.13.orig/net/ipv4/udp.c | |
604 | ++++ linux-5.9.13/net/ipv4/udp.c | |
605 | 605 | @@ -1801,6 +1801,8 @@ try_again: |
606 | 606 | skb = __skb_recv_udp(sk, flags, noblock, &off, &err); |
607 | 607 | if (!skb) |
@@ -611,8 +611,8 @@ | ||
611 | 611 | |
612 | 612 | ulen = udp_skb_len(skb); |
613 | 613 | copied = len; |
614 | ---- linux-5.9.12.orig/net/ipv6/raw.c | |
615 | -+++ linux-5.9.12/net/ipv6/raw.c | |
614 | +--- linux-5.9.13.orig/net/ipv6/raw.c | |
615 | ++++ linux-5.9.13/net/ipv6/raw.c | |
616 | 616 | @@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk |
617 | 617 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
618 | 618 | if (!skb) |
@@ -624,8 +624,8 @@ | ||
624 | 624 | |
625 | 625 | copied = skb->len; |
626 | 626 | if (copied > len) { |
627 | ---- linux-5.9.12.orig/net/ipv6/udp.c | |
628 | -+++ linux-5.9.12/net/ipv6/udp.c | |
627 | +--- linux-5.9.13.orig/net/ipv6/udp.c | |
628 | ++++ linux-5.9.13/net/ipv6/udp.c | |
629 | 629 | @@ -343,6 +343,8 @@ try_again: |
630 | 630 | skb = __skb_recv_udp(sk, flags, noblock, &off, &err); |
631 | 631 | if (!skb) |
@@ -635,8 +635,8 @@ | ||
635 | 635 | |
636 | 636 | ulen = udp6_skb_len(skb); |
637 | 637 | copied = len; |
638 | ---- linux-5.9.12.orig/net/socket.c | |
639 | -+++ linux-5.9.12/net/socket.c | |
638 | +--- linux-5.9.13.orig/net/socket.c | |
639 | ++++ linux-5.9.13/net/socket.c | |
640 | 640 | @@ -1755,6 +1755,10 @@ int __sys_accept4_file(struct file *file |
641 | 641 | if (err < 0) |
642 | 642 | goto out_fd; |
@@ -648,8 +648,8 @@ | ||
648 | 648 | if (upeer_sockaddr) { |
649 | 649 | len = newsock->ops->getname(newsock, |
650 | 650 | (struct sockaddr *)&address, 2); |
651 | ---- linux-5.9.12.orig/net/unix/af_unix.c | |
652 | -+++ linux-5.9.12/net/unix/af_unix.c | |
651 | +--- linux-5.9.13.orig/net/unix/af_unix.c | |
652 | ++++ linux-5.9.13/net/unix/af_unix.c | |
653 | 653 | @@ -2130,6 +2130,10 @@ static int unix_dgram_recvmsg(struct soc |
654 | 654 | EPOLLOUT | EPOLLWRNORM | |
655 | 655 | EPOLLWRBAND); |
@@ -669,8 +669,8 @@ | ||
669 | 669 | mutex_unlock(&u->iolock); |
670 | 670 | out: |
671 | 671 | return err; |
672 | ---- linux-5.9.12.orig/security/Kconfig | |
673 | -+++ linux-5.9.12/security/Kconfig | |
672 | +--- linux-5.9.13.orig/security/Kconfig | |
673 | ++++ linux-5.9.13/security/Kconfig | |
674 | 674 | @@ -291,5 +291,7 @@ config LSM |
675 | 675 | |
676 | 676 | source "security/Kconfig.hardening" |
@@ -679,8 +679,8 @@ | ||
679 | 679 | + |
680 | 680 | endmenu |
681 | 681 | |
682 | ---- linux-5.9.12.orig/security/Makefile | |
683 | -+++ linux-5.9.12/security/Makefile | |
682 | +--- linux-5.9.13.orig/security/Makefile | |
683 | ++++ linux-5.9.13/security/Makefile | |
684 | 684 | @@ -36,3 +36,6 @@ obj-$(CONFIG_BPF_LSM) += bpf/ |
685 | 685 | # Object integrity file lists |
686 | 686 | subdir-$(CONFIG_INTEGRITY) += integrity |
@@ -688,8 +688,8 @@ | ||
688 | 688 | + |
689 | 689 | +subdir-$(CONFIG_CCSECURITY) += ccsecurity |
690 | 690 | +obj-$(CONFIG_CCSECURITY) += ccsecurity/ |
691 | ---- linux-5.9.12.orig/security/security.c | |
692 | -+++ linux-5.9.12/security/security.c | |
691 | +--- linux-5.9.13.orig/security/security.c | |
692 | ++++ linux-5.9.13/security/security.c | |
693 | 693 | @@ -1584,7 +1584,9 @@ int security_task_alloc(struct task_stru |
694 | 694 | |
695 | 695 | if (rc) |
@@ -10,12 +10,12 @@ | ||
10 | 10 | |
11 | 11 | cd /tmp/ || die "Can't chdir to /tmp/ ." |
12 | 12 | |
13 | -if [ ! -r kernel-4.18.0-193.28.1.el8_2.src.rpm ] | |
13 | +if [ ! -r kernel-4.18.0-240.1.1.el8_3.src.rpm ] | |
14 | 14 | then |
15 | - wget http://vault.centos.org/8.2.2004/BaseOS/Source/SPackages/kernel-4.18.0-193.28.1.el8_2.src.rpm || die "Can't download source package." | |
15 | + wget https://vault.centos.org/8.3.2011/BaseOS/Source/SPackages/kernel-4.18.0-240.1.1.el8_3.src.rpm || die "Can't download source package." | |
16 | 16 | fi |
17 | -LANG=C rpm --checksig kernel-4.18.0-193.28.1.el8_2.src.rpm | grep -F ': digests signatures OK' || die "Can't verify signature." | |
18 | -rpm -ivh kernel-4.18.0-193.28.1.el8_2.src.rpm || die "Can't install source package." | |
17 | +LANG=C rpm --checksig kernel-4.18.0-240.1.1.el8_3.src.rpm | grep -F ': digests signatures OK' || die "Can't verify signature." | |
18 | +rpm -ivh kernel-4.18.0-240.1.1.el8_3.src.rpm || die "Can't install source package." | |
19 | 19 | |
20 | 20 | cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ." |
21 | 21 | if [ ! -r caitsith-patch-0.2-20201111.tar.gz ] |
@@ -36,8 +36,8 @@ | ||
36 | 36 | +%define buildid _caitsith_0.2.8 |
37 | 37 | |
38 | 38 | %define rpmversion 4.18.0 |
39 | - %define pkgrelease 193.28.1.el8_2 | |
40 | -@@ -1050,6 +1050,10 @@ | |
39 | + %define pkgrelease 240.1.1.el8_3 | |
40 | +@@ -1093,6 +1093,10 @@ | |
41 | 41 | |
42 | 42 | # END OF PATCH APPLICATIONS |
43 | 43 |
@@ -48,7 +48,7 @@ | ||
48 | 48 | # Any further pre-build tree manipulations happen here. |
49 | 49 | |
50 | 50 | %if %{with_realtime} |
51 | -@@ -1184,6 +1188,18 @@ | |
51 | +@@ -1227,6 +1231,18 @@ | |
52 | 52 | cp %{SOURCE9} certs/. |
53 | 53 | %endif |
54 | 54 |