(メッセージはありません)
@@ -1,6 +1,6 @@ | ||
1 | 1 | This is TOMOYO Linux patch for CentOS 7. |
2 | 2 | |
3 | -Source code for this patch is http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-1127.19.1.el7.src.rpm | |
3 | +Source code for this patch is http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-1160.2.2.el7.src.rpm | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 |
6 | 6 | fs/open.c | 2 |
@@ -28,9 +28,9 @@ | ||
28 | 28 | security/security.c | 111 +++++++++++++++++++++++++++++++++++++++++----- |
29 | 29 | 24 files changed, 248 insertions(+), 37 deletions(-) |
30 | 30 | |
31 | ---- linux-3.10.0-1127.19.1.el7.orig/fs/exec.c | |
32 | -+++ linux-3.10.0-1127.19.1.el7/fs/exec.c | |
33 | -@@ -1508,7 +1508,7 @@ static int exec_binprm(struct linux_binp | |
31 | +--- linux-3.10.0-1160.2.2.el7.orig/fs/exec.c | |
32 | ++++ linux-3.10.0-1160.2.2.el7/fs/exec.c | |
33 | +@@ -1506,7 +1506,7 @@ static int exec_binprm(struct linux_binp | |
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-3.10.0-1127.19.1.el7.orig/fs/open.c | |
43 | -+++ linux-3.10.0-1127.19.1.el7/fs/open.c | |
42 | +--- linux-3.10.0-1160.2.2.el7.orig/fs/open.c | |
43 | ++++ linux-3.10.0-1160.2.2.el7/fs/open.c | |
44 | 44 | @@ -1106,6 +1106,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-3.10.0-1127.19.1.el7.orig/fs/proc/version.c | |
54 | -+++ linux-3.10.0-1127.19.1.el7/fs/proc/version.c | |
53 | +--- linux-3.10.0-1160.2.2.el7.orig/fs/proc/version.c | |
54 | ++++ linux-3.10.0-1160.2.2.el7/fs/proc/version.c | |
55 | 55 | @@ -32,3 +32,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: 3.10.0-1127.19.1.el7 2020/08/26\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 3.10.0-1160.2.2.el7 2020/11/03\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +module_init(ccs_show_version); |
66 | ---- linux-3.10.0-1127.19.1.el7.orig/include/linux/init_task.h | |
67 | -+++ linux-3.10.0-1127.19.1.el7/include/linux/init_task.h | |
66 | +--- linux-3.10.0-1160.2.2.el7.orig/include/linux/init_task.h | |
67 | ++++ linux-3.10.0-1160.2.2.el7/include/linux/init_task.h | |
68 | 68 | @@ -173,6 +173,14 @@ extern struct task_group root_task_group |
69 | 69 | # define INIT_RT_MUTEXES(tsk) |
70 | 70 | #endif |
@@ -88,8 +88,8 @@ | ||
88 | 88 | } |
89 | 89 | |
90 | 90 | |
91 | ---- linux-3.10.0-1127.19.1.el7.orig/include/linux/sched.h | |
92 | -+++ linux-3.10.0-1127.19.1.el7/include/linux/sched.h | |
91 | +--- linux-3.10.0-1160.2.2.el7.orig/include/linux/sched.h | |
92 | ++++ linux-3.10.0-1160.2.2.el7/include/linux/sched.h | |
93 | 93 | @@ -4,6 +4,8 @@ |
94 | 94 | #include <uapi/linux/sched.h> |
95 | 95 | #include <linux/rh_kabi.h> |
@@ -99,9 +99,9 @@ | ||
99 | 99 | struct sched_param { |
100 | 100 | int sched_priority; |
101 | 101 | }; |
102 | -@@ -1869,6 +1871,10 @@ struct task_struct { | |
103 | - struct prev_cputime prev_cputime; | |
104 | - struct vtime vtime; | |
102 | +@@ -1871,6 +1873,10 @@ struct task_struct { | |
103 | + u64 parent_exec_id; | |
104 | + u64 self_exec_id; | |
105 | 105 | #endif /* __GENKSYMS__ */ |
106 | 106 | +#if defined(CONFIG_CCSECURITY) && !defined(CONFIG_CCSECURITY_USE_EXTERNAL_TASK_SECURITY) |
107 | 107 | + struct ccs_domain_info *ccs_domain_info; |
@@ -110,8 +110,8 @@ | ||
110 | 110 | }; |
111 | 111 | |
112 | 112 | /* Future-safe accessor for struct task_struct's cpus_allowed. */ |
113 | ---- linux-3.10.0-1127.19.1.el7.orig/include/linux/security.h | |
114 | -+++ linux-3.10.0-1127.19.1.el7/include/linux/security.h | |
113 | +--- linux-3.10.0-1160.2.2.el7.orig/include/linux/security.h | |
114 | ++++ linux-3.10.0-1160.2.2.el7/include/linux/security.h | |
115 | 115 | @@ -56,6 +56,7 @@ struct msg_queue; |
116 | 116 | struct xattr; |
117 | 117 | struct xfrm_sec_ctx; |
@@ -323,8 +323,8 @@ | ||
323 | 323 | } |
324 | 324 | #endif /* CONFIG_SECURITY_PATH */ |
325 | 325 | |
326 | ---- linux-3.10.0-1127.19.1.el7.orig/include/net/ip.h | |
327 | -+++ linux-3.10.0-1127.19.1.el7/include/net/ip.h | |
326 | +--- linux-3.10.0-1160.2.2.el7.orig/include/net/ip.h | |
327 | ++++ linux-3.10.0-1160.2.2.el7/include/net/ip.h | |
328 | 328 | @@ -232,6 +232,8 @@ void inet_get_local_port_range(struct ne |
329 | 329 | extern unsigned long *sysctl_local_reserved_ports; |
330 | 330 | static inline int inet_is_reserved_local_port(int port) |
@@ -334,8 +334,8 @@ | ||
334 | 334 | return test_bit(port, sysctl_local_reserved_ports); |
335 | 335 | } |
336 | 336 | |
337 | ---- linux-3.10.0-1127.19.1.el7.orig/kernel/fork.c | |
338 | -+++ linux-3.10.0-1127.19.1.el7/kernel/fork.c | |
337 | +--- linux-3.10.0-1160.2.2.el7.orig/kernel/fork.c | |
338 | ++++ linux-3.10.0-1160.2.2.el7/kernel/fork.c | |
339 | 339 | @@ -278,6 +278,7 @@ void __put_task_struct(struct task_struc |
340 | 340 | delayacct_tsk_free(tsk); |
341 | 341 | put_signal_struct(tsk->signal); |
@@ -362,8 +362,8 @@ | ||
362 | 362 | bad_fork_cleanup_perf: |
363 | 363 | perf_event_free_task(p); |
364 | 364 | bad_fork_cleanup_policy: |
365 | ---- linux-3.10.0-1127.19.1.el7.orig/kernel/kexec.c | |
366 | -+++ linux-3.10.0-1127.19.1.el7/kernel/kexec.c | |
365 | +--- linux-3.10.0-1160.2.2.el7.orig/kernel/kexec.c | |
366 | ++++ linux-3.10.0-1160.2.2.el7/kernel/kexec.c | |
367 | 367 | @@ -190,6 +190,8 @@ SYSCALL_DEFINE4(kexec_load, unsigned lon |
368 | 368 | /* We only trust the superuser with rebooting the system. */ |
369 | 369 | if (!capable(CAP_SYS_BOOT) || kexec_load_disabled) |
@@ -373,8 +373,8 @@ | ||
373 | 373 | |
374 | 374 | if (get_securelevel() > 0) |
375 | 375 | return -EPERM; |
376 | ---- linux-3.10.0-1127.19.1.el7.orig/kernel/module.c | |
377 | -+++ linux-3.10.0-1127.19.1.el7/kernel/module.c | |
376 | +--- linux-3.10.0-1160.2.2.el7.orig/kernel/module.c | |
377 | ++++ linux-3.10.0-1160.2.2.el7/kernel/module.c | |
378 | 378 | @@ -66,6 +66,7 @@ |
379 | 379 | #endif /* __GENKSYMS__ */ |
380 | 380 | #include <uapi/linux/module.h> |
@@ -392,7 +392,7 @@ | ||
392 | 392 | |
393 | 393 | if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0) |
394 | 394 | return -EFAULT; |
395 | -@@ -3438,6 +3441,8 @@ static int may_init_module(void) | |
395 | +@@ -3440,6 +3443,8 @@ static int may_init_module(void) | |
396 | 396 | { |
397 | 397 | if (!capable(CAP_SYS_MODULE) || modules_disabled) |
398 | 398 | return -EPERM; |
@@ -401,8 +401,8 @@ | ||
401 | 401 | |
402 | 402 | return 0; |
403 | 403 | } |
404 | ---- linux-3.10.0-1127.19.1.el7.orig/kernel/ptrace.c | |
405 | -+++ linux-3.10.0-1127.19.1.el7/kernel/ptrace.c | |
404 | +--- linux-3.10.0-1160.2.2.el7.orig/kernel/ptrace.c | |
405 | ++++ linux-3.10.0-1160.2.2.el7/kernel/ptrace.c | |
406 | 406 | @@ -1082,6 +1082,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l |
407 | 407 | { |
408 | 408 | struct task_struct *child; |
@@ -427,8 +427,8 @@ | ||
427 | 427 | |
428 | 428 | if (request == PTRACE_TRACEME) { |
429 | 429 | ret = ptrace_traceme(); |
430 | ---- linux-3.10.0-1127.19.1.el7.orig/kernel/sched/core.c | |
431 | -+++ linux-3.10.0-1127.19.1.el7/kernel/sched/core.c | |
430 | +--- linux-3.10.0-1160.2.2.el7.orig/kernel/sched/core.c | |
431 | ++++ linux-3.10.0-1160.2.2.el7/kernel/sched/core.c | |
432 | 432 | @@ -4415,6 +4415,8 @@ int can_nice(const struct task_struct *p |
433 | 433 | SYSCALL_DEFINE1(nice, int, increment) |
434 | 434 | { |
@@ -438,8 +438,8 @@ | ||
438 | 438 | |
439 | 439 | /* |
440 | 440 | * Setpriority might change our priority at the same moment. |
441 | ---- linux-3.10.0-1127.19.1.el7.orig/kernel/signal.c | |
442 | -+++ linux-3.10.0-1127.19.1.el7/kernel/signal.c | |
441 | +--- linux-3.10.0-1160.2.2.el7.orig/kernel/signal.c | |
442 | ++++ linux-3.10.0-1160.2.2.el7/kernel/signal.c | |
443 | 443 | @@ -2942,6 +2942,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s |
444 | 444 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
445 | 445 | { |
@@ -485,8 +485,8 @@ | ||
485 | 485 | |
486 | 486 | return do_send_specific(tgid, pid, sig, info); |
487 | 487 | } |
488 | ---- linux-3.10.0-1127.19.1.el7.orig/kernel/sys.c | |
489 | -+++ linux-3.10.0-1127.19.1.el7/kernel/sys.c | |
488 | +--- linux-3.10.0-1160.2.2.el7.orig/kernel/sys.c | |
489 | ++++ linux-3.10.0-1160.2.2.el7/kernel/sys.c | |
490 | 490 | @@ -197,6 +197,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
491 | 491 | |
492 | 492 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -525,8 +525,8 @@ | ||
525 | 525 | |
526 | 526 | down_write(&uts_sem); |
527 | 527 | errno = -EFAULT; |
528 | ---- linux-3.10.0-1127.19.1.el7.orig/kernel/time/ntp.c | |
529 | -+++ linux-3.10.0-1127.19.1.el7/kernel/time/ntp.c | |
528 | +--- linux-3.10.0-1160.2.2.el7.orig/kernel/time/ntp.c | |
529 | ++++ linux-3.10.0-1160.2.2.el7/kernel/time/ntp.c | |
530 | 530 | @@ -16,6 +16,7 @@ |
531 | 531 | #include <linux/mm.h> |
532 | 532 | #include <linux/module.h> |
@@ -560,9 +560,9 @@ | ||
560 | 560 | |
561 | 561 | return 0; |
562 | 562 | } |
563 | ---- linux-3.10.0-1127.19.1.el7.orig/net/ipv4/raw.c | |
564 | -+++ linux-3.10.0-1127.19.1.el7/net/ipv4/raw.c | |
565 | -@@ -708,6 +708,10 @@ static int raw_recvmsg(struct kiocb *ioc | |
563 | +--- linux-3.10.0-1160.2.2.el7.orig/net/ipv4/raw.c | |
564 | ++++ linux-3.10.0-1160.2.2.el7/net/ipv4/raw.c | |
565 | +@@ -710,6 +710,10 @@ static int raw_recvmsg(struct kiocb *ioc | |
566 | 566 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
567 | 567 | if (!skb) |
568 | 568 | goto out; |
@@ -573,8 +573,8 @@ | ||
573 | 573 | |
574 | 574 | copied = skb->len; |
575 | 575 | if (len < copied) { |
576 | ---- linux-3.10.0-1127.19.1.el7.orig/net/ipv4/udp.c | |
577 | -+++ linux-3.10.0-1127.19.1.el7/net/ipv4/udp.c | |
576 | +--- linux-3.10.0-1160.2.2.el7.orig/net/ipv4/udp.c | |
577 | ++++ linux-3.10.0-1160.2.2.el7/net/ipv4/udp.c | |
578 | 578 | @@ -1467,6 +1467,10 @@ try_again: |
579 | 579 | skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err); |
580 | 580 | if (!skb) |
@@ -586,9 +586,9 @@ | ||
586 | 586 | |
587 | 587 | ulen = skb->len - sizeof(struct udphdr); |
588 | 588 | copied = len; |
589 | ---- linux-3.10.0-1127.19.1.el7.orig/net/ipv6/raw.c | |
590 | -+++ linux-3.10.0-1127.19.1.el7/net/ipv6/raw.c | |
591 | -@@ -468,6 +468,10 @@ static int rawv6_recvmsg(struct kiocb *i | |
589 | +--- linux-3.10.0-1160.2.2.el7.orig/net/ipv6/raw.c | |
590 | ++++ linux-3.10.0-1160.2.2.el7/net/ipv6/raw.c | |
591 | +@@ -470,6 +470,10 @@ static int rawv6_recvmsg(struct kiocb *i | |
592 | 592 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
593 | 593 | if (!skb) |
594 | 594 | goto out; |
@@ -599,8 +599,8 @@ | ||
599 | 599 | |
600 | 600 | copied = skb->len; |
601 | 601 | if (copied > len) { |
602 | ---- linux-3.10.0-1127.19.1.el7.orig/net/ipv6/udp.c | |
603 | -+++ linux-3.10.0-1127.19.1.el7/net/ipv6/udp.c | |
602 | +--- linux-3.10.0-1160.2.2.el7.orig/net/ipv6/udp.c | |
603 | ++++ linux-3.10.0-1160.2.2.el7/net/ipv6/udp.c | |
604 | 604 | @@ -384,6 +384,10 @@ try_again: |
605 | 605 | skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err); |
606 | 606 | if (!skb) |
@@ -612,8 +612,8 @@ | ||
612 | 612 | |
613 | 613 | ulen = skb->len - sizeof(struct udphdr); |
614 | 614 | copied = len; |
615 | ---- linux-3.10.0-1127.19.1.el7.orig/net/socket.c | |
616 | -+++ linux-3.10.0-1127.19.1.el7/net/socket.c | |
615 | +--- linux-3.10.0-1160.2.2.el7.orig/net/socket.c | |
616 | ++++ linux-3.10.0-1160.2.2.el7/net/socket.c | |
617 | 617 | @@ -1661,6 +1661,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct |
618 | 618 | if (err < 0) |
619 | 619 | goto out_fd; |
@@ -625,8 +625,8 @@ | ||
625 | 625 | if (upeer_sockaddr) { |
626 | 626 | if (newsock->ops->getname(newsock, (struct sockaddr *)&address, |
627 | 627 | &len, 2) < 0) { |
628 | ---- linux-3.10.0-1127.19.1.el7.orig/net/unix/af_unix.c | |
629 | -+++ linux-3.10.0-1127.19.1.el7/net/unix/af_unix.c | |
628 | +--- linux-3.10.0-1160.2.2.el7.orig/net/unix/af_unix.c | |
629 | ++++ linux-3.10.0-1160.2.2.el7/net/unix/af_unix.c | |
630 | 630 | @@ -2138,6 +2138,10 @@ static int unix_dgram_recvmsg(struct kio |
631 | 631 | wake_up_interruptible_sync_poll(&u->peer_wait, |
632 | 632 | POLLOUT | POLLWRNORM | POLLWRBAND); |
@@ -638,8 +638,8 @@ | ||
638 | 638 | if (msg->msg_name) |
639 | 639 | unix_copy_addr(msg, skb->sk); |
640 | 640 | |
641 | ---- linux-3.10.0-1127.19.1.el7.orig/security/Kconfig | |
642 | -+++ linux-3.10.0-1127.19.1.el7/security/Kconfig | |
641 | +--- linux-3.10.0-1160.2.2.el7.orig/security/Kconfig | |
642 | ++++ linux-3.10.0-1160.2.2.el7/security/Kconfig | |
643 | 643 | @@ -226,5 +226,7 @@ config DEFAULT_SECURITY |
644 | 644 | default "yama" if DEFAULT_SECURITY_YAMA |
645 | 645 | default "" if DEFAULT_SECURITY_DAC |
@@ -648,8 +648,8 @@ | ||
648 | 648 | + |
649 | 649 | endmenu |
650 | 650 | |
651 | ---- linux-3.10.0-1127.19.1.el7.orig/security/Makefile | |
652 | -+++ linux-3.10.0-1127.19.1.el7/security/Makefile | |
651 | +--- linux-3.10.0-1160.2.2.el7.orig/security/Makefile | |
652 | ++++ linux-3.10.0-1160.2.2.el7/security/Makefile | |
653 | 653 | @@ -29,3 +29,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/built-in.o |
660 | ---- linux-3.10.0-1127.19.1.el7.orig/security/security.c | |
661 | -+++ linux-3.10.0-1127.19.1.el7/security/security.c | |
660 | +--- linux-3.10.0-1160.2.2.el7.orig/security/security.c | |
661 | ++++ linux-3.10.0-1160.2.2.el7/security/security.c | |
662 | 662 | @@ -229,7 +229,10 @@ int security_syslog(int type) |
663 | 663 | |
664 | 664 | int security_settime(const struct timespec *ts, const struct timezone *tz) |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 4.14.202. | |
1 | +This is TOMOYO Linux patch for kernel 4.14.203. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.202.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.203.tar.xz | |
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.202.orig/fs/exec.c | |
32 | -+++ linux-4.14.202/fs/exec.c | |
31 | +--- linux-4.14.203.orig/fs/exec.c | |
32 | ++++ linux-4.14.203/fs/exec.c | |
33 | 33 | @@ -1679,7 +1679,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.202.orig/fs/open.c | |
43 | -+++ linux-4.14.202/fs/open.c | |
42 | +--- linux-4.14.203.orig/fs/open.c | |
43 | ++++ linux-4.14.203/fs/open.c | |
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.202.orig/fs/proc/version.c | |
54 | -+++ linux-4.14.202/fs/proc/version.c | |
53 | +--- linux-4.14.203.orig/fs/proc/version.c | |
54 | ++++ linux-4.14.203/fs/proc/version.c | |
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.202 2020/10/24\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.14.203 2020/11/03\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-4.14.202.orig/include/linux/init_task.h | |
67 | -+++ linux-4.14.202/include/linux/init_task.h | |
66 | +--- linux-4.14.203.orig/include/linux/init_task.h | |
67 | ++++ linux-4.14.203/include/linux/init_task.h | |
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.202.orig/include/linux/sched.h | |
92 | -+++ linux-4.14.202/include/linux/sched.h | |
91 | +--- linux-4.14.203.orig/include/linux/sched.h | |
92 | ++++ linux-4.14.203/include/linux/sched.h | |
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.202.orig/include/linux/security.h | |
113 | -+++ linux-4.14.202/include/linux/security.h | |
112 | +--- linux-4.14.203.orig/include/linux/security.h | |
113 | ++++ linux-4.14.203/include/linux/security.h | |
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.202.orig/include/net/ip.h | |
335 | -+++ linux-4.14.202/include/net/ip.h | |
334 | +--- linux-4.14.203.orig/include/net/ip.h | |
335 | ++++ linux-4.14.203/include/net/ip.h | |
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.202.orig/kernel/kexec.c | |
355 | -+++ linux-4.14.202/kernel/kexec.c | |
354 | +--- linux-4.14.203.orig/kernel/kexec.c | |
355 | ++++ linux-4.14.203/kernel/kexec.c | |
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.202.orig/kernel/module.c | |
375 | -+++ linux-4.14.202/kernel/module.c | |
374 | +--- linux-4.14.203.orig/kernel/module.c | |
375 | ++++ linux-4.14.203/kernel/module.c | |
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.202.orig/kernel/ptrace.c | |
403 | -+++ linux-4.14.202/kernel/ptrace.c | |
402 | +--- linux-4.14.203.orig/kernel/ptrace.c | |
403 | ++++ linux-4.14.203/kernel/ptrace.c | |
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.202.orig/kernel/reboot.c | |
429 | -+++ linux-4.14.202/kernel/reboot.c | |
428 | +--- linux-4.14.203.orig/kernel/reboot.c | |
429 | ++++ linux-4.14.203/kernel/reboot.c | |
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.202.orig/kernel/sched/core.c | |
448 | -+++ linux-4.14.202/kernel/sched/core.c | |
447 | +--- linux-4.14.203.orig/kernel/sched/core.c | |
448 | ++++ linux-4.14.203/kernel/sched/core.c | |
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.202.orig/kernel/signal.c | |
459 | -+++ linux-4.14.202/kernel/signal.c | |
458 | +--- linux-4.14.203.orig/kernel/signal.c | |
459 | ++++ linux-4.14.203/kernel/signal.c | |
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.202.orig/kernel/sys.c | |
506 | -+++ linux-4.14.202/kernel/sys.c | |
505 | +--- linux-4.14.203.orig/kernel/sys.c | |
506 | ++++ linux-4.14.203/kernel/sys.c | |
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.202.orig/kernel/time/ntp.c | |
537 | -+++ linux-4.14.202/kernel/time/ntp.c | |
536 | +--- linux-4.14.203.orig/kernel/time/ntp.c | |
537 | ++++ linux-4.14.203/kernel/time/ntp.c | |
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.202.orig/net/ipv4/raw.c | |
572 | -+++ linux-4.14.202/net/ipv4/raw.c | |
571 | +--- linux-4.14.203.orig/net/ipv4/raw.c | |
572 | ++++ linux-4.14.203/net/ipv4/raw.c | |
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.202.orig/net/ipv4/udp.c | |
585 | -+++ linux-4.14.202/net/ipv4/udp.c | |
584 | +--- linux-4.14.203.orig/net/ipv4/udp.c | |
585 | ++++ linux-4.14.203/net/ipv4/udp.c | |
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.202.orig/net/ipv6/raw.c | |
596 | -+++ linux-4.14.202/net/ipv6/raw.c | |
595 | +--- linux-4.14.203.orig/net/ipv6/raw.c | |
596 | ++++ linux-4.14.203/net/ipv6/raw.c | |
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.202.orig/net/ipv6/udp.c | |
609 | -+++ linux-4.14.202/net/ipv6/udp.c | |
608 | +--- linux-4.14.203.orig/net/ipv6/udp.c | |
609 | ++++ linux-4.14.203/net/ipv6/udp.c | |
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.202.orig/net/socket.c | |
620 | -+++ linux-4.14.202/net/socket.c | |
619 | +--- linux-4.14.203.orig/net/socket.c | |
620 | ++++ linux-4.14.203/net/socket.c | |
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.202.orig/net/unix/af_unix.c | |
633 | -+++ linux-4.14.202/net/unix/af_unix.c | |
632 | +--- linux-4.14.203.orig/net/unix/af_unix.c | |
633 | ++++ linux-4.14.203/net/unix/af_unix.c | |
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.202.orig/security/Kconfig | |
654 | -+++ linux-4.14.202/security/Kconfig | |
653 | +--- linux-4.14.203.orig/security/Kconfig | |
654 | ++++ linux-4.14.203/security/Kconfig | |
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.202.orig/security/Makefile | |
664 | -+++ linux-4.14.202/security/Makefile | |
663 | +--- linux-4.14.203.orig/security/Makefile | |
664 | ++++ linux-4.14.203/security/Makefile | |
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.202.orig/security/security.c | |
673 | -+++ linux-4.14.202/security/security.c | |
672 | +--- linux-4.14.203.orig/security/security.c | |
673 | ++++ linux-4.14.203/security/security.c | |
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.19.1.el8_2.src.rpm | |
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 | |
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.18.0-193.19.1.el8.orig/fs/exec.c | |
32 | -+++ linux-4.18.0-193.19.1.el8/fs/exec.c | |
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 | 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.18.0-193.19.1.el8.orig/fs/open.c | |
43 | -+++ linux-4.18.0-193.19.1.el8/fs/open.c | |
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 | |
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.19.1.el8.orig/fs/proc/version.c | |
54 | -+++ linux-4.18.0-193.19.1.el8/fs/proc/version.c | |
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 | |
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.18.0-193.19.1.el8_2 2020/09/18\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.18.0-193.28.1.el8_2 2020/11/01\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-4.18.0-193.19.1.el8.orig/include/linux/sched.h | |
67 | -+++ linux-4.18.0-193.19.1.el8/include/linux/sched.h | |
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 | 68 | @@ -35,6 +35,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.18.0-193.19.1.el8.orig/include/linux/security.h | |
88 | -+++ linux-4.18.0-193.19.1.el8/include/linux/security.h | |
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 | |
89 | 89 | @@ -54,6 +54,7 @@ struct xattr; |
90 | 90 | struct kernfs_node; |
91 | 91 | struct xfrm_sec_ctx; |
@@ -306,8 +306,8 @@ | ||
306 | 306 | } |
307 | 307 | #endif /* CONFIG_SECURITY_PATH */ |
308 | 308 | |
309 | ---- linux-4.18.0-193.19.1.el8.orig/include/net/ip.h | |
310 | -+++ linux-4.18.0-193.19.1.el8/include/net/ip.h | |
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 | |
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,8 +326,8 @@ | ||
326 | 326 | return 0; |
327 | 327 | } |
328 | 328 | |
329 | ---- linux-4.18.0-193.19.1.el8.orig/init/init_task.c | |
330 | -+++ linux-4.18.0-193.19.1.el8/init/init_task.c | |
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 | 331 | @@ -183,6 +183,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.18.0-193.19.1.el8.orig/kernel/kexec.c | |
343 | -+++ linux-4.18.0-193.19.1.el8/kernel/kexec.c | |
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 | 344 | @@ -17,7 +17,7 @@ |
345 | 345 | #include <linux/syscalls.h> |
346 | 346 | #include <linux/vmalloc.h> |
@@ -359,8 +359,8 @@ | ||
359 | 359 | |
360 | 360 | /* |
361 | 361 | * kexec can be used to circumvent module loading restrictions, so |
362 | ---- linux-4.18.0-193.19.1.el8.orig/kernel/module.c | |
363 | -+++ linux-4.18.0-193.19.1.el8/kernel/module.c | |
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 | 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.18.0-193.19.1.el8.orig/kernel/ptrace.c | |
391 | -+++ linux-4.18.0-193.19.1.el8/kernel/ptrace.c | |
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 | 392 | @@ -1109,6 +1109,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.18.0-193.19.1.el8.orig/kernel/reboot.c | |
417 | -+++ linux-4.18.0-193.19.1.el8/kernel/reboot.c | |
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 | |
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.19.1.el8.orig/kernel/sched/core.c | |
436 | -+++ linux-4.18.0-193.19.1.el8/kernel/sched/core.c | |
437 | -@@ -3929,6 +3929,8 @@ int can_nice(const struct task_struct *p | |
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 | |
438 | 438 | SYSCALL_DEFINE1(nice, int, increment) |
439 | 439 | { |
440 | 440 | long nice, retval; |
@@ -443,8 +443,8 @@ | ||
443 | 443 | |
444 | 444 | /* |
445 | 445 | * Setpriority might change our priority at the same moment. |
446 | ---- linux-4.18.0-193.19.1.el8.orig/kernel/signal.c | |
447 | -+++ linux-4.18.0-193.19.1.el8/kernel/signal.c | |
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 | 448 | @@ -3497,6 +3497,8 @@ SYSCALL_DEFINE2(kill, pid_t, pid, int, s |
449 | 449 | { |
450 | 450 | struct kernel_siginfo info; |
@@ -490,8 +490,8 @@ | ||
490 | 490 | return do_send_specific(tgid, pid, sig, info); |
491 | 491 | } |
492 | 492 | |
493 | ---- linux-4.18.0-193.19.1.el8.orig/kernel/sys.c | |
494 | -+++ linux-4.18.0-193.19.1.el8/kernel/sys.c | |
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 | |
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.19.1.el8.orig/kernel/time/timekeeping.c | |
525 | -+++ linux-4.18.0-193.19.1.el8/kernel/time/timekeeping.c | |
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 | |
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.19.1.el8.orig/net/ipv4/raw.c | |
560 | -+++ linux-4.18.0-193.19.1.el8/net/ipv4/raw.c | |
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 | |
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,8 +569,8 @@ | ||
569 | 569 | |
570 | 570 | copied = skb->len; |
571 | 571 | if (len < copied) { |
572 | ---- linux-4.18.0-193.19.1.el8.orig/net/ipv4/udp.c | |
573 | -+++ linux-4.18.0-193.19.1.el8/net/ipv4/udp.c | |
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 | 574 | @@ -1711,6 +1711,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.18.0-193.19.1.el8.orig/net/ipv6/raw.c | |
584 | -+++ linux-4.18.0-193.19.1.el8/net/ipv6/raw.c | |
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 | |
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.18.0-193.19.1.el8.orig/net/ipv6/udp.c | |
597 | -+++ linux-4.18.0-193.19.1.el8/net/ipv6/udp.c | |
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 | 598 | @@ -308,6 +308,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.18.0-193.19.1.el8.orig/net/socket.c | |
608 | -+++ linux-4.18.0-193.19.1.el8/net/socket.c | |
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 | 609 | @@ -1720,6 +1720,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.18.0-193.19.1.el8.orig/net/unix/af_unix.c | |
621 | -+++ linux-4.18.0-193.19.1.el8/net/unix/af_unix.c | |
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 | 622 | @@ -2063,6 +2063,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.18.0-193.19.1.el8.orig/security/Kconfig | |
642 | -+++ linux-4.18.0-193.19.1.el8/security/Kconfig | |
641 | +--- linux-4.18.0-193.28.1.el8.orig/security/Kconfig | |
642 | ++++ linux-4.18.0-193.28.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.19.1.el8.orig/security/Makefile | |
651 | -+++ linux-4.18.0-193.19.1.el8/security/Makefile | |
650 | +--- linux-4.18.0-193.28.1.el8.orig/security/Makefile | |
651 | ++++ linux-4.18.0-193.28.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.19.1.el8.orig/security/security.c | |
660 | -+++ linux-4.18.0-193.19.1.el8/security/security.c | |
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 | |
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.152. | |
1 | +This is TOMOYO Linux patch for kernel 4.19.154. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.152.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.154.tar.xz | |
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.152.orig/fs/exec.c | |
32 | -+++ linux-4.19.152/fs/exec.c | |
31 | +--- linux-4.19.154.orig/fs/exec.c | |
32 | ++++ linux-4.19.154/fs/exec.c | |
33 | 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(); |
@@ -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.152.orig/fs/open.c | |
43 | -+++ linux-4.19.152/fs/open.c | |
42 | +--- linux-4.19.154.orig/fs/open.c | |
43 | ++++ linux-4.19.154/fs/open.c | |
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.152.orig/fs/proc/version.c | |
54 | -+++ linux-4.19.152/fs/proc/version.c | |
53 | +--- linux-4.19.154.orig/fs/proc/version.c | |
54 | ++++ linux-4.19.154/fs/proc/version.c | |
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.152 2020/10/24\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.19.154 2020/11/03\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-4.19.152.orig/include/linux/sched.h | |
67 | -+++ linux-4.19.152/include/linux/sched.h | |
66 | +--- linux-4.19.154.orig/include/linux/sched.h | |
67 | ++++ linux-4.19.154/include/linux/sched.h | |
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.152.orig/include/linux/security.h | |
88 | -+++ linux-4.19.152/include/linux/security.h | |
87 | +--- linux-4.19.154.orig/include/linux/security.h | |
88 | ++++ linux-4.19.154/include/linux/security.h | |
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.152.orig/include/net/ip.h | |
310 | -+++ linux-4.19.152/include/net/ip.h | |
309 | +--- linux-4.19.154.orig/include/net/ip.h | |
310 | ++++ linux-4.19.154/include/net/ip.h | |
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.152.orig/init/init_task.c | |
330 | -+++ linux-4.19.152/init/init_task.c | |
329 | +--- linux-4.19.154.orig/init/init_task.c | |
330 | ++++ linux-4.19.154/init/init_task.c | |
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.152.orig/kernel/kexec.c | |
343 | -+++ linux-4.19.152/kernel/kexec.c | |
342 | +--- linux-4.19.154.orig/kernel/kexec.c | |
343 | ++++ linux-4.19.154/kernel/kexec.c | |
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.152.orig/kernel/module.c | |
363 | -+++ linux-4.19.152/kernel/module.c | |
362 | +--- linux-4.19.154.orig/kernel/module.c | |
363 | ++++ linux-4.19.154/kernel/module.c | |
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.152.orig/kernel/ptrace.c | |
391 | -+++ linux-4.19.152/kernel/ptrace.c | |
390 | +--- linux-4.19.154.orig/kernel/ptrace.c | |
391 | ++++ linux-4.19.154/kernel/ptrace.c | |
392 | 392 | @@ -1142,6 +1142,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.152.orig/kernel/reboot.c | |
417 | -+++ linux-4.19.152/kernel/reboot.c | |
416 | +--- linux-4.19.154.orig/kernel/reboot.c | |
417 | ++++ linux-4.19.154/kernel/reboot.c | |
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.152.orig/kernel/sched/core.c | |
436 | -+++ linux-4.19.152/kernel/sched/core.c | |
435 | +--- linux-4.19.154.orig/kernel/sched/core.c | |
436 | ++++ linux-4.19.154/kernel/sched/core.c | |
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.152.orig/kernel/signal.c | |
447 | -+++ linux-4.19.152/kernel/signal.c | |
446 | +--- linux-4.19.154.orig/kernel/signal.c | |
447 | ++++ linux-4.19.154/kernel/signal.c | |
448 | 448 | @@ -3285,6 +3285,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.152.orig/kernel/sys.c | |
494 | -+++ linux-4.19.152/kernel/sys.c | |
493 | +--- linux-4.19.154.orig/kernel/sys.c | |
494 | ++++ linux-4.19.154/kernel/sys.c | |
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.152.orig/kernel/time/timekeeping.c | |
525 | -+++ linux-4.19.152/kernel/time/timekeeping.c | |
524 | +--- linux-4.19.154.orig/kernel/time/timekeeping.c | |
525 | ++++ linux-4.19.154/kernel/time/timekeeping.c | |
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.152.orig/net/ipv4/raw.c | |
560 | -+++ linux-4.19.152/net/ipv4/raw.c | |
559 | +--- linux-4.19.154.orig/net/ipv4/raw.c | |
560 | ++++ linux-4.19.154/net/ipv4/raw.c | |
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.152.orig/net/ipv4/udp.c | |
573 | -+++ linux-4.19.152/net/ipv4/udp.c | |
572 | +--- linux-4.19.154.orig/net/ipv4/udp.c | |
573 | ++++ linux-4.19.154/net/ipv4/udp.c | |
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.152.orig/net/ipv6/raw.c | |
584 | -+++ linux-4.19.152/net/ipv6/raw.c | |
583 | +--- linux-4.19.154.orig/net/ipv6/raw.c | |
584 | ++++ linux-4.19.154/net/ipv6/raw.c | |
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.152.orig/net/ipv6/udp.c | |
597 | -+++ linux-4.19.152/net/ipv6/udp.c | |
596 | +--- linux-4.19.154.orig/net/ipv6/udp.c | |
597 | ++++ linux-4.19.154/net/ipv6/udp.c | |
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.152.orig/net/socket.c | |
608 | -+++ linux-4.19.152/net/socket.c | |
607 | +--- linux-4.19.154.orig/net/socket.c | |
608 | ++++ linux-4.19.154/net/socket.c | |
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.152.orig/net/unix/af_unix.c | |
621 | -+++ linux-4.19.152/net/unix/af_unix.c | |
620 | +--- linux-4.19.154.orig/net/unix/af_unix.c | |
621 | ++++ linux-4.19.154/net/unix/af_unix.c | |
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.152.orig/security/Kconfig | |
642 | -+++ linux-4.19.152/security/Kconfig | |
641 | +--- linux-4.19.154.orig/security/Kconfig | |
642 | ++++ linux-4.19.154/security/Kconfig | |
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.152.orig/security/Makefile | |
652 | -+++ linux-4.19.152/security/Makefile | |
651 | +--- linux-4.19.154.orig/security/Makefile | |
652 | ++++ linux-4.19.154/security/Makefile | |
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.152.orig/security/security.c | |
661 | -+++ linux-4.19.152/security/security.c | |
660 | +--- linux-4.19.154.orig/security/security.c | |
661 | ++++ linux-4.19.154/security/security.c | |
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 4.4.240. | |
1 | +This is TOMOYO Linux patch for kernel 4.4.241. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.240.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.241.tar.xz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 - |
6 | 6 | fs/open.c | 2 + |
@@ -28,8 +28,8 @@ | ||
28 | 28 | security/Makefile | 3 ++ |
29 | 29 | 24 files changed, 150 insertions(+), 26 deletions(-) |
30 | 30 | |
31 | ---- linux-4.4.240.orig/fs/exec.c | |
32 | -+++ linux-4.4.240/fs/exec.c | |
31 | +--- linux-4.4.241.orig/fs/exec.c | |
32 | ++++ linux-4.4.241/fs/exec.c | |
33 | 33 | @@ -1514,7 +1514,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.4.240.orig/fs/open.c | |
43 | -+++ linux-4.4.240/fs/open.c | |
42 | +--- linux-4.4.241.orig/fs/open.c | |
43 | ++++ linux-4.4.241/fs/open.c | |
44 | 44 | @@ -1136,6 +1136,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.4.240.orig/fs/proc/version.c | |
54 | -+++ linux-4.4.240/fs/proc/version.c | |
53 | +--- linux-4.4.241.orig/fs/proc/version.c | |
54 | ++++ linux-4.4.241/fs/proc/version.c | |
55 | 55 | @@ -32,3 +32,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.4.240 2020/10/24\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.4.241 2020/11/03\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-4.4.240.orig/include/linux/init_task.h | |
67 | -+++ linux-4.4.240/include/linux/init_task.h | |
66 | +--- linux-4.4.241.orig/include/linux/init_task.h | |
67 | ++++ linux-4.4.241/include/linux/init_task.h | |
68 | 68 | @@ -191,6 +191,14 @@ extern struct task_group root_task_group |
69 | 69 | # define INIT_TASK_TI(tsk) |
70 | 70 | #endif |
@@ -88,8 +88,8 @@ | ||
88 | 88 | } |
89 | 89 | |
90 | 90 | |
91 | ---- linux-4.4.240.orig/include/linux/sched.h | |
92 | -+++ linux-4.4.240/include/linux/sched.h | |
91 | +--- linux-4.4.241.orig/include/linux/sched.h | |
92 | ++++ linux-4.4.241/include/linux/sched.h | |
93 | 93 | @@ -6,6 +6,8 @@ |
94 | 94 | #include <linux/sched/prio.h> |
95 | 95 |
@@ -110,8 +110,8 @@ | ||
110 | 110 | /* CPU-specific state of this task */ |
111 | 111 | struct thread_struct thread; |
112 | 112 | /* |
113 | ---- linux-4.4.240.orig/include/linux/security.h | |
114 | -+++ linux-4.4.240/include/linux/security.h | |
113 | +--- linux-4.4.241.orig/include/linux/security.h | |
114 | ++++ linux-4.4.241/include/linux/security.h | |
115 | 115 | @@ -53,6 +53,7 @@ struct msg_queue; |
116 | 116 | struct xattr; |
117 | 117 | struct xfrm_sec_ctx; |
@@ -318,8 +318,8 @@ | ||
318 | 318 | } |
319 | 319 | #endif /* CONFIG_SECURITY_PATH */ |
320 | 320 | |
321 | ---- linux-4.4.240.orig/include/net/ip.h | |
322 | -+++ linux-4.4.240/include/net/ip.h | |
321 | +--- linux-4.4.241.orig/include/net/ip.h | |
322 | ++++ linux-4.4.241/include/net/ip.h | |
323 | 323 | @@ -225,6 +225,8 @@ void inet_get_local_port_range(struct ne |
324 | 324 | #ifdef CONFIG_SYSCTL |
325 | 325 | static inline int inet_is_local_reserved_port(struct net *net, int port) |
@@ -338,8 +338,8 @@ | ||
338 | 338 | return 0; |
339 | 339 | } |
340 | 340 | #endif |
341 | ---- linux-4.4.240.orig/kernel/fork.c | |
342 | -+++ linux-4.4.240/kernel/fork.c | |
341 | +--- linux-4.4.241.orig/kernel/fork.c | |
342 | ++++ linux-4.4.241/kernel/fork.c | |
343 | 343 | @@ -260,6 +260,7 @@ void __put_task_struct(struct task_struc |
344 | 344 | delayacct_tsk_free(tsk); |
345 | 345 | put_signal_struct(tsk->signal); |
@@ -366,8 +366,8 @@ | ||
366 | 366 | bad_fork_cleanup_perf: |
367 | 367 | perf_event_free_task(p); |
368 | 368 | bad_fork_cleanup_policy: |
369 | ---- linux-4.4.240.orig/kernel/kexec.c | |
370 | -+++ linux-4.4.240/kernel/kexec.c | |
369 | +--- linux-4.4.241.orig/kernel/kexec.c | |
370 | ++++ linux-4.4.241/kernel/kexec.c | |
371 | 371 | @@ -17,7 +17,7 @@ |
372 | 372 | #include <linux/syscalls.h> |
373 | 373 | #include <linux/vmalloc.h> |
@@ -386,8 +386,8 @@ | ||
386 | 386 | |
387 | 387 | /* |
388 | 388 | * Verify we have a legal set of flags |
389 | ---- linux-4.4.240.orig/kernel/module.c | |
390 | -+++ linux-4.4.240/kernel/module.c | |
389 | +--- linux-4.4.241.orig/kernel/module.c | |
390 | ++++ linux-4.4.241/kernel/module.c | |
391 | 391 | @@ -61,6 +61,7 @@ |
392 | 392 | #include <linux/bsearch.h> |
393 | 393 | #include <uapi/linux/module.h> |
@@ -414,8 +414,8 @@ | ||
414 | 414 | |
415 | 415 | return 0; |
416 | 416 | } |
417 | ---- linux-4.4.240.orig/kernel/ptrace.c | |
418 | -+++ linux-4.4.240/kernel/ptrace.c | |
417 | +--- linux-4.4.241.orig/kernel/ptrace.c | |
418 | ++++ linux-4.4.241/kernel/ptrace.c | |
419 | 419 | @@ -1109,6 +1109,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l |
420 | 420 | { |
421 | 421 | struct task_struct *child; |
@@ -440,8 +440,8 @@ | ||
440 | 440 | |
441 | 441 | if (request == PTRACE_TRACEME) { |
442 | 442 | ret = ptrace_traceme(); |
443 | ---- linux-4.4.240.orig/kernel/reboot.c | |
444 | -+++ linux-4.4.240/kernel/reboot.c | |
443 | +--- linux-4.4.241.orig/kernel/reboot.c | |
444 | ++++ linux-4.4.241/kernel/reboot.c | |
445 | 445 | @@ -16,6 +16,7 @@ |
446 | 446 | #include <linux/syscalls.h> |
447 | 447 | #include <linux/syscore_ops.h> |
@@ -459,8 +459,8 @@ | ||
459 | 459 | |
460 | 460 | /* |
461 | 461 | * If pid namespaces are enabled and the current task is in a child |
462 | ---- linux-4.4.240.orig/kernel/sched/core.c | |
463 | -+++ linux-4.4.240/kernel/sched/core.c | |
462 | +--- linux-4.4.241.orig/kernel/sched/core.c | |
463 | ++++ linux-4.4.241/kernel/sched/core.c | |
464 | 464 | @@ -3550,6 +3550,8 @@ int can_nice(const struct task_struct *p |
465 | 465 | SYSCALL_DEFINE1(nice, int, increment) |
466 | 466 | { |
@@ -470,8 +470,8 @@ | ||
470 | 470 | |
471 | 471 | /* |
472 | 472 | * Setpriority might change our priority at the same moment. |
473 | ---- linux-4.4.240.orig/kernel/signal.c | |
474 | -+++ linux-4.4.240/kernel/signal.c | |
473 | +--- linux-4.4.241.orig/kernel/signal.c | |
474 | ++++ linux-4.4.241/kernel/signal.c | |
475 | 475 | @@ -2943,6 +2943,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s |
476 | 476 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
477 | 477 | { |
@@ -517,8 +517,8 @@ | ||
517 | 517 | |
518 | 518 | return do_send_specific(tgid, pid, sig, info); |
519 | 519 | } |
520 | ---- linux-4.4.240.orig/kernel/sys.c | |
521 | -+++ linux-4.4.240/kernel/sys.c | |
520 | +--- linux-4.4.241.orig/kernel/sys.c | |
521 | ++++ linux-4.4.241/kernel/sys.c | |
522 | 522 | @@ -185,6 +185,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
523 | 523 | |
524 | 524 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -548,8 +548,8 @@ | ||
548 | 548 | |
549 | 549 | errno = -EFAULT; |
550 | 550 | if (!copy_from_user(tmp, name, len)) { |
551 | ---- linux-4.4.240.orig/kernel/time/ntp.c | |
552 | -+++ linux-4.4.240/kernel/time/ntp.c | |
551 | +--- linux-4.4.241.orig/kernel/time/ntp.c | |
552 | ++++ linux-4.4.241/kernel/time/ntp.c | |
553 | 553 | @@ -16,6 +16,7 @@ |
554 | 554 | #include <linux/mm.h> |
555 | 555 | #include <linux/module.h> |
@@ -583,8 +583,8 @@ | ||
583 | 583 | |
584 | 584 | if (txc->modes & ADJ_NANO) { |
585 | 585 | struct timespec ts; |
586 | ---- linux-4.4.240.orig/net/ipv4/raw.c | |
587 | -+++ linux-4.4.240/net/ipv4/raw.c | |
586 | +--- linux-4.4.241.orig/net/ipv4/raw.c | |
587 | ++++ linux-4.4.241/net/ipv4/raw.c | |
588 | 588 | @@ -749,6 +749,10 @@ static int raw_recvmsg(struct sock *sk, |
589 | 589 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
590 | 590 | if (!skb) |
@@ -596,8 +596,8 @@ | ||
596 | 596 | |
597 | 597 | copied = skb->len; |
598 | 598 | if (len < copied) { |
599 | ---- linux-4.4.240.orig/net/ipv4/udp.c | |
600 | -+++ linux-4.4.240/net/ipv4/udp.c | |
599 | +--- linux-4.4.241.orig/net/ipv4/udp.c | |
600 | ++++ linux-4.4.241/net/ipv4/udp.c | |
601 | 601 | @@ -1289,6 +1289,10 @@ try_again: |
602 | 602 | &peeked, &off, &err); |
603 | 603 | if (!skb) |
@@ -609,8 +609,8 @@ | ||
609 | 609 | |
610 | 610 | ulen = skb->len - sizeof(struct udphdr); |
611 | 611 | copied = len; |
612 | ---- linux-4.4.240.orig/net/ipv6/raw.c | |
613 | -+++ linux-4.4.240/net/ipv6/raw.c | |
612 | +--- linux-4.4.241.orig/net/ipv6/raw.c | |
613 | ++++ linux-4.4.241/net/ipv6/raw.c | |
614 | 614 | @@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk |
615 | 615 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
616 | 616 | if (!skb) |
@@ -622,8 +622,8 @@ | ||
622 | 622 | |
623 | 623 | copied = skb->len; |
624 | 624 | if (copied > len) { |
625 | ---- linux-4.4.240.orig/net/ipv6/udp.c | |
626 | -+++ linux-4.4.240/net/ipv6/udp.c | |
625 | +--- linux-4.4.241.orig/net/ipv6/udp.c | |
626 | ++++ linux-4.4.241/net/ipv6/udp.c | |
627 | 627 | @@ -417,6 +417,10 @@ try_again: |
628 | 628 | &peeked, &off, &err); |
629 | 629 | if (!skb) |
@@ -635,8 +635,8 @@ | ||
635 | 635 | |
636 | 636 | ulen = skb->len - sizeof(struct udphdr); |
637 | 637 | copied = len; |
638 | ---- linux-4.4.240.orig/net/socket.c | |
639 | -+++ linux-4.4.240/net/socket.c | |
638 | +--- linux-4.4.241.orig/net/socket.c | |
639 | ++++ linux-4.4.241/net/socket.c | |
640 | 640 | @@ -1465,6 +1465,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct |
641 | 641 | if (err < 0) |
642 | 642 | goto out_fd; |
@@ -648,8 +648,8 @@ | ||
648 | 648 | if (upeer_sockaddr) { |
649 | 649 | if (newsock->ops->getname(newsock, (struct sockaddr *)&address, |
650 | 650 | &len, 2) < 0) { |
651 | ---- linux-4.4.240.orig/net/unix/af_unix.c | |
652 | -+++ linux-4.4.240/net/unix/af_unix.c | |
651 | +--- linux-4.4.241.orig/net/unix/af_unix.c | |
652 | ++++ linux-4.4.241/net/unix/af_unix.c | |
653 | 653 | @@ -2160,6 +2160,10 @@ static int unix_dgram_recvmsg(struct soc |
654 | 654 | wake_up_interruptible_sync_poll(&u->peer_wait, |
655 | 655 | POLLOUT | POLLWRNORM | POLLWRBAND); |
@@ -661,8 +661,8 @@ | ||
661 | 661 | if (msg->msg_name) |
662 | 662 | unix_copy_addr(msg, skb->sk); |
663 | 663 | |
664 | ---- linux-4.4.240.orig/security/Kconfig | |
665 | -+++ linux-4.4.240/security/Kconfig | |
664 | +--- linux-4.4.241.orig/security/Kconfig | |
665 | ++++ linux-4.4.241/security/Kconfig | |
666 | 666 | @@ -173,5 +173,7 @@ config DEFAULT_SECURITY |
667 | 667 | default "apparmor" if DEFAULT_SECURITY_APPARMOR |
668 | 668 | default "" if DEFAULT_SECURITY_DAC |
@@ -671,8 +671,8 @@ | ||
671 | 671 | + |
672 | 672 | endmenu |
673 | 673 | |
674 | ---- linux-4.4.240.orig/security/Makefile | |
675 | -+++ linux-4.4.240/security/Makefile | |
674 | +--- linux-4.4.241.orig/security/Makefile | |
675 | ++++ linux-4.4.241/security/Makefile | |
676 | 676 | @@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c |
677 | 677 | # Object integrity file lists |
678 | 678 | subdir-$(CONFIG_INTEGRITY) += integrity |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 4.9.240. | |
1 | +This is TOMOYO Linux patch for kernel 4.9.241. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.240.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.241.tar.xz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 - |
6 | 6 | fs/open.c | 2 + |
@@ -28,8 +28,8 @@ | ||
28 | 28 | security/Makefile | 3 ++ |
29 | 29 | 24 files changed, 147 insertions(+), 26 deletions(-) |
30 | 30 | |
31 | ---- linux-4.9.240.orig/fs/exec.c | |
32 | -+++ linux-4.9.240/fs/exec.c | |
31 | +--- linux-4.9.241.orig/fs/exec.c | |
32 | ++++ linux-4.9.241/fs/exec.c | |
33 | 33 | @@ -1662,7 +1662,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.9.240.orig/fs/open.c | |
43 | -+++ linux-4.9.240/fs/open.c | |
42 | +--- linux-4.9.241.orig/fs/open.c | |
43 | ++++ linux-4.9.241/fs/open.c | |
44 | 44 | @@ -1173,6 +1173,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.9.240.orig/fs/proc/version.c | |
54 | -+++ linux-4.9.240/fs/proc/version.c | |
53 | +--- linux-4.9.241.orig/fs/proc/version.c | |
54 | ++++ linux-4.9.241/fs/proc/version.c | |
55 | 55 | @@ -32,3 +32,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.9.240 2020/10/24\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.9.241 2020/11/03\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-4.9.240.orig/include/linux/init_task.h | |
67 | -+++ linux-4.9.240/include/linux/init_task.h | |
66 | +--- linux-4.9.241.orig/include/linux/init_task.h | |
67 | ++++ linux-4.9.241/include/linux/init_task.h | |
68 | 68 | @@ -193,6 +193,14 @@ extern struct task_group root_task_group |
69 | 69 | # define INIT_TASK_TI(tsk) |
70 | 70 | #endif |
@@ -88,8 +88,8 @@ | ||
88 | 88 | } |
89 | 89 | |
90 | 90 | |
91 | ---- linux-4.9.240.orig/include/linux/sched.h | |
92 | -+++ linux-4.9.240/include/linux/sched.h | |
91 | +--- linux-4.9.241.orig/include/linux/sched.h | |
92 | ++++ linux-4.9.241/include/linux/sched.h | |
93 | 93 | @@ -6,6 +6,8 @@ |
94 | 94 | #include <linux/sched/prio.h> |
95 | 95 |
@@ -110,8 +110,8 @@ | ||
110 | 110 | /* CPU-specific state of this task */ |
111 | 111 | struct thread_struct thread; |
112 | 112 | /* |
113 | ---- linux-4.9.240.orig/include/linux/security.h | |
114 | -+++ linux-4.9.240/include/linux/security.h | |
113 | +--- linux-4.9.241.orig/include/linux/security.h | |
114 | ++++ linux-4.9.241/include/linux/security.h | |
115 | 115 | @@ -55,6 +55,7 @@ struct msg_queue; |
116 | 116 | struct xattr; |
117 | 117 | struct xfrm_sec_ctx; |
@@ -318,8 +318,8 @@ | ||
318 | 318 | } |
319 | 319 | #endif /* CONFIG_SECURITY_PATH */ |
320 | 320 | |
321 | ---- linux-4.9.240.orig/include/net/ip.h | |
322 | -+++ linux-4.9.240/include/net/ip.h | |
321 | +--- linux-4.9.241.orig/include/net/ip.h | |
322 | ++++ linux-4.9.241/include/net/ip.h | |
323 | 323 | @@ -254,6 +254,8 @@ void inet_get_local_port_range(struct ne |
324 | 324 | #ifdef CONFIG_SYSCTL |
325 | 325 | static inline int inet_is_local_reserved_port(struct net *net, int port) |
@@ -338,8 +338,8 @@ | ||
338 | 338 | return 0; |
339 | 339 | } |
340 | 340 | #endif |
341 | ---- linux-4.9.240.orig/kernel/fork.c | |
342 | -+++ linux-4.9.240/kernel/fork.c | |
341 | +--- linux-4.9.241.orig/kernel/fork.c | |
342 | ++++ linux-4.9.241/kernel/fork.c | |
343 | 343 | @@ -395,6 +395,7 @@ void __put_task_struct(struct task_struc |
344 | 344 | delayacct_tsk_free(tsk); |
345 | 345 | put_signal_struct(tsk->signal); |
@@ -366,8 +366,8 @@ | ||
366 | 366 | bad_fork_cleanup_perf: |
367 | 367 | perf_event_free_task(p); |
368 | 368 | bad_fork_cleanup_policy: |
369 | ---- linux-4.9.240.orig/kernel/kexec.c | |
370 | -+++ linux-4.9.240/kernel/kexec.c | |
369 | +--- linux-4.9.241.orig/kernel/kexec.c | |
370 | ++++ linux-4.9.241/kernel/kexec.c | |
371 | 371 | @@ -17,7 +17,7 @@ |
372 | 372 | #include <linux/syscalls.h> |
373 | 373 | #include <linux/vmalloc.h> |
@@ -386,8 +386,8 @@ | ||
386 | 386 | |
387 | 387 | /* |
388 | 388 | * Verify we have a legal set of flags |
389 | ---- linux-4.9.240.orig/kernel/module.c | |
390 | -+++ linux-4.9.240/kernel/module.c | |
389 | +--- linux-4.9.241.orig/kernel/module.c | |
390 | ++++ linux-4.9.241/kernel/module.c | |
391 | 391 | @@ -63,6 +63,7 @@ |
392 | 392 | #include <linux/dynamic_debug.h> |
393 | 393 | #include <uapi/linux/module.h> |
@@ -414,8 +414,8 @@ | ||
414 | 414 | |
415 | 415 | return 0; |
416 | 416 | } |
417 | ---- linux-4.9.240.orig/kernel/ptrace.c | |
418 | -+++ linux-4.9.240/kernel/ptrace.c | |
417 | +--- linux-4.9.241.orig/kernel/ptrace.c | |
418 | ++++ linux-4.9.241/kernel/ptrace.c | |
419 | 419 | @@ -1146,6 +1146,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l |
420 | 420 | { |
421 | 421 | struct task_struct *child; |
@@ -440,8 +440,8 @@ | ||
440 | 440 | |
441 | 441 | if (request == PTRACE_TRACEME) { |
442 | 442 | ret = ptrace_traceme(); |
443 | ---- linux-4.9.240.orig/kernel/reboot.c | |
444 | -+++ linux-4.9.240/kernel/reboot.c | |
443 | +--- linux-4.9.241.orig/kernel/reboot.c | |
444 | ++++ linux-4.9.241/kernel/reboot.c | |
445 | 445 | @@ -16,6 +16,7 @@ |
446 | 446 | #include <linux/syscalls.h> |
447 | 447 | #include <linux/syscore_ops.h> |
@@ -459,8 +459,8 @@ | ||
459 | 459 | |
460 | 460 | /* |
461 | 461 | * If pid namespaces are enabled and the current task is in a child |
462 | ---- linux-4.9.240.orig/kernel/sched/core.c | |
463 | -+++ linux-4.9.240/kernel/sched/core.c | |
462 | +--- linux-4.9.241.orig/kernel/sched/core.c | |
463 | ++++ linux-4.9.241/kernel/sched/core.c | |
464 | 464 | @@ -3814,6 +3814,8 @@ int can_nice(const struct task_struct *p |
465 | 465 | SYSCALL_DEFINE1(nice, int, increment) |
466 | 466 | { |
@@ -470,8 +470,8 @@ | ||
470 | 470 | |
471 | 471 | /* |
472 | 472 | * Setpriority might change our priority at the same moment. |
473 | ---- linux-4.9.240.orig/kernel/signal.c | |
474 | -+++ linux-4.9.240/kernel/signal.c | |
473 | +--- linux-4.9.241.orig/kernel/signal.c | |
474 | ++++ linux-4.9.241/kernel/signal.c | |
475 | 475 | @@ -2943,6 +2943,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s |
476 | 476 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
477 | 477 | { |
@@ -517,8 +517,8 @@ | ||
517 | 517 | |
518 | 518 | return do_send_specific(tgid, pid, sig, info); |
519 | 519 | } |
520 | ---- linux-4.9.240.orig/kernel/sys.c | |
521 | -+++ linux-4.9.240/kernel/sys.c | |
520 | +--- linux-4.9.241.orig/kernel/sys.c | |
521 | ++++ linux-4.9.241/kernel/sys.c | |
522 | 522 | @@ -185,6 +185,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
523 | 523 | |
524 | 524 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -548,8 +548,8 @@ | ||
548 | 548 | |
549 | 549 | errno = -EFAULT; |
550 | 550 | if (!copy_from_user(tmp, name, len)) { |
551 | ---- linux-4.9.240.orig/kernel/time/ntp.c | |
552 | -+++ linux-4.9.240/kernel/time/ntp.c | |
551 | +--- linux-4.9.241.orig/kernel/time/ntp.c | |
552 | ++++ linux-4.9.241/kernel/time/ntp.c | |
553 | 553 | @@ -17,6 +17,7 @@ |
554 | 554 | #include <linux/module.h> |
555 | 555 | #include <linux/rtc.h> |
@@ -583,8 +583,8 @@ | ||
583 | 583 | |
584 | 584 | if (txc->modes & ADJ_NANO) { |
585 | 585 | struct timespec ts; |
586 | ---- linux-4.9.240.orig/net/ipv4/raw.c | |
587 | -+++ linux-4.9.240/net/ipv4/raw.c | |
586 | +--- linux-4.9.241.orig/net/ipv4/raw.c | |
587 | ++++ linux-4.9.241/net/ipv4/raw.c | |
588 | 588 | @@ -746,6 +746,10 @@ static int raw_recvmsg(struct sock *sk, |
589 | 589 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
590 | 590 | if (!skb) |
@@ -596,8 +596,8 @@ | ||
596 | 596 | |
597 | 597 | copied = skb->len; |
598 | 598 | if (len < copied) { |
599 | ---- linux-4.9.240.orig/net/ipv4/udp.c | |
600 | -+++ linux-4.9.240/net/ipv4/udp.c | |
599 | +--- linux-4.9.241.orig/net/ipv4/udp.c | |
600 | ++++ linux-4.9.241/net/ipv4/udp.c | |
601 | 601 | @@ -1271,6 +1271,8 @@ try_again: |
602 | 602 | &peeked, &off, &err); |
603 | 603 | if (!skb) |
@@ -607,8 +607,8 @@ | ||
607 | 607 | |
608 | 608 | ulen = skb->len; |
609 | 609 | copied = len; |
610 | ---- linux-4.9.240.orig/net/ipv6/raw.c | |
611 | -+++ linux-4.9.240/net/ipv6/raw.c | |
610 | +--- linux-4.9.241.orig/net/ipv6/raw.c | |
611 | ++++ linux-4.9.241/net/ipv6/raw.c | |
612 | 612 | @@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk |
613 | 613 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
614 | 614 | if (!skb) |
@@ -620,8 +620,8 @@ | ||
620 | 620 | |
621 | 621 | copied = skb->len; |
622 | 622 | if (copied > len) { |
623 | ---- linux-4.9.240.orig/net/ipv6/udp.c | |
624 | -+++ linux-4.9.240/net/ipv6/udp.c | |
623 | +--- linux-4.9.241.orig/net/ipv6/udp.c | |
624 | ++++ linux-4.9.241/net/ipv6/udp.c | |
625 | 625 | @@ -348,6 +348,8 @@ try_again: |
626 | 626 | &peeked, &off, &err); |
627 | 627 | if (!skb) |
@@ -631,8 +631,8 @@ | ||
631 | 631 | |
632 | 632 | ulen = skb->len; |
633 | 633 | copied = len; |
634 | ---- linux-4.9.240.orig/net/socket.c | |
635 | -+++ linux-4.9.240/net/socket.c | |
634 | +--- linux-4.9.241.orig/net/socket.c | |
635 | ++++ linux-4.9.241/net/socket.c | |
636 | 636 | @@ -1482,6 +1482,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct |
637 | 637 | if (err < 0) |
638 | 638 | goto out_fd; |
@@ -644,8 +644,8 @@ | ||
644 | 644 | if (upeer_sockaddr) { |
645 | 645 | if (newsock->ops->getname(newsock, (struct sockaddr *)&address, |
646 | 646 | &len, 2) < 0) { |
647 | ---- linux-4.9.240.orig/net/unix/af_unix.c | |
648 | -+++ linux-4.9.240/net/unix/af_unix.c | |
647 | +--- linux-4.9.241.orig/net/unix/af_unix.c | |
648 | ++++ linux-4.9.241/net/unix/af_unix.c | |
649 | 649 | @@ -2169,6 +2169,10 @@ static int unix_dgram_recvmsg(struct soc |
650 | 650 | POLLOUT | POLLWRNORM | |
651 | 651 | POLLWRBAND); |
@@ -665,8 +665,8 @@ | ||
665 | 665 | mutex_unlock(&u->iolock); |
666 | 666 | out: |
667 | 667 | return err; |
668 | ---- linux-4.9.240.orig/security/Kconfig | |
669 | -+++ linux-4.9.240/security/Kconfig | |
668 | +--- linux-4.9.241.orig/security/Kconfig | |
669 | ++++ linux-4.9.241/security/Kconfig | |
670 | 670 | @@ -214,5 +214,7 @@ config DEFAULT_SECURITY |
671 | 671 | default "apparmor" if DEFAULT_SECURITY_APPARMOR |
672 | 672 | default "" if DEFAULT_SECURITY_DAC |
@@ -675,8 +675,8 @@ | ||
675 | 675 | + |
676 | 676 | endmenu |
677 | 677 | |
678 | ---- linux-4.9.240.orig/security/Makefile | |
679 | -+++ linux-4.9.240/security/Makefile | |
678 | +--- linux-4.9.241.orig/security/Makefile | |
679 | ++++ linux-4.9.241/security/Makefile | |
680 | 680 | @@ -29,3 +29,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c |
681 | 681 | # Object integrity file lists |
682 | 682 | subdir-$(CONFIG_INTEGRITY) += integrity |
@@ -0,0 +1,711 @@ | ||
1 | +This is TOMOYO Linux patch for kernel 5.10-rc2. | |
2 | + | |
3 | +Source code for this patch is https://git.kernel.org/torvalds/t/linux-5.10-rc2.tar.gz | |
4 | +--- | |
5 | + fs/exec.c | 2 - | |
6 | + fs/open.c | 2 + | |
7 | + fs/proc/version.c | 7 ++++ | |
8 | + include/linux/sched.h | 5 +++ | |
9 | + include/linux/security.h | 70 ++++++++++++++++++++++++++++------------------ | |
10 | + include/net/ip.h | 4 ++ | |
11 | + init/init_task.c | 4 ++ | |
12 | + kernel/kexec.c | 4 +- | |
13 | + kernel/module.c | 5 +++ | |
14 | + kernel/ptrace.c | 10 ++++++ | |
15 | + kernel/reboot.c | 3 + | |
16 | + kernel/sched/core.c | 2 + | |
17 | + kernel/signal.c | 25 ++++++++++++++++ | |
18 | + kernel/sys.c | 8 +++++ | |
19 | + kernel/time/timekeeping.c | 8 +++++ | |
20 | + net/ipv4/raw.c | 4 ++ | |
21 | + net/ipv4/udp.c | 2 + | |
22 | + net/ipv6/raw.c | 4 ++ | |
23 | + net/ipv6/udp.c | 2 + | |
24 | + net/socket.c | 4 ++ | |
25 | + net/unix/af_unix.c | 5 +++ | |
26 | + security/Kconfig | 2 + | |
27 | + security/Makefile | 3 + | |
28 | + security/security.c | 5 ++- | |
29 | + 24 files changed, 160 insertions(+), 30 deletions(-) | |
30 | + | |
31 | +--- linux-5.10-rc2.orig/fs/exec.c | |
32 | ++++ linux-5.10-rc2/fs/exec.c | |
33 | +@@ -1817,7 +1817,7 @@ static int bprm_execve(struct linux_binp | |
34 | + if (retval) | |
35 | + goto out; | |
36 | + | |
37 | +- retval = exec_binprm(bprm); | |
38 | ++ retval = ccs_exec_binprm(bprm); | |
39 | + if (retval < 0) | |
40 | + goto out; | |
41 | + | |
42 | +--- linux-5.10-rc2.orig/fs/open.c | |
43 | ++++ linux-5.10-rc2/fs/open.c | |
44 | +@@ -1327,6 +1327,8 @@ SYSCALL_DEFINE3(close_range, unsigned in | |
45 | + */ | |
46 | + SYSCALL_DEFINE0(vhangup) | |
47 | + { | |
48 | ++ if (!ccs_capable(CCS_SYS_VHANGUP)) | |
49 | ++ return -EPERM; | |
50 | + if (capable(CAP_SYS_TTY_CONFIG)) { | |
51 | + tty_vhangup_self(); | |
52 | + return 0; | |
53 | +--- linux-5.10-rc2.orig/fs/proc/version.c | |
54 | ++++ linux-5.10-rc2/fs/proc/version.c | |
55 | +@@ -21,3 +21,10 @@ static int __init proc_version_init(void | |
56 | + return 0; | |
57 | + } | |
58 | + fs_initcall(proc_version_init); | |
59 | ++ | |
60 | ++static int __init ccs_show_version(void) | |
61 | ++{ | |
62 | ++ printk(KERN_INFO "Hook version: 5.10-rc2 2020/11/03\n"); | |
63 | ++ return 0; | |
64 | ++} | |
65 | ++fs_initcall(ccs_show_version); | |
66 | +--- linux-5.10-rc2.orig/include/linux/sched.h | |
67 | ++++ linux-5.10-rc2/include/linux/sched.h | |
68 | +@@ -41,6 +41,7 @@ struct backing_dev_info; | |
69 | + struct bio_list; | |
70 | + struct blk_plug; | |
71 | + struct capture_control; | |
72 | ++struct ccs_domain_info; | |
73 | + struct cfs_rq; | |
74 | + struct fs_struct; | |
75 | + struct futex_pi_state; | |
76 | +@@ -1310,6 +1311,10 @@ struct task_struct { | |
77 | + /* Used by LSM modules for access restriction: */ | |
78 | + void *security; | |
79 | + #endif | |
80 | ++#if defined(CONFIG_CCSECURITY) && !defined(CONFIG_CCSECURITY_USE_EXTERNAL_TASK_SECURITY) | |
81 | ++ struct ccs_domain_info *ccs_domain_info; | |
82 | ++ u32 ccs_flags; | |
83 | ++#endif | |
84 | + | |
85 | + #ifdef CONFIG_GCC_PLUGIN_STACKLEAK | |
86 | + unsigned long lowest_stack; | |
87 | +--- linux-5.10-rc2.orig/include/linux/security.h | |
88 | ++++ linux-5.10-rc2/include/linux/security.h | |
89 | +@@ -59,6 +59,7 @@ struct fs_parameter; | |
90 | + enum fs_value_type; | |
91 | + struct watch; | |
92 | + struct watch_notification; | |
93 | ++#include <linux/ccsecurity.h> | |
94 | + | |
95 | + /* Default (no) options for the capable function */ | |
96 | + #define CAP_OPT_NONE 0x0 | |
97 | +@@ -571,7 +572,10 @@ static inline int security_syslog(int ty | |
98 | + static inline int security_settime64(const struct timespec64 *ts, | |
99 | + const struct timezone *tz) | |
100 | + { | |
101 | +- return cap_settime(ts, tz); | |
102 | ++ int error = cap_settime(ts, tz); | |
103 | ++ if (!error) | |
104 | ++ error = ccs_settime(ts, tz); | |
105 | ++ return error; | |
106 | + } | |
107 | + | |
108 | + static inline int security_vm_enough_memory_mm(struct mm_struct *mm, long pages) | |
109 | +@@ -654,18 +658,18 @@ static inline int security_sb_mount(cons | |
110 | + const char *type, unsigned long flags, | |
111 | + void *data) | |
112 | + { | |
113 | +- return 0; | |
114 | ++ return ccs_sb_mount(dev_name, path, type, flags, data); | |
115 | + } | |
116 | + | |
117 | + static inline int security_sb_umount(struct vfsmount *mnt, int flags) | |
118 | + { | |
119 | +- return 0; | |
120 | ++ return ccs_sb_umount(mnt, flags); | |
121 | + } | |
122 | + | |
123 | + static inline int security_sb_pivotroot(const struct path *old_path, | |
124 | + const struct path *new_path) | |
125 | + { | |
126 | +- return 0; | |
127 | ++ return ccs_sb_pivotroot(old_path, new_path); | |
128 | + } | |
129 | + | |
130 | + static inline int security_sb_set_mnt_opts(struct super_block *sb, | |
131 | +@@ -693,7 +697,7 @@ static inline int security_add_mnt_opt(c | |
132 | + static inline int security_move_mount(const struct path *from_path, | |
133 | + const struct path *to_path) | |
134 | + { | |
135 | +- return 0; | |
136 | ++ return ccs_move_mount_permission(from_path, to_path); | |
137 | + } | |
138 | + | |
139 | + static inline int security_path_notify(const struct path *path, u64 mask, | |
140 | +@@ -827,7 +831,7 @@ static inline int security_inode_setattr | |
141 | + | |
142 | + static inline int security_inode_getattr(const struct path *path) | |
143 | + { | |
144 | +- return 0; | |
145 | ++ return ccs_inode_getattr(path); | |
146 | + } | |
147 | + | |
148 | + static inline int security_inode_setxattr(struct dentry *dentry, | |
149 | +@@ -919,7 +923,7 @@ static inline void security_file_free(st | |
150 | + static inline int security_file_ioctl(struct file *file, unsigned int cmd, | |
151 | + unsigned long arg) | |
152 | + { | |
153 | +- return 0; | |
154 | ++ return ccs_file_ioctl(file, cmd, arg); | |
155 | + } | |
156 | + | |
157 | + static inline int security_mmap_file(struct file *file, unsigned long prot, | |
158 | +@@ -948,7 +952,7 @@ static inline int security_file_lock(str | |
159 | + static inline int security_file_fcntl(struct file *file, unsigned int cmd, | |
160 | + unsigned long arg) | |
161 | + { | |
162 | +- return 0; | |
163 | ++ return ccs_file_fcntl(file, cmd, arg); | |
164 | + } | |
165 | + | |
166 | + static inline void security_file_set_fowner(struct file *file) | |
167 | +@@ -970,17 +974,19 @@ static inline int security_file_receive( | |
168 | + | |
169 | + static inline int security_file_open(struct file *file) | |
170 | + { | |
171 | +- return 0; | |
172 | ++ return ccs_file_open(file); | |
173 | + } | |
174 | + | |
175 | + static inline int security_task_alloc(struct task_struct *task, | |
176 | + unsigned long clone_flags) | |
177 | + { | |
178 | +- return 0; | |
179 | ++ return ccs_alloc_task_security(task); | |
180 | + } | |
181 | + | |
182 | + static inline void security_task_free(struct task_struct *task) | |
183 | +-{ } | |
184 | ++{ | |
185 | ++ ccs_free_task_security(task); | |
186 | ++} | |
187 | + | |
188 | + static inline int security_cred_alloc_blank(struct cred *cred, gfp_t gfp) | |
189 | + { | |
190 | +@@ -1396,7 +1402,7 @@ static inline int security_unix_may_send | |
191 | + static inline int security_socket_create(int family, int type, | |
192 | + int protocol, int kern) | |
193 | + { | |
194 | +- return 0; | |
195 | ++ return ccs_socket_create(family, type, protocol, kern); | |
196 | + } | |
197 | + | |
198 | + static inline int security_socket_post_create(struct socket *sock, | |
199 | +@@ -1417,19 +1423,19 @@ static inline int security_socket_bind(s | |
200 | + struct sockaddr *address, | |
201 | + int addrlen) | |
202 | + { | |
203 | +- return 0; | |
204 | ++ return ccs_socket_bind(sock, address, addrlen); | |
205 | + } | |
206 | + | |
207 | + static inline int security_socket_connect(struct socket *sock, | |
208 | + struct sockaddr *address, | |
209 | + int addrlen) | |
210 | + { | |
211 | +- return 0; | |
212 | ++ return ccs_socket_connect(sock, address, addrlen); | |
213 | + } | |
214 | + | |
215 | + static inline int security_socket_listen(struct socket *sock, int backlog) | |
216 | + { | |
217 | +- return 0; | |
218 | ++ return ccs_socket_listen(sock, backlog); | |
219 | + } | |
220 | + | |
221 | + static inline int security_socket_accept(struct socket *sock, | |
222 | +@@ -1441,7 +1447,7 @@ static inline int security_socket_accept | |
223 | + static inline int security_socket_sendmsg(struct socket *sock, | |
224 | + struct msghdr *msg, int size) | |
225 | + { | |
226 | +- return 0; | |
227 | ++ return ccs_socket_sendmsg(sock, msg, size); | |
228 | + } | |
229 | + | |
230 | + static inline int security_socket_recvmsg(struct socket *sock, | |
231 | +@@ -1728,42 +1734,42 @@ int security_path_chroot(const struct pa | |
232 | + #else /* CONFIG_SECURITY_PATH */ | |
233 | + static inline int security_path_unlink(const struct path *dir, struct dentry *dentry) | |
234 | + { | |
235 | +- return 0; | |
236 | ++ return ccs_path_unlink(dir, dentry); | |
237 | + } | |
238 | + | |
239 | + static inline int security_path_mkdir(const struct path *dir, struct dentry *dentry, | |
240 | + umode_t mode) | |
241 | + { | |
242 | +- return 0; | |
243 | ++ return ccs_path_mkdir(dir, dentry, mode); | |
244 | + } | |
245 | + | |
246 | + static inline int security_path_rmdir(const struct path *dir, struct dentry *dentry) | |
247 | + { | |
248 | +- return 0; | |
249 | ++ return ccs_path_rmdir(dir, dentry); | |
250 | + } | |
251 | + | |
252 | + static inline int security_path_mknod(const struct path *dir, struct dentry *dentry, | |
253 | + umode_t mode, unsigned int dev) | |
254 | + { | |
255 | +- return 0; | |
256 | ++ return ccs_path_mknod(dir, dentry, mode, dev); | |
257 | + } | |
258 | + | |
259 | + static inline int security_path_truncate(const struct path *path) | |
260 | + { | |
261 | +- return 0; | |
262 | ++ return ccs_path_truncate(path); | |
263 | + } | |
264 | + | |
265 | + static inline int security_path_symlink(const struct path *dir, struct dentry *dentry, | |
266 | + const char *old_name) | |
267 | + { | |
268 | +- return 0; | |
269 | ++ return ccs_path_symlink(dir, dentry, old_name); | |
270 | + } | |
271 | + | |
272 | + static inline int security_path_link(struct dentry *old_dentry, | |
273 | + const struct path *new_dir, | |
274 | + struct dentry *new_dentry) | |
275 | + { | |
276 | +- return 0; | |
277 | ++ return ccs_path_link(old_dentry, new_dir, new_dentry); | |
278 | + } | |
279 | + | |
280 | + static inline int security_path_rename(const struct path *old_dir, | |
281 | +@@ -1772,22 +1778,32 @@ static inline int security_path_rename(c | |
282 | + struct dentry *new_dentry, | |
283 | + unsigned int flags) | |
284 | + { | |
285 | +- return 0; | |
286 | ++ /* | |
287 | ++ * Not using RENAME_EXCHANGE here in order to avoid KABI breakage | |
288 | ++ * by doing "#include <uapi/linux/fs.h>" . | |
289 | ++ */ | |
290 | ++ if (flags & (1 << 1)) { | |
291 | ++ int err = ccs_path_rename(new_dir, new_dentry, old_dir, | |
292 | ++ old_dentry); | |
293 | ++ if (err) | |
294 | ++ return err; | |
295 | ++ } | |
296 | ++ return ccs_path_rename(old_dir, old_dentry, new_dir, new_dentry); | |
297 | + } | |
298 | + | |
299 | + static inline int security_path_chmod(const struct path *path, umode_t mode) | |
300 | + { | |
301 | +- return 0; | |
302 | ++ return ccs_path_chmod(path, mode); | |
303 | + } | |
304 | + | |
305 | + static inline int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid) | |
306 | + { | |
307 | +- return 0; | |
308 | ++ return ccs_path_chown(path, uid, gid); | |
309 | + } | |
310 | + | |
311 | + static inline int security_path_chroot(const struct path *path) | |
312 | + { | |
313 | +- return 0; | |
314 | ++ return ccs_path_chroot(path); | |
315 | + } | |
316 | + #endif /* CONFIG_SECURITY_PATH */ | |
317 | + | |
318 | +--- linux-5.10-rc2.orig/include/net/ip.h | |
319 | ++++ linux-5.10-rc2/include/net/ip.h | |
320 | +@@ -338,6 +338,8 @@ void inet_get_local_port_range(struct ne | |
321 | + #ifdef CONFIG_SYSCTL | |
322 | + static inline bool inet_is_local_reserved_port(struct net *net, unsigned short port) | |
323 | + { | |
324 | ++ if (ccs_lport_reserved(port)) | |
325 | ++ return true; | |
326 | + if (!net->ipv4.sysctl_local_reserved_ports) | |
327 | + return false; | |
328 | + return test_bit(port, net->ipv4.sysctl_local_reserved_ports); | |
329 | +@@ -356,6 +358,8 @@ static inline bool inet_port_requires_bi | |
330 | + #else | |
331 | + static inline bool inet_is_local_reserved_port(struct net *net, unsigned short port) | |
332 | + { | |
333 | ++ if (ccs_lport_reserved(port)) | |
334 | ++ return true; | |
335 | + return false; | |
336 | + } | |
337 | + | |
338 | +--- linux-5.10-rc2.orig/init/init_task.c | |
339 | ++++ linux-5.10-rc2/init/init_task.c | |
340 | +@@ -212,6 +212,10 @@ struct task_struct init_task | |
341 | + #ifdef CONFIG_SECCOMP | |
342 | + .seccomp = { .filter_count = ATOMIC_INIT(0) }, | |
343 | + #endif | |
344 | ++#if defined(CONFIG_CCSECURITY) && !defined(CONFIG_CCSECURITY_USE_EXTERNAL_TASK_SECURITY) | |
345 | ++ .ccs_domain_info = NULL, | |
346 | ++ .ccs_flags = 0, | |
347 | ++#endif | |
348 | + }; | |
349 | + EXPORT_SYMBOL(init_task); | |
350 | + | |
351 | +--- linux-5.10-rc2.orig/kernel/kexec.c | |
352 | ++++ linux-5.10-rc2/kernel/kexec.c | |
353 | +@@ -16,7 +16,7 @@ | |
354 | + #include <linux/syscalls.h> | |
355 | + #include <linux/vmalloc.h> | |
356 | + #include <linux/slab.h> | |
357 | +- | |
358 | ++#include <linux/ccsecurity.h> | |
359 | + #include "kexec_internal.h" | |
360 | + | |
361 | + static int copy_user_segment_list(struct kimage *image, | |
362 | +@@ -203,6 +203,8 @@ static inline int kexec_load_check(unsig | |
363 | + /* We only trust the superuser with rebooting the system. */ | |
364 | + if (!capable(CAP_SYS_BOOT) || kexec_load_disabled) | |
365 | + return -EPERM; | |
366 | ++ if (!ccs_capable(CCS_SYS_KEXEC_LOAD)) | |
367 | ++ return -EPERM; | |
368 | + | |
369 | + /* Permit LSMs and IMA to fail the kexec */ | |
370 | + result = security_kernel_load_data(LOADING_KEXEC_IMAGE, false); | |
371 | +--- linux-5.10-rc2.orig/kernel/module.c | |
372 | ++++ linux-5.10-rc2/kernel/module.c | |
373 | +@@ -59,6 +59,7 @@ | |
374 | + #include <linux/audit.h> | |
375 | + #include <uapi/linux/module.h> | |
376 | + #include "module-internal.h" | |
377 | ++#include <linux/ccsecurity.h> | |
378 | + | |
379 | + #define CREATE_TRACE_POINTS | |
380 | + #include <trace/events/module.h> | |
381 | +@@ -983,6 +984,8 @@ SYSCALL_DEFINE2(delete_module, const cha | |
382 | + | |
383 | + if (!capable(CAP_SYS_MODULE) || modules_disabled) | |
384 | + return -EPERM; | |
385 | ++ if (!ccs_capable(CCS_USE_KERNEL_MODULE)) | |
386 | ++ return -EPERM; | |
387 | + | |
388 | + if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0) | |
389 | + return -EFAULT; | |
390 | +@@ -3718,6 +3721,8 @@ static int may_init_module(void) | |
391 | + { | |
392 | + if (!capable(CAP_SYS_MODULE) || modules_disabled) | |
393 | + return -EPERM; | |
394 | ++ if (!ccs_capable(CCS_USE_KERNEL_MODULE)) | |
395 | ++ return -EPERM; | |
396 | + | |
397 | + return 0; | |
398 | + } | |
399 | +--- linux-5.10-rc2.orig/kernel/ptrace.c | |
400 | ++++ linux-5.10-rc2/kernel/ptrace.c | |
401 | +@@ -1244,6 +1244,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l | |
402 | + { | |
403 | + struct task_struct *child; | |
404 | + long ret; | |
405 | ++ { | |
406 | ++ const int rc = ccs_ptrace_permission(request, pid); | |
407 | ++ if (rc) | |
408 | ++ return rc; | |
409 | ++ } | |
410 | + | |
411 | + if (request == PTRACE_TRACEME) { | |
412 | + ret = ptrace_traceme(); | |
413 | +@@ -1391,6 +1396,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo | |
414 | + { | |
415 | + struct task_struct *child; | |
416 | + long ret; | |
417 | ++ { | |
418 | ++ const int rc = ccs_ptrace_permission(request, pid); | |
419 | ++ if (rc) | |
420 | ++ return rc; | |
421 | ++ } | |
422 | + | |
423 | + if (request == PTRACE_TRACEME) { | |
424 | + ret = ptrace_traceme(); | |
425 | +--- linux-5.10-rc2.orig/kernel/reboot.c | |
426 | ++++ linux-5.10-rc2/kernel/reboot.c | |
427 | +@@ -17,6 +17,7 @@ | |
428 | + #include <linux/syscalls.h> | |
429 | + #include <linux/syscore_ops.h> | |
430 | + #include <linux/uaccess.h> | |
431 | ++#include <linux/ccsecurity.h> | |
432 | + | |
433 | + /* | |
434 | + * this indicates whether you can reboot with ctrl-alt-del: the default is yes | |
435 | +@@ -325,6 +326,8 @@ SYSCALL_DEFINE4(reboot, int, magic1, int | |
436 | + magic2 != LINUX_REBOOT_MAGIC2B && | |
437 | + magic2 != LINUX_REBOOT_MAGIC2C)) | |
438 | + return -EINVAL; | |
439 | ++ if (!ccs_capable(CCS_SYS_REBOOT)) | |
440 | ++ return -EPERM; | |
441 | + | |
442 | + /* | |
443 | + * If pid namespaces are enabled and the current task is in a child | |
444 | +--- linux-5.10-rc2.orig/kernel/sched/core.c | |
445 | ++++ linux-5.10-rc2/kernel/sched/core.c | |
446 | +@@ -5029,6 +5029,8 @@ int can_nice(const struct task_struct *p | |
447 | + SYSCALL_DEFINE1(nice, int, increment) | |
448 | + { | |
449 | + long nice, retval; | |
450 | ++ if (!ccs_capable(CCS_SYS_NICE)) | |
451 | ++ return -EPERM; | |
452 | + | |
453 | + /* | |
454 | + * Setpriority might change our priority at the same moment. | |
455 | +--- linux-5.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( | |
458 | + SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) | |
459 | + { | |
460 | + struct kernel_siginfo info; | |
461 | ++ if (ccs_kill_permission(pid, sig)) | |
462 | ++ return -EPERM; | |
463 | + | |
464 | + prepare_kill_siginfo(sig, &info); | |
465 | + | |
466 | +@@ -3755,6 +3757,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int, | |
467 | + if (!access_pidfd_pidns(pid)) | |
468 | + goto err; | |
469 | + | |
470 | ++ { | |
471 | ++ struct task_struct *task; | |
472 | ++ int id = 0; | |
473 | ++ | |
474 | ++ rcu_read_lock(); | |
475 | ++ task = pid_task(pid, PIDTYPE_PID); | |
476 | ++ if (task) | |
477 | ++ id = task_pid_vnr(task); | |
478 | ++ rcu_read_unlock(); | |
479 | ++ if (task && ccs_kill_permission(id, sig)) { | |
480 | ++ ret = -EPERM; | |
481 | ++ goto err; | |
482 | ++ } | |
483 | ++ } | |
484 | ++ | |
485 | + if (info) { | |
486 | + ret = copy_siginfo_from_user_any(&kinfo, info); | |
487 | + if (unlikely(ret)) | |
488 | +@@ -3839,6 +3856,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid | |
489 | + /* This is only valid for single tasks */ | |
490 | + if (pid <= 0 || tgid <= 0) | |
491 | + return -EINVAL; | |
492 | ++ if (ccs_tgkill_permission(tgid, pid, sig)) | |
493 | ++ return -EPERM; | |
494 | + | |
495 | + return do_tkill(tgid, pid, sig); | |
496 | + } | |
497 | +@@ -3855,6 +3874,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int, | |
498 | + /* This is only valid for single tasks */ | |
499 | + if (pid <= 0) | |
500 | + return -EINVAL; | |
501 | ++ if (ccs_tkill_permission(pid, sig)) | |
502 | ++ return -EPERM; | |
503 | + | |
504 | + return do_tkill(0, pid, sig); | |
505 | + } | |
506 | +@@ -3867,6 +3888,8 @@ static int do_rt_sigqueueinfo(pid_t pid, | |
507 | + if ((info->si_code >= 0 || info->si_code == SI_TKILL) && | |
508 | + (task_pid_vnr(current) != pid)) | |
509 | + return -EPERM; | |
510 | ++ if (ccs_sigqueue_permission(pid, sig)) | |
511 | ++ return -EPERM; | |
512 | + | |
513 | + /* POSIX.1b doesn't mention process groups. */ | |
514 | + return kill_proc_info(sig, info, pid); | |
515 | +@@ -3914,6 +3937,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg | |
516 | + if ((info->si_code >= 0 || info->si_code == SI_TKILL) && | |
517 | + (task_pid_vnr(current) != pid)) | |
518 | + return -EPERM; | |
519 | ++ if (ccs_tgsigqueue_permission(tgid, pid, sig)) | |
520 | ++ return -EPERM; | |
521 | + | |
522 | + return do_send_specific(tgid, pid, sig, info); | |
523 | + } | |
524 | +--- linux-5.10-rc2.orig/kernel/sys.c | |
525 | ++++ linux-5.10-rc2/kernel/sys.c | |
526 | +@@ -205,6 +205,10 @@ SYSCALL_DEFINE3(setpriority, int, which, | |
527 | + | |
528 | + if (which > PRIO_USER || which < PRIO_PROCESS) | |
529 | + goto out; | |
530 | ++ if (!ccs_capable(CCS_SYS_NICE)) { | |
531 | ++ error = -EPERM; | |
532 | ++ goto out; | |
533 | ++ } | |
534 | + | |
535 | + /* normalize: avoid signed division (rounding problems) */ | |
536 | + error = -ESRCH; | |
537 | +@@ -1328,6 +1332,8 @@ SYSCALL_DEFINE2(sethostname, char __user | |
538 | + | |
539 | + if (len < 0 || len > __NEW_UTS_LEN) | |
540 | + return -EINVAL; | |
541 | ++ if (!ccs_capable(CCS_SYS_SETHOSTNAME)) | |
542 | ++ return -EPERM; | |
543 | + errno = -EFAULT; | |
544 | + if (!copy_from_user(tmp, name, len)) { | |
545 | + struct new_utsname *u; | |
546 | +@@ -1380,6 +1386,8 @@ SYSCALL_DEFINE2(setdomainname, char __us | |
547 | + return -EPERM; | |
548 | + if (len < 0 || len > __NEW_UTS_LEN) | |
549 | + return -EINVAL; | |
550 | ++ if (!ccs_capable(CCS_SYS_SETHOSTNAME)) | |
551 | ++ return -EPERM; | |
552 | + | |
553 | + errno = -EFAULT; | |
554 | + if (!copy_from_user(tmp, name, len)) { | |
555 | +--- linux-5.10-rc2.orig/kernel/time/timekeeping.c | |
556 | ++++ linux-5.10-rc2/kernel/time/timekeeping.c | |
557 | +@@ -22,6 +22,7 @@ | |
558 | + #include <linux/pvclock_gtod.h> | |
559 | + #include <linux/compiler.h> | |
560 | + #include <linux/audit.h> | |
561 | ++#include <linux/ccsecurity.h> | |
562 | + | |
563 | + #include "tick-internal.h" | |
564 | + #include "ntp_internal.h" | |
565 | +@@ -2326,10 +2327,15 @@ static int timekeeping_validate_timex(co | |
566 | + if (!(txc->modes & ADJ_OFFSET_READONLY) && | |
567 | + !capable(CAP_SYS_TIME)) | |
568 | + return -EPERM; | |
569 | ++ if (!(txc->modes & ADJ_OFFSET_READONLY) && | |
570 | ++ !ccs_capable(CCS_SYS_SETTIME)) | |
571 | ++ return -EPERM; | |
572 | + } else { | |
573 | + /* In order to modify anything, you gotta be super-user! */ | |
574 | + if (txc->modes && !capable(CAP_SYS_TIME)) | |
575 | + return -EPERM; | |
576 | ++ if (txc->modes && !ccs_capable(CCS_SYS_SETTIME)) | |
577 | ++ return -EPERM; | |
578 | + /* | |
579 | + * if the quartz is off by more than 10% then | |
580 | + * something is VERY wrong! | |
581 | +@@ -2344,6 +2350,8 @@ static int timekeeping_validate_timex(co | |
582 | + /* In order to inject time, you gotta be super-user! */ | |
583 | + if (!capable(CAP_SYS_TIME)) | |
584 | + return -EPERM; | |
585 | ++ if (!ccs_capable(CCS_SYS_SETTIME)) | |
586 | ++ return -EPERM; | |
587 | + | |
588 | + /* | |
589 | + * Validate if a timespec/timeval used to inject a time | |
590 | +--- linux-5.10-rc2.orig/net/ipv4/raw.c | |
591 | ++++ linux-5.10-rc2/net/ipv4/raw.c | |
592 | +@@ -768,6 +768,10 @@ static int raw_recvmsg(struct sock *sk, | |
593 | + skb = skb_recv_datagram(sk, flags, noblock, &err); | |
594 | + if (!skb) | |
595 | + goto out; | |
596 | ++ if (ccs_socket_post_recvmsg_permission(sk, skb, flags)) { | |
597 | ++ err = -EAGAIN; /* Hope less harmful than -EPERM. */ | |
598 | ++ goto out; | |
599 | ++ } | |
600 | + | |
601 | + copied = skb->len; | |
602 | + if (len < copied) { | |
603 | +--- linux-5.10-rc2.orig/net/ipv4/udp.c | |
604 | ++++ linux-5.10-rc2/net/ipv4/udp.c | |
605 | +@@ -1801,6 +1801,8 @@ try_again: | |
606 | + skb = __skb_recv_udp(sk, flags, noblock, &off, &err); | |
607 | + if (!skb) | |
608 | + return err; | |
609 | ++ if (ccs_socket_post_recvmsg_permission(sk, skb, flags)) | |
610 | ++ return -EAGAIN; /* Hope less harmful than -EPERM. */ | |
611 | + | |
612 | + ulen = udp_skb_len(skb); | |
613 | + copied = len; | |
614 | +--- linux-5.10-rc2.orig/net/ipv6/raw.c | |
615 | ++++ linux-5.10-rc2/net/ipv6/raw.c | |
616 | +@@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk | |
617 | + skb = skb_recv_datagram(sk, flags, noblock, &err); | |
618 | + if (!skb) | |
619 | + goto out; | |
620 | ++ if (ccs_socket_post_recvmsg_permission(sk, skb, flags)) { | |
621 | ++ err = -EAGAIN; /* Hope less harmful than -EPERM. */ | |
622 | ++ goto out; | |
623 | ++ } | |
624 | + | |
625 | + copied = skb->len; | |
626 | + if (copied > len) { | |
627 | +--- linux-5.10-rc2.orig/net/ipv6/udp.c | |
628 | ++++ linux-5.10-rc2/net/ipv6/udp.c | |
629 | +@@ -343,6 +343,8 @@ try_again: | |
630 | + skb = __skb_recv_udp(sk, flags, noblock, &off, &err); | |
631 | + if (!skb) | |
632 | + return err; | |
633 | ++ if (ccs_socket_post_recvmsg_permission(sk, skb, flags)) | |
634 | ++ return -EAGAIN; /* Hope less harmful than -EPERM. */ | |
635 | + | |
636 | + ulen = udp6_skb_len(skb); | |
637 | + copied = len; | |
638 | +--- linux-5.10-rc2.orig/net/socket.c | |
639 | ++++ linux-5.10-rc2/net/socket.c | |
640 | +@@ -1755,6 +1755,10 @@ int __sys_accept4_file(struct file *file | |
641 | + if (err < 0) | |
642 | + goto out_fd; | |
643 | + | |
644 | ++ if (ccs_socket_post_accept_permission(sock, newsock)) { | |
645 | ++ err = -EAGAIN; /* Hope less harmful than -EPERM. */ | |
646 | ++ goto out_fd; | |
647 | ++ } | |
648 | + if (upeer_sockaddr) { | |
649 | + len = newsock->ops->getname(newsock, | |
650 | + (struct sockaddr *)&address, 2); | |
651 | +--- linux-5.10-rc2.orig/net/unix/af_unix.c | |
652 | ++++ linux-5.10-rc2/net/unix/af_unix.c | |
653 | +@@ -2127,6 +2127,10 @@ static int unix_dgram_recvmsg(struct soc | |
654 | + EPOLLOUT | EPOLLWRNORM | | |
655 | + EPOLLWRBAND); | |
656 | + | |
657 | ++ if (ccs_socket_post_recvmsg_permission(sk, skb, flags)) { | |
658 | ++ err = -EAGAIN; /* Hope less harmful than -EPERM. */ | |
659 | ++ goto out_unlock; | |
660 | ++ } | |
661 | + if (msg->msg_name) | |
662 | + unix_copy_addr(msg, skb->sk); | |
663 | + | |
664 | +@@ -2177,6 +2181,7 @@ static int unix_dgram_recvmsg(struct soc | |
665 | + | |
666 | + out_free: | |
667 | + skb_free_datagram(sk, skb); | |
668 | ++out_unlock: | |
669 | + mutex_unlock(&u->iolock); | |
670 | + out: | |
671 | + return err; | |
672 | +--- linux-5.10-rc2.orig/security/Kconfig | |
673 | ++++ linux-5.10-rc2/security/Kconfig | |
674 | +@@ -291,5 +291,7 @@ config LSM | |
675 | + | |
676 | + source "security/Kconfig.hardening" | |
677 | + | |
678 | ++source "security/ccsecurity/Kconfig" | |
679 | ++ | |
680 | + endmenu | |
681 | + | |
682 | +--- linux-5.10-rc2.orig/security/Makefile | |
683 | ++++ linux-5.10-rc2/security/Makefile | |
684 | +@@ -36,3 +36,6 @@ obj-$(CONFIG_BPF_LSM) += bpf/ | |
685 | + # Object integrity file lists | |
686 | + subdir-$(CONFIG_INTEGRITY) += integrity | |
687 | + obj-$(CONFIG_INTEGRITY) += integrity/ | |
688 | ++ | |
689 | ++subdir-$(CONFIG_CCSECURITY) += ccsecurity | |
690 | ++obj-$(CONFIG_CCSECURITY) += ccsecurity/ | |
691 | +--- linux-5.10-rc2.orig/security/security.c | |
692 | ++++ linux-5.10-rc2/security/security.c | |
693 | +@@ -1585,7 +1585,9 @@ int security_task_alloc(struct task_stru | |
694 | + | |
695 | + if (rc) | |
696 | + return rc; | |
697 | +- rc = call_int_hook(task_alloc, 0, task, clone_flags); | |
698 | ++ rc = ccs_alloc_task_security(task); | |
699 | ++ if (likely(!rc)) | |
700 | ++ rc = call_int_hook(task_alloc, 0, task, clone_flags); | |
701 | + if (unlikely(rc)) | |
702 | + security_task_free(task); | |
703 | + return rc; | |
704 | +@@ -1594,6 +1596,7 @@ int security_task_alloc(struct task_stru | |
705 | + void security_task_free(struct task_struct *task) | |
706 | + { | |
707 | + call_void_hook(task_free, task); | |
708 | ++ ccs_free_task_security(task); | |
709 | + | |
710 | + kfree(task->security); | |
711 | + task->security = NULL; |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 5.4.72. | |
1 | +This is TOMOYO Linux patch for kernel 5.4.74. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.72.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.74.tar.xz | |
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.72.orig/fs/exec.c | |
32 | -+++ linux-5.4.72/fs/exec.c | |
31 | +--- linux-5.4.74.orig/fs/exec.c | |
32 | ++++ linux-5.4.74/fs/exec.c | |
33 | 33 | @@ -1717,7 +1717,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.72.orig/fs/open.c | |
43 | -+++ linux-5.4.72/fs/open.c | |
42 | +--- linux-5.4.74.orig/fs/open.c | |
43 | ++++ linux-5.4.74/fs/open.c | |
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.72.orig/fs/proc/version.c | |
54 | -+++ linux-5.4.72/fs/proc/version.c | |
53 | +--- linux-5.4.74.orig/fs/proc/version.c | |
54 | ++++ linux-5.4.74/fs/proc/version.c | |
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.72 2020/10/24\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 5.4.74 2020/11/03\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-5.4.72.orig/include/linux/sched.h | |
67 | -+++ linux-5.4.72/include/linux/sched.h | |
66 | +--- linux-5.4.74.orig/include/linux/sched.h | |
67 | ++++ linux-5.4.74/include/linux/sched.h | |
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.72.orig/include/linux/security.h | |
88 | -+++ linux-5.4.72/include/linux/security.h | |
87 | +--- linux-5.4.74.orig/include/linux/security.h | |
88 | ++++ linux-5.4.74/include/linux/security.h | |
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.72.orig/include/net/ip.h | |
319 | -+++ linux-5.4.72/include/net/ip.h | |
318 | +--- linux-5.4.74.orig/include/net/ip.h | |
319 | ++++ linux-5.4.74/include/net/ip.h | |
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.72.orig/init/init_task.c | |
339 | -+++ linux-5.4.72/init/init_task.c | |
338 | +--- linux-5.4.74.orig/init/init_task.c | |
339 | ++++ linux-5.4.74/init/init_task.c | |
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.72.orig/kernel/kexec.c | |
352 | -+++ linux-5.4.72/kernel/kexec.c | |
351 | +--- linux-5.4.74.orig/kernel/kexec.c | |
352 | ++++ linux-5.4.74/kernel/kexec.c | |
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.72.orig/kernel/module.c | |
372 | -+++ linux-5.4.72/kernel/module.c | |
371 | +--- linux-5.4.74.orig/kernel/module.c | |
372 | ++++ linux-5.4.74/kernel/module.c | |
373 | 373 | @@ -55,6 +55,7 @@ |
374 | 374 | #include <linux/audit.h> |
375 | 375 | #include <uapi/linux/module.h> |
@@ -378,7 +378,7 @@ | ||
378 | 378 | |
379 | 379 | #define CREATE_TRACE_POINTS |
380 | 380 | #include <trace/events/module.h> |
381 | -@@ -976,6 +977,8 @@ SYSCALL_DEFINE2(delete_module, const cha | |
381 | +@@ -977,6 +978,8 @@ SYSCALL_DEFINE2(delete_module, const cha | |
382 | 382 | |
383 | 383 | if (!capable(CAP_SYS_MODULE) || modules_disabled) |
384 | 384 | return -EPERM; |
@@ -387,7 +387,7 @@ | ||
387 | 387 | |
388 | 388 | if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0) |
389 | 389 | return -EFAULT; |
390 | -@@ -3694,6 +3697,8 @@ static int may_init_module(void) | |
390 | +@@ -3687,6 +3690,8 @@ static int may_init_module(void) | |
391 | 391 | { |
392 | 392 | if (!capable(CAP_SYS_MODULE) || modules_disabled) |
393 | 393 | return -EPERM; |
@@ -396,8 +396,8 @@ | ||
396 | 396 | |
397 | 397 | return 0; |
398 | 398 | } |
399 | ---- linux-5.4.72.orig/kernel/ptrace.c | |
400 | -+++ linux-5.4.72/kernel/ptrace.c | |
399 | +--- linux-5.4.74.orig/kernel/ptrace.c | |
400 | ++++ linux-5.4.74/kernel/ptrace.c | |
401 | 401 | @@ -1244,6 +1244,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.72.orig/kernel/reboot.c | |
426 | -+++ linux-5.4.72/kernel/reboot.c | |
425 | +--- linux-5.4.74.orig/kernel/reboot.c | |
426 | ++++ linux-5.4.74/kernel/reboot.c | |
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.72.orig/kernel/sched/core.c | |
445 | -+++ linux-5.4.72/kernel/sched/core.c | |
444 | +--- linux-5.4.74.orig/kernel/sched/core.c | |
445 | ++++ linux-5.4.74/kernel/sched/core.c | |
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.72.orig/kernel/signal.c | |
456 | -+++ linux-5.4.72/kernel/signal.c | |
455 | +--- linux-5.4.74.orig/kernel/signal.c | |
456 | ++++ linux-5.4.74/kernel/signal.c | |
457 | 457 | @@ -3643,6 +3643,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.72.orig/kernel/sys.c | |
525 | -+++ linux-5.4.72/kernel/sys.c | |
524 | +--- linux-5.4.74.orig/kernel/sys.c | |
525 | ++++ linux-5.4.74/kernel/sys.c | |
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.72.orig/kernel/time/timekeeping.c | |
556 | -+++ linux-5.4.72/kernel/time/timekeeping.c | |
555 | +--- linux-5.4.74.orig/kernel/time/timekeeping.c | |
556 | ++++ linux-5.4.74/kernel/time/timekeeping.c | |
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.72.orig/net/ipv4/raw.c | |
591 | -+++ linux-5.4.72/net/ipv4/raw.c | |
590 | +--- linux-5.4.74.orig/net/ipv4/raw.c | |
591 | ++++ linux-5.4.74/net/ipv4/raw.c | |
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.72.orig/net/ipv4/udp.c | |
604 | -+++ linux-5.4.72/net/ipv4/udp.c | |
603 | +--- linux-5.4.74.orig/net/ipv4/udp.c | |
604 | ++++ linux-5.4.74/net/ipv4/udp.c | |
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.72.orig/net/ipv6/raw.c | |
615 | -+++ linux-5.4.72/net/ipv6/raw.c | |
614 | +--- linux-5.4.74.orig/net/ipv6/raw.c | |
615 | ++++ linux-5.4.74/net/ipv6/raw.c | |
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.72.orig/net/ipv6/udp.c | |
628 | -+++ linux-5.4.72/net/ipv6/udp.c | |
627 | +--- linux-5.4.74.orig/net/ipv6/udp.c | |
628 | ++++ linux-5.4.74/net/ipv6/udp.c | |
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.72.orig/net/socket.c | |
639 | -+++ linux-5.4.72/net/socket.c | |
638 | +--- linux-5.4.74.orig/net/socket.c | |
639 | ++++ linux-5.4.74/net/socket.c | |
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.72.orig/net/unix/af_unix.c | |
652 | -+++ linux-5.4.72/net/unix/af_unix.c | |
651 | +--- linux-5.4.74.orig/net/unix/af_unix.c | |
652 | ++++ linux-5.4.74/net/unix/af_unix.c | |
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.72.orig/security/Kconfig | |
673 | -+++ linux-5.4.72/security/Kconfig | |
672 | +--- linux-5.4.74.orig/security/Kconfig | |
673 | ++++ linux-5.4.74/security/Kconfig | |
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.72.orig/security/Makefile | |
683 | -+++ linux-5.4.72/security/Makefile | |
682 | +--- linux-5.4.74.orig/security/Makefile | |
683 | ++++ linux-5.4.74/security/Makefile | |
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.72.orig/security/security.c | |
692 | -+++ linux-5.4.72/security/security.c | |
691 | +--- linux-5.4.74.orig/security/security.c | |
692 | ++++ linux-5.4.74/security/security.c | |
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.8.16. | |
1 | +This is TOMOYO Linux patch for kernel 5.8.18. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.16.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.18.tar.xz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 - |
6 | 6 | fs/open.c | 2 + |
@@ -28,9 +28,9 @@ | ||
28 | 28 | security/security.c | 5 ++- |
29 | 29 | 24 files changed, 160 insertions(+), 30 deletions(-) |
30 | 30 | |
31 | ---- linux-5.8.16.orig/fs/exec.c | |
32 | -+++ linux-5.8.16/fs/exec.c | |
33 | -@@ -1923,7 +1923,7 @@ static int __do_execve_file(int fd, stru | |
31 | +--- linux-5.8.18.orig/fs/exec.c | |
32 | ++++ linux-5.8.18/fs/exec.c | |
33 | +@@ -1929,7 +1929,7 @@ static int __do_execve_file(int fd, stru | |
34 | 34 | if (retval < 0) |
35 | 35 | goto out; |
36 | 36 |
@@ -39,8 +39,8 @@ | ||
39 | 39 | if (retval < 0) |
40 | 40 | goto out; |
41 | 41 | |
42 | ---- linux-5.8.16.orig/fs/open.c | |
43 | -+++ linux-5.8.16/fs/open.c | |
42 | +--- linux-5.8.18.orig/fs/open.c | |
43 | ++++ linux-5.8.18/fs/open.c | |
44 | 44 | @@ -1316,6 +1316,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.8.16.orig/fs/proc/version.c | |
54 | -+++ linux-5.8.16/fs/proc/version.c | |
53 | +--- linux-5.8.18.orig/fs/proc/version.c | |
54 | ++++ linux-5.8.18/fs/proc/version.c | |
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.8.16 2020/10/24\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 5.8.18 2020/11/03\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-5.8.16.orig/include/linux/sched.h | |
67 | -+++ linux-5.8.16/include/linux/sched.h | |
66 | +--- linux-5.8.18.orig/include/linux/sched.h | |
67 | ++++ linux-5.8.18/include/linux/sched.h | |
68 | 68 | @@ -39,6 +39,7 @@ struct backing_dev_info; |
69 | 69 | struct bio_list; |
70 | 70 | struct blk_plug; |
@@ -73,7 +73,7 @@ | ||
73 | 73 | struct cfs_rq; |
74 | 74 | struct fs_struct; |
75 | 75 | struct futex_pi_state; |
76 | -@@ -1295,6 +1296,10 @@ struct task_struct { | |
76 | +@@ -1300,6 +1301,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 | #ifdef CONFIG_GCC_PLUGIN_STACKLEAK |
86 | 86 | unsigned long lowest_stack; |
87 | ---- linux-5.8.16.orig/include/linux/security.h | |
88 | -+++ linux-5.8.16/include/linux/security.h | |
87 | +--- linux-5.8.18.orig/include/linux/security.h | |
88 | ++++ linux-5.8.18/include/linux/security.h | |
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.8.16.orig/include/net/ip.h | |
319 | -+++ linux-5.8.16/include/net/ip.h | |
318 | +--- linux-5.8.18.orig/include/net/ip.h | |
319 | ++++ linux-5.8.18/include/net/ip.h | |
320 | 320 | @@ -341,6 +341,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,9 +335,9 @@ | ||
335 | 335 | return false; |
336 | 336 | } |
337 | 337 | |
338 | ---- linux-5.8.16.orig/init/init_task.c | |
339 | -+++ linux-5.8.16/init/init_task.c | |
340 | -@@ -204,6 +204,10 @@ struct task_struct init_task | |
338 | +--- linux-5.8.18.orig/init/init_task.c | |
339 | ++++ linux-5.8.18/init/init_task.c | |
340 | +@@ -207,6 +207,10 @@ struct task_struct init_task | |
341 | 341 | #ifdef CONFIG_SECURITY |
342 | 342 | .security = NULL, |
343 | 343 | #endif |
@@ -348,8 +348,8 @@ | ||
348 | 348 | }; |
349 | 349 | EXPORT_SYMBOL(init_task); |
350 | 350 | |
351 | ---- linux-5.8.16.orig/kernel/kexec.c | |
352 | -+++ linux-5.8.16/kernel/kexec.c | |
351 | +--- linux-5.8.18.orig/kernel/kexec.c | |
352 | ++++ linux-5.8.18/kernel/kexec.c | |
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.8.16.orig/kernel/module.c | |
372 | -+++ linux-5.8.16/kernel/module.c | |
371 | +--- linux-5.8.18.orig/kernel/module.c | |
372 | ++++ linux-5.8.18/kernel/module.c | |
373 | 373 | @@ -58,6 +58,7 @@ |
374 | 374 | #include <linux/audit.h> |
375 | 375 | #include <uapi/linux/module.h> |
@@ -378,7 +378,7 @@ | ||
378 | 378 | |
379 | 379 | #define CREATE_TRACE_POINTS |
380 | 380 | #include <trace/events/module.h> |
381 | -@@ -979,6 +980,8 @@ SYSCALL_DEFINE2(delete_module, const cha | |
381 | +@@ -980,6 +981,8 @@ SYSCALL_DEFINE2(delete_module, const cha | |
382 | 382 | |
383 | 383 | if (!capable(CAP_SYS_MODULE) || modules_disabled) |
384 | 384 | return -EPERM; |
@@ -387,7 +387,7 @@ | ||
387 | 387 | |
388 | 388 | if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0) |
389 | 389 | return -EFAULT; |
390 | -@@ -3682,6 +3685,8 @@ static int may_init_module(void) | |
390 | +@@ -3675,6 +3678,8 @@ static int may_init_module(void) | |
391 | 391 | { |
392 | 392 | if (!capable(CAP_SYS_MODULE) || modules_disabled) |
393 | 393 | return -EPERM; |
@@ -396,8 +396,8 @@ | ||
396 | 396 | |
397 | 397 | return 0; |
398 | 398 | } |
399 | ---- linux-5.8.16.orig/kernel/ptrace.c | |
400 | -+++ linux-5.8.16/kernel/ptrace.c | |
399 | +--- linux-5.8.18.orig/kernel/ptrace.c | |
400 | ++++ linux-5.8.18/kernel/ptrace.c | |
401 | 401 | @@ -1244,6 +1244,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.8.16.orig/kernel/reboot.c | |
426 | -+++ linux-5.8.16/kernel/reboot.c | |
425 | +--- linux-5.8.18.orig/kernel/reboot.c | |
426 | ++++ linux-5.8.18/kernel/reboot.c | |
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.8.16.orig/kernel/sched/core.c | |
445 | -+++ linux-5.8.16/kernel/sched/core.c | |
444 | +--- linux-5.8.18.orig/kernel/sched/core.c | |
445 | ++++ linux-5.8.18/kernel/sched/core.c | |
446 | 446 | @@ -4810,6 +4810,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.8.16.orig/kernel/signal.c | |
456 | -+++ linux-5.8.16/kernel/signal.c | |
455 | +--- linux-5.8.18.orig/kernel/signal.c | |
456 | ++++ linux-5.8.18/kernel/signal.c | |
457 | 457 | @@ -3657,6 +3657,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.8.16.orig/kernel/sys.c | |
525 | -+++ linux-5.8.16/kernel/sys.c | |
524 | +--- linux-5.8.18.orig/kernel/sys.c | |
525 | ++++ linux-5.8.18/kernel/sys.c | |
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.8.16.orig/kernel/time/timekeeping.c | |
556 | -+++ linux-5.8.16/kernel/time/timekeeping.c | |
555 | +--- linux-5.8.18.orig/kernel/time/timekeeping.c | |
556 | ++++ linux-5.8.18/kernel/time/timekeeping.c | |
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.8.16.orig/net/ipv4/raw.c | |
591 | -+++ linux-5.8.16/net/ipv4/raw.c | |
590 | +--- linux-5.8.18.orig/net/ipv4/raw.c | |
591 | ++++ linux-5.8.18/net/ipv4/raw.c | |
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.8.16.orig/net/ipv4/udp.c | |
604 | -+++ linux-5.8.16/net/ipv4/udp.c | |
603 | +--- linux-5.8.18.orig/net/ipv4/udp.c | |
604 | ++++ linux-5.8.18/net/ipv4/udp.c | |
605 | 605 | @@ -1750,6 +1750,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.8.16.orig/net/ipv6/raw.c | |
615 | -+++ linux-5.8.16/net/ipv6/raw.c | |
614 | +--- linux-5.8.18.orig/net/ipv6/raw.c | |
615 | ++++ linux-5.8.18/net/ipv6/raw.c | |
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.8.16.orig/net/ipv6/udp.c | |
628 | -+++ linux-5.8.16/net/ipv6/udp.c | |
627 | +--- linux-5.8.18.orig/net/ipv6/udp.c | |
628 | ++++ linux-5.8.18/net/ipv6/udp.c | |
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.8.16.orig/net/socket.c | |
639 | -+++ linux-5.8.16/net/socket.c | |
638 | +--- linux-5.8.18.orig/net/socket.c | |
639 | ++++ linux-5.8.18/net/socket.c | |
640 | 640 | @@ -1756,6 +1756,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.8.16.orig/net/unix/af_unix.c | |
652 | -+++ linux-5.8.16/net/unix/af_unix.c | |
651 | +--- linux-5.8.18.orig/net/unix/af_unix.c | |
652 | ++++ linux-5.8.18/net/unix/af_unix.c | |
653 | 653 | @@ -2136,6 +2136,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.8.16.orig/security/Kconfig | |
673 | -+++ linux-5.8.16/security/Kconfig | |
672 | +--- linux-5.8.18.orig/security/Kconfig | |
673 | ++++ linux-5.8.18/security/Kconfig | |
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.8.16.orig/security/Makefile | |
683 | -+++ linux-5.8.16/security/Makefile | |
682 | +--- linux-5.8.18.orig/security/Makefile | |
683 | ++++ linux-5.8.18/security/Makefile | |
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.8.16.orig/security/security.c | |
692 | -+++ linux-5.8.16/security/security.c | |
691 | +--- linux-5.8.18.orig/security/security.c | |
692 | ++++ linux-5.8.18/security/security.c | |
693 | 693 | @@ -1584,7 +1584,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.1. | |
1 | +This is TOMOYO Linux patch for kernel 5.9.3. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.1.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.3.tar.xz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 - |
6 | 6 | fs/open.c | 2 + |
@@ -28,9 +28,9 @@ | ||
28 | 28 | security/security.c | 5 ++- |
29 | 29 | 24 files changed, 160 insertions(+), 30 deletions(-) |
30 | 30 | |
31 | ---- linux-5.9.1.orig/fs/exec.c | |
32 | -+++ linux-5.9.1/fs/exec.c | |
33 | -@@ -1928,7 +1928,7 @@ static int bprm_execve(struct linux_binp | |
31 | +--- linux-5.9.3.orig/fs/exec.c | |
32 | ++++ linux-5.9.3/fs/exec.c | |
33 | +@@ -1934,7 +1934,7 @@ static int bprm_execve(struct linux_binp | |
34 | 34 | if (retval) |
35 | 35 | goto out; |
36 | 36 |
@@ -39,8 +39,8 @@ | ||
39 | 39 | if (retval < 0) |
40 | 40 | goto out; |
41 | 41 | |
42 | ---- linux-5.9.1.orig/fs/open.c | |
43 | -+++ linux-5.9.1/fs/open.c | |
42 | +--- linux-5.9.3.orig/fs/open.c | |
43 | ++++ linux-5.9.3/fs/open.c | |
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.1.orig/fs/proc/version.c | |
54 | -+++ linux-5.9.1/fs/proc/version.c | |
53 | +--- linux-5.9.3.orig/fs/proc/version.c | |
54 | ++++ linux-5.9.3/fs/proc/version.c | |
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.1 2020/10/24\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 5.9.3 2020/11/03\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-5.9.1.orig/include/linux/sched.h | |
67 | -+++ linux-5.9.1/include/linux/sched.h | |
66 | +--- linux-5.9.3.orig/include/linux/sched.h | |
67 | ++++ linux-5.9.3/include/linux/sched.h | |
68 | 68 | @@ -41,6 +41,7 @@ struct backing_dev_info; |
69 | 69 | struct bio_list; |
70 | 70 | struct blk_plug; |
@@ -73,7 +73,7 @@ | ||
73 | 73 | struct cfs_rq; |
74 | 74 | struct fs_struct; |
75 | 75 | struct futex_pi_state; |
76 | -@@ -1301,6 +1302,10 @@ struct task_struct { | |
76 | +@@ -1306,6 +1307,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 | #ifdef CONFIG_GCC_PLUGIN_STACKLEAK |
86 | 86 | unsigned long lowest_stack; |
87 | ---- linux-5.9.1.orig/include/linux/security.h | |
88 | -+++ linux-5.9.1/include/linux/security.h | |
87 | +--- linux-5.9.3.orig/include/linux/security.h | |
88 | ++++ linux-5.9.3/include/linux/security.h | |
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.1.orig/include/net/ip.h | |
319 | -+++ linux-5.9.1/include/net/ip.h | |
318 | +--- linux-5.9.3.orig/include/net/ip.h | |
319 | ++++ linux-5.9.3/include/net/ip.h | |
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,9 +335,9 @@ | ||
335 | 335 | return false; |
336 | 336 | } |
337 | 337 | |
338 | ---- linux-5.9.1.orig/init/init_task.c | |
339 | -+++ linux-5.9.1/init/init_task.c | |
340 | -@@ -209,6 +209,10 @@ struct task_struct init_task | |
338 | +--- linux-5.9.3.orig/init/init_task.c | |
339 | ++++ linux-5.9.3/init/init_task.c | |
340 | +@@ -212,6 +212,10 @@ struct task_struct init_task | |
341 | 341 | #ifdef CONFIG_SECCOMP |
342 | 342 | .seccomp = { .filter_count = ATOMIC_INIT(0) }, |
343 | 343 | #endif |
@@ -348,8 +348,8 @@ | ||
348 | 348 | }; |
349 | 349 | EXPORT_SYMBOL(init_task); |
350 | 350 | |
351 | ---- linux-5.9.1.orig/kernel/kexec.c | |
352 | -+++ linux-5.9.1/kernel/kexec.c | |
351 | +--- linux-5.9.3.orig/kernel/kexec.c | |
352 | ++++ linux-5.9.3/kernel/kexec.c | |
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.1.orig/kernel/module.c | |
372 | -+++ linux-5.9.1/kernel/module.c | |
371 | +--- linux-5.9.3.orig/kernel/module.c | |
372 | ++++ linux-5.9.3/kernel/module.c | |
373 | 373 | @@ -58,6 +58,7 @@ |
374 | 374 | #include <linux/audit.h> |
375 | 375 | #include <uapi/linux/module.h> |
@@ -378,7 +378,7 @@ | ||
378 | 378 | |
379 | 379 | #define CREATE_TRACE_POINTS |
380 | 380 | #include <trace/events/module.h> |
381 | -@@ -981,6 +982,8 @@ SYSCALL_DEFINE2(delete_module, const cha | |
381 | +@@ -982,6 +983,8 @@ SYSCALL_DEFINE2(delete_module, const cha | |
382 | 382 | |
383 | 383 | if (!capable(CAP_SYS_MODULE) || modules_disabled) |
384 | 384 | return -EPERM; |
@@ -387,7 +387,7 @@ | ||
387 | 387 | |
388 | 388 | if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0) |
389 | 389 | return -EFAULT; |
390 | -@@ -3710,6 +3713,8 @@ static int may_init_module(void) | |
390 | +@@ -3703,6 +3706,8 @@ static int may_init_module(void) | |
391 | 391 | { |
392 | 392 | if (!capable(CAP_SYS_MODULE) || modules_disabled) |
393 | 393 | return -EPERM; |
@@ -396,8 +396,8 @@ | ||
396 | 396 | |
397 | 397 | return 0; |
398 | 398 | } |
399 | ---- linux-5.9.1.orig/kernel/ptrace.c | |
400 | -+++ linux-5.9.1/kernel/ptrace.c | |
399 | +--- linux-5.9.3.orig/kernel/ptrace.c | |
400 | ++++ linux-5.9.3/kernel/ptrace.c | |
401 | 401 | @@ -1244,6 +1244,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.1.orig/kernel/reboot.c | |
426 | -+++ linux-5.9.1/kernel/reboot.c | |
425 | +--- linux-5.9.3.orig/kernel/reboot.c | |
426 | ++++ linux-5.9.3/kernel/reboot.c | |
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.1.orig/kernel/sched/core.c | |
445 | -+++ linux-5.9.1/kernel/sched/core.c | |
444 | +--- linux-5.9.3.orig/kernel/sched/core.c | |
445 | ++++ linux-5.9.3/kernel/sched/core.c | |
446 | 446 | @@ -5030,6 +5030,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.1.orig/kernel/signal.c | |
456 | -+++ linux-5.9.1/kernel/signal.c | |
455 | +--- linux-5.9.3.orig/kernel/signal.c | |
456 | ++++ linux-5.9.3/kernel/signal.c | |
457 | 457 | @@ -3657,6 +3657,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.1.orig/kernel/sys.c | |
525 | -+++ linux-5.9.1/kernel/sys.c | |
524 | +--- linux-5.9.3.orig/kernel/sys.c | |
525 | ++++ linux-5.9.3/kernel/sys.c | |
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.1.orig/kernel/time/timekeeping.c | |
556 | -+++ linux-5.9.1/kernel/time/timekeeping.c | |
555 | +--- linux-5.9.3.orig/kernel/time/timekeeping.c | |
556 | ++++ linux-5.9.3/kernel/time/timekeeping.c | |
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.1.orig/net/ipv4/raw.c | |
591 | -+++ linux-5.9.1/net/ipv4/raw.c | |
590 | +--- linux-5.9.3.orig/net/ipv4/raw.c | |
591 | ++++ linux-5.9.3/net/ipv4/raw.c | |
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.1.orig/net/ipv4/udp.c | |
604 | -+++ linux-5.9.1/net/ipv4/udp.c | |
603 | +--- linux-5.9.3.orig/net/ipv4/udp.c | |
604 | ++++ linux-5.9.3/net/ipv4/udp.c | |
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.1.orig/net/ipv6/raw.c | |
615 | -+++ linux-5.9.1/net/ipv6/raw.c | |
614 | +--- linux-5.9.3.orig/net/ipv6/raw.c | |
615 | ++++ linux-5.9.3/net/ipv6/raw.c | |
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.1.orig/net/ipv6/udp.c | |
628 | -+++ linux-5.9.1/net/ipv6/udp.c | |
627 | +--- linux-5.9.3.orig/net/ipv6/udp.c | |
628 | ++++ linux-5.9.3/net/ipv6/udp.c | |
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.1.orig/net/socket.c | |
639 | -+++ linux-5.9.1/net/socket.c | |
638 | +--- linux-5.9.3.orig/net/socket.c | |
639 | ++++ linux-5.9.3/net/socket.c | |
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.1.orig/net/unix/af_unix.c | |
652 | -+++ linux-5.9.1/net/unix/af_unix.c | |
651 | +--- linux-5.9.3.orig/net/unix/af_unix.c | |
652 | ++++ linux-5.9.3/net/unix/af_unix.c | |
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.1.orig/security/Kconfig | |
673 | -+++ linux-5.9.1/security/Kconfig | |
672 | +--- linux-5.9.3.orig/security/Kconfig | |
673 | ++++ linux-5.9.3/security/Kconfig | |
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.1.orig/security/Makefile | |
683 | -+++ linux-5.9.1/security/Makefile | |
682 | +--- linux-5.9.3.orig/security/Makefile | |
683 | ++++ linux-5.9.3/security/Makefile | |
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.1.orig/security/security.c | |
692 | -+++ linux-5.9.1/security/security.c | |
691 | +--- linux-5.9.3.orig/security/security.c | |
692 | ++++ linux-5.9.3/security/security.c | |
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-3.10.0-1127.19.1.el7.src.rpm ] | |
13 | +if [ ! -r kernel-3.10.0-1160.2.2.el7.src.rpm ] | |
14 | 14 | then |
15 | - wget http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-1127.19.1.el7.src.rpm || die "Can't download source package." | |
15 | + wget http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-1160.2.2.el7.src.rpm || die "Can't download source package." | |
16 | 16 | fi |
17 | -LANG=C rpm --checksig kernel-3.10.0-1127.19.1.el7.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature." | |
18 | -rpm -ivh kernel-3.10.0-1127.19.1.el7.src.rpm || die "Can't install source package." | |
17 | +LANG=C rpm --checksig kernel-3.10.0-1160.2.2.el7.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature." | |
18 | +rpm -ivh kernel-3.10.0-1160.2.2.el7.src.rpm || die "Can't install source package." | |
19 | 19 | |
20 | 20 | cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ." |
21 | 21 | if [ ! -r caitsith-patch-0.2-20200922.tar.gz ] |
@@ -35,9 +35,9 @@ | ||
35 | 35 | -# % define buildid .local |
36 | 36 | +%define buildid _caitsith_0.2.7 |
37 | 37 | |
38 | - # For a kernel released for public testing, released_kernel should be 1. | |
39 | - # For internal testing builds during development, it should be 0. | |
40 | -@@ -325,7 +325,7 @@ | |
38 | + # If there's no unversioned python, select version explicitly, | |
39 | + # so it's possible to at least do rh-srpm. | |
40 | +@@ -331,7 +331,7 @@ | |
41 | 41 | AutoProv: yes\ |
42 | 42 | %{nil} |
43 | 43 |
@@ -46,7 +46,7 @@ | ||
46 | 46 | Group: System Environment/Kernel |
47 | 47 | License: GPLv2 |
48 | 48 | URL: http://www.kernel.org/ |
49 | -@@ -684,13 +684,13 @@ | |
49 | +@@ -690,13 +690,13 @@ | |
50 | 50 | %package %{?1:%{1}-}devel\ |
51 | 51 | Summary: Development package for building kernel modules to match the %{?2:%{2} }kernel\ |
52 | 52 | Group: System Environment/Kernel\ |
@@ -64,7 +64,7 @@ | ||
64 | 64 | This package provides kernel headers and makefiles sufficient to build modules\ |
65 | 65 | against the %{?2:%{2} }kernel package.\ |
66 | 66 | %{nil} |
67 | -@@ -802,6 +802,10 @@ | |
67 | +@@ -808,6 +808,10 @@ | |
68 | 68 | ApplyOptionalPatch debrand-rh_taint.patch |
69 | 69 | ApplyOptionalPatch debrand-rh-i686-cpu.patch |
70 | 70 |
@@ -75,7 +75,7 @@ | ||
75 | 75 | # Any further pre-build tree manipulations happen here. |
76 | 76 | |
77 | 77 | chmod +x scripts/checkpatch.pl |
78 | -@@ -840,6 +844,17 @@ | |
78 | +@@ -846,6 +850,17 @@ | |
79 | 79 | for i in *.config |
80 | 80 | do |
81 | 81 | mv $i .config |
@@ -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.19.1.el8_2.src.rpm ] | |
13 | +if [ ! -r kernel-4.18.0-193.28.1.el8_2.src.rpm ] | |
14 | 14 | then |
15 | - wget http://vault.centos.org/8.2.2004/BaseOS/Source/SPackages/kernel-4.18.0-193.19.1.el8_2.src.rpm || die "Can't download source package." | |
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." | |
16 | 16 | fi |
17 | -LANG=C rpm --checksig kernel-4.18.0-193.19.1.el8_2.src.rpm | grep -F ': digests signatures OK' || die "Can't verify signature." | |
18 | -rpm -ivh kernel-4.18.0-193.19.1.el8_2.src.rpm || die "Can't install source package." | |
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." | |
19 | 19 | |
20 | 20 | cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ." |
21 | 21 | if [ ! -r caitsith-patch-0.2-20200922.tar.gz ] |
@@ -36,8 +36,8 @@ | ||
36 | 36 | +%define buildid _caitsith_0.2.7 |
37 | 37 | |
38 | 38 | %define rpmversion 4.18.0 |
39 | - %define pkgrelease 193.19.1.el8_2 | |
40 | -@@ -1071,6 +1071,10 @@ | |
39 | + %define pkgrelease 193.28.1.el8_2 | |
40 | +@@ -1050,6 +1050,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 | -@@ -1205,6 +1209,18 @@ | |
51 | +@@ -1184,6 +1188,18 @@ | |
52 | 52 | cp %{SOURCE9} certs/. |
53 | 53 | %endif |
54 | 54 |