(empty log message)
@@ -12,6 +12,9 @@ | ||
12 | 12 | #include <linux/nsproxy.h> |
13 | 13 | #include <linux/mnt_namespace.h> |
14 | 14 | #endif |
15 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0) | |
16 | +#include <linux/proc_fs.h> | |
17 | +#endif | |
15 | 18 | |
16 | 19 | /***** SECTION1: Constants definition *****/ |
17 | 20 |
@@ -326,7 +329,16 @@ | ||
326 | 329 | char *ep; |
327 | 330 | const pid_t pid = (pid_t) simple_strtoul(pos + 1, &ep, 10); |
328 | 331 | |
332 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0) | |
329 | 333 | if (*ep == '/' && pid && pid == |
334 | + task_tgid_nr_ns(current, proc_pid_ns(sb)) { | |
335 | + pos = ep - 5; | |
336 | + if (pos < buffer) | |
337 | + goto out; | |
338 | + memmove(pos, "/self", 5); | |
339 | + } | |
340 | +#else | |
341 | + if (*ep == '/' && pid && pid == | |
330 | 342 | task_tgid_nr_ns(current, sb->s_fs_info)) { |
331 | 343 | pos = ep - 5; |
332 | 344 | if (pos < buffer) |
@@ -333,6 +345,7 @@ | ||
333 | 345 | goto out; |
334 | 346 | memmove(pos, "/self", 5); |
335 | 347 | } |
348 | +#endif | |
336 | 349 | goto prepend_filesystem_name; |
337 | 350 | } |
338 | 351 | /* Use filesystem name for unnamed devices. */ |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 4.14.198. | |
1 | +This is TOMOYO Linux patch for kernel 4.14.202. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.198.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.202.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.198.orig/fs/exec.c | |
32 | -+++ linux-4.14.198/fs/exec.c | |
31 | +--- linux-4.14.202.orig/fs/exec.c | |
32 | ++++ linux-4.14.202/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.198.orig/fs/open.c | |
43 | -+++ linux-4.14.198/fs/open.c | |
42 | +--- linux-4.14.202.orig/fs/open.c | |
43 | ++++ linux-4.14.202/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.198.orig/fs/proc/version.c | |
54 | -+++ linux-4.14.198/fs/proc/version.c | |
53 | +--- linux-4.14.202.orig/fs/proc/version.c | |
54 | ++++ linux-4.14.202/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.198 2020/09/15\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.14.202 2020/10/24\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-4.14.198.orig/include/linux/init_task.h | |
67 | -+++ linux-4.14.198/include/linux/init_task.h | |
66 | +--- linux-4.14.202.orig/include/linux/init_task.h | |
67 | ++++ linux-4.14.202/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.198.orig/include/linux/sched.h | |
92 | -+++ linux-4.14.198/include/linux/sched.h | |
91 | +--- linux-4.14.202.orig/include/linux/sched.h | |
92 | ++++ linux-4.14.202/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.198.orig/include/linux/security.h | |
113 | -+++ linux-4.14.198/include/linux/security.h | |
112 | +--- linux-4.14.202.orig/include/linux/security.h | |
113 | ++++ linux-4.14.202/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.198.orig/include/net/ip.h | |
335 | -+++ linux-4.14.198/include/net/ip.h | |
334 | +--- linux-4.14.202.orig/include/net/ip.h | |
335 | ++++ linux-4.14.202/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.198.orig/kernel/kexec.c | |
355 | -+++ linux-4.14.198/kernel/kexec.c | |
354 | +--- linux-4.14.202.orig/kernel/kexec.c | |
355 | ++++ linux-4.14.202/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.198.orig/kernel/module.c | |
375 | -+++ linux-4.14.198/kernel/module.c | |
374 | +--- linux-4.14.202.orig/kernel/module.c | |
375 | ++++ linux-4.14.202/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.198.orig/kernel/ptrace.c | |
403 | -+++ linux-4.14.198/kernel/ptrace.c | |
402 | +--- linux-4.14.202.orig/kernel/ptrace.c | |
403 | ++++ linux-4.14.202/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.198.orig/kernel/reboot.c | |
429 | -+++ linux-4.14.198/kernel/reboot.c | |
428 | +--- linux-4.14.202.orig/kernel/reboot.c | |
429 | ++++ linux-4.14.202/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.198.orig/kernel/sched/core.c | |
448 | -+++ linux-4.14.198/kernel/sched/core.c | |
447 | +--- linux-4.14.202.orig/kernel/sched/core.c | |
448 | ++++ linux-4.14.202/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.198.orig/kernel/signal.c | |
459 | -+++ linux-4.14.198/kernel/signal.c | |
458 | +--- linux-4.14.202.orig/kernel/signal.c | |
459 | ++++ linux-4.14.202/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.198.orig/kernel/sys.c | |
506 | -+++ linux-4.14.198/kernel/sys.c | |
505 | +--- linux-4.14.202.orig/kernel/sys.c | |
506 | ++++ linux-4.14.202/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) |
@@ -515,7 +515,7 @@ | ||
515 | 515 | |
516 | 516 | /* normalize: avoid signed division (rounding problems) */ |
517 | 517 | error = -ESRCH; |
518 | -@@ -1250,6 +1254,8 @@ SYSCALL_DEFINE2(sethostname, char __user | |
518 | +@@ -1252,6 +1256,8 @@ SYSCALL_DEFINE2(sethostname, char __user | |
519 | 519 | |
520 | 520 | if (len < 0 || len > __NEW_UTS_LEN) |
521 | 521 | return -EINVAL; |
@@ -524,7 +524,7 @@ | ||
524 | 524 | errno = -EFAULT; |
525 | 525 | if (!copy_from_user(tmp, name, len)) { |
526 | 526 | struct new_utsname *u; |
527 | -@@ -1302,6 +1308,8 @@ SYSCALL_DEFINE2(setdomainname, char __us | |
527 | +@@ -1304,6 +1310,8 @@ SYSCALL_DEFINE2(setdomainname, char __us | |
528 | 528 | return -EPERM; |
529 | 529 | if (len < 0 || len > __NEW_UTS_LEN) |
530 | 530 | return -EINVAL; |
@@ -533,8 +533,8 @@ | ||
533 | 533 | |
534 | 534 | errno = -EFAULT; |
535 | 535 | if (!copy_from_user(tmp, name, len)) { |
536 | ---- linux-4.14.198.orig/kernel/time/ntp.c | |
537 | -+++ linux-4.14.198/kernel/time/ntp.c | |
536 | +--- linux-4.14.202.orig/kernel/time/ntp.c | |
537 | ++++ linux-4.14.202/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.198.orig/net/ipv4/raw.c | |
572 | -+++ linux-4.14.198/net/ipv4/raw.c | |
571 | +--- linux-4.14.202.orig/net/ipv4/raw.c | |
572 | ++++ linux-4.14.202/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.198.orig/net/ipv4/udp.c | |
585 | -+++ linux-4.14.198/net/ipv4/udp.c | |
584 | +--- linux-4.14.202.orig/net/ipv4/udp.c | |
585 | ++++ linux-4.14.202/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.198.orig/net/ipv6/raw.c | |
596 | -+++ linux-4.14.198/net/ipv6/raw.c | |
595 | +--- linux-4.14.202.orig/net/ipv6/raw.c | |
596 | ++++ linux-4.14.202/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.198.orig/net/ipv6/udp.c | |
609 | -+++ linux-4.14.198/net/ipv6/udp.c | |
608 | +--- linux-4.14.202.orig/net/ipv6/udp.c | |
609 | ++++ linux-4.14.202/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.198.orig/net/socket.c | |
620 | -+++ linux-4.14.198/net/socket.c | |
619 | +--- linux-4.14.202.orig/net/socket.c | |
620 | ++++ linux-4.14.202/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,9 +629,9 @@ | ||
629 | 629 | if (upeer_sockaddr) { |
630 | 630 | if (newsock->ops->getname(newsock, (struct sockaddr *)&address, |
631 | 631 | &len, 2) < 0) { |
632 | ---- linux-4.14.198.orig/net/unix/af_unix.c | |
633 | -+++ linux-4.14.198/net/unix/af_unix.c | |
634 | -@@ -2155,6 +2155,10 @@ static int unix_dgram_recvmsg(struct soc | |
632 | +--- linux-4.14.202.orig/net/unix/af_unix.c | |
633 | ++++ linux-4.14.202/net/unix/af_unix.c | |
634 | +@@ -2162,6 +2162,10 @@ static int unix_dgram_recvmsg(struct soc | |
635 | 635 | POLLOUT | POLLWRNORM | |
636 | 636 | POLLWRBAND); |
637 | 637 |
@@ -642,7 +642,7 @@ | ||
642 | 642 | if (msg->msg_name) |
643 | 643 | unix_copy_addr(msg, skb->sk); |
644 | 644 | |
645 | -@@ -2205,6 +2209,7 @@ static int unix_dgram_recvmsg(struct soc | |
645 | +@@ -2212,6 +2216,7 @@ static int unix_dgram_recvmsg(struct soc | |
646 | 646 | |
647 | 647 | out_free: |
648 | 648 | skb_free_datagram(sk, skb); |
@@ -650,8 +650,8 @@ | ||
650 | 650 | mutex_unlock(&u->iolock); |
651 | 651 | out: |
652 | 652 | return err; |
653 | ---- linux-4.14.198.orig/security/Kconfig | |
654 | -+++ linux-4.14.198/security/Kconfig | |
653 | +--- linux-4.14.202.orig/security/Kconfig | |
654 | ++++ linux-4.14.202/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.198.orig/security/Makefile | |
664 | -+++ linux-4.14.198/security/Makefile | |
663 | +--- linux-4.14.202.orig/security/Makefile | |
664 | ++++ linux-4.14.202/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.198.orig/security/security.c | |
673 | -+++ linux-4.14.198/security/security.c | |
672 | +--- linux-4.14.202.orig/security/security.c | |
673 | ++++ linux-4.14.202/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 | -This is TOMOYO Linux patch for kernel 4.19.146. | |
1 | +This is TOMOYO Linux patch for kernel 4.19.152. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.146.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.152.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.146.orig/fs/exec.c | |
32 | -+++ linux-4.19.146/fs/exec.c | |
31 | +--- linux-4.19.152.orig/fs/exec.c | |
32 | ++++ linux-4.19.152/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.146.orig/fs/open.c | |
43 | -+++ linux-4.19.146/fs/open.c | |
42 | +--- linux-4.19.152.orig/fs/open.c | |
43 | ++++ linux-4.19.152/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.146.orig/fs/proc/version.c | |
54 | -+++ linux-4.19.146/fs/proc/version.c | |
53 | +--- linux-4.19.152.orig/fs/proc/version.c | |
54 | ++++ linux-4.19.152/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.146 2020/09/18\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.19.152 2020/10/24\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-4.19.146.orig/include/linux/sched.h | |
67 | -+++ linux-4.19.146/include/linux/sched.h | |
66 | +--- linux-4.19.152.orig/include/linux/sched.h | |
67 | ++++ linux-4.19.152/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.146.orig/include/linux/security.h | |
88 | -+++ linux-4.19.146/include/linux/security.h | |
87 | +--- linux-4.19.152.orig/include/linux/security.h | |
88 | ++++ linux-4.19.152/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.146.orig/include/net/ip.h | |
310 | -+++ linux-4.19.146/include/net/ip.h | |
309 | +--- linux-4.19.152.orig/include/net/ip.h | |
310 | ++++ linux-4.19.152/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.146.orig/init/init_task.c | |
330 | -+++ linux-4.19.146/init/init_task.c | |
329 | +--- linux-4.19.152.orig/init/init_task.c | |
330 | ++++ linux-4.19.152/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.146.orig/kernel/kexec.c | |
343 | -+++ linux-4.19.146/kernel/kexec.c | |
342 | +--- linux-4.19.152.orig/kernel/kexec.c | |
343 | ++++ linux-4.19.152/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.146.orig/kernel/module.c | |
363 | -+++ linux-4.19.146/kernel/module.c | |
362 | +--- linux-4.19.152.orig/kernel/module.c | |
363 | ++++ linux-4.19.152/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.146.orig/kernel/ptrace.c | |
391 | -+++ linux-4.19.146/kernel/ptrace.c | |
390 | +--- linux-4.19.152.orig/kernel/ptrace.c | |
391 | ++++ linux-4.19.152/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.146.orig/kernel/reboot.c | |
417 | -+++ linux-4.19.146/kernel/reboot.c | |
416 | +--- linux-4.19.152.orig/kernel/reboot.c | |
417 | ++++ linux-4.19.152/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.146.orig/kernel/sched/core.c | |
436 | -+++ linux-4.19.146/kernel/sched/core.c | |
435 | +--- linux-4.19.152.orig/kernel/sched/core.c | |
436 | ++++ linux-4.19.152/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.146.orig/kernel/signal.c | |
447 | -+++ linux-4.19.146/kernel/signal.c | |
446 | +--- linux-4.19.152.orig/kernel/signal.c | |
447 | ++++ linux-4.19.152/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.146.orig/kernel/sys.c | |
494 | -+++ linux-4.19.146/kernel/sys.c | |
493 | +--- linux-4.19.152.orig/kernel/sys.c | |
494 | ++++ linux-4.19.152/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) |
@@ -503,7 +503,7 @@ | ||
503 | 503 | |
504 | 504 | /* normalize: avoid signed division (rounding problems) */ |
505 | 505 | error = -ESRCH; |
506 | -@@ -1308,6 +1312,8 @@ SYSCALL_DEFINE2(sethostname, char __user | |
506 | +@@ -1310,6 +1314,8 @@ SYSCALL_DEFINE2(sethostname, char __user | |
507 | 507 | |
508 | 508 | if (len < 0 || len > __NEW_UTS_LEN) |
509 | 509 | return -EINVAL; |
@@ -512,7 +512,7 @@ | ||
512 | 512 | errno = -EFAULT; |
513 | 513 | if (!copy_from_user(tmp, name, len)) { |
514 | 514 | struct new_utsname *u; |
515 | -@@ -1360,6 +1366,8 @@ SYSCALL_DEFINE2(setdomainname, char __us | |
515 | +@@ -1362,6 +1368,8 @@ SYSCALL_DEFINE2(setdomainname, char __us | |
516 | 516 | return -EPERM; |
517 | 517 | if (len < 0 || len > __NEW_UTS_LEN) |
518 | 518 | return -EINVAL; |
@@ -521,8 +521,8 @@ | ||
521 | 521 | |
522 | 522 | errno = -EFAULT; |
523 | 523 | if (!copy_from_user(tmp, name, len)) { |
524 | ---- linux-4.19.146.orig/kernel/time/timekeeping.c | |
525 | -+++ linux-4.19.146/kernel/time/timekeeping.c | |
524 | +--- linux-4.19.152.orig/kernel/time/timekeeping.c | |
525 | ++++ linux-4.19.152/kernel/time/timekeeping.c | |
526 | 526 | @@ -26,6 +26,7 @@ |
527 | 527 | #include <linux/stop_machine.h> |
528 | 528 | #include <linux/pvclock_gtod.h> |
@@ -531,7 +531,7 @@ | ||
531 | 531 | |
532 | 532 | #include "tick-internal.h" |
533 | 533 | #include "ntp_internal.h" |
534 | -@@ -2257,10 +2258,15 @@ static int timekeeping_validate_timex(co | |
534 | +@@ -2256,10 +2257,15 @@ static int timekeeping_validate_timex(co | |
535 | 535 | if (!(txc->modes & ADJ_OFFSET_READONLY) && |
536 | 536 | !capable(CAP_SYS_TIME)) |
537 | 537 | return -EPERM; |
@@ -547,7 +547,7 @@ | ||
547 | 547 | /* |
548 | 548 | * if the quartz is off by more than 10% then |
549 | 549 | * something is VERY wrong! |
550 | -@@ -2275,6 +2281,8 @@ static int timekeeping_validate_timex(co | |
550 | +@@ -2274,6 +2280,8 @@ static int timekeeping_validate_timex(co | |
551 | 551 | /* In order to inject time, you gotta be super-user! */ |
552 | 552 | if (!capable(CAP_SYS_TIME)) |
553 | 553 | return -EPERM; |
@@ -556,8 +556,8 @@ | ||
556 | 556 | |
557 | 557 | /* |
558 | 558 | * Validate if a timespec/timeval used to inject a time |
559 | ---- linux-4.19.146.orig/net/ipv4/raw.c | |
560 | -+++ linux-4.19.146/net/ipv4/raw.c | |
559 | +--- linux-4.19.152.orig/net/ipv4/raw.c | |
560 | ++++ linux-4.19.152/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.146.orig/net/ipv4/udp.c | |
573 | -+++ linux-4.19.146/net/ipv4/udp.c | |
572 | +--- linux-4.19.152.orig/net/ipv4/udp.c | |
573 | ++++ linux-4.19.152/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.146.orig/net/ipv6/raw.c | |
584 | -+++ linux-4.19.146/net/ipv6/raw.c | |
583 | +--- linux-4.19.152.orig/net/ipv6/raw.c | |
584 | ++++ linux-4.19.152/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.146.orig/net/ipv6/udp.c | |
597 | -+++ linux-4.19.146/net/ipv6/udp.c | |
596 | +--- linux-4.19.152.orig/net/ipv6/udp.c | |
597 | ++++ linux-4.19.152/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.146.orig/net/socket.c | |
608 | -+++ linux-4.19.146/net/socket.c | |
607 | +--- linux-4.19.152.orig/net/socket.c | |
608 | ++++ linux-4.19.152/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,9 +617,9 @@ | ||
617 | 617 | if (upeer_sockaddr) { |
618 | 618 | len = newsock->ops->getname(newsock, |
619 | 619 | (struct sockaddr *)&address, 2); |
620 | ---- linux-4.19.146.orig/net/unix/af_unix.c | |
621 | -+++ linux-4.19.146/net/unix/af_unix.c | |
622 | -@@ -2151,6 +2151,10 @@ static int unix_dgram_recvmsg(struct soc | |
620 | +--- linux-4.19.152.orig/net/unix/af_unix.c | |
621 | ++++ linux-4.19.152/net/unix/af_unix.c | |
622 | +@@ -2158,6 +2158,10 @@ static int unix_dgram_recvmsg(struct soc | |
623 | 623 | EPOLLOUT | EPOLLWRNORM | |
624 | 624 | EPOLLWRBAND); |
625 | 625 |
@@ -630,7 +630,7 @@ | ||
630 | 630 | if (msg->msg_name) |
631 | 631 | unix_copy_addr(msg, skb->sk); |
632 | 632 | |
633 | -@@ -2201,6 +2205,7 @@ static int unix_dgram_recvmsg(struct soc | |
633 | +@@ -2208,6 +2212,7 @@ static int unix_dgram_recvmsg(struct soc | |
634 | 634 | |
635 | 635 | out_free: |
636 | 636 | skb_free_datagram(sk, skb); |
@@ -638,8 +638,8 @@ | ||
638 | 638 | mutex_unlock(&u->iolock); |
639 | 639 | out: |
640 | 640 | return err; |
641 | ---- linux-4.19.146.orig/security/Kconfig | |
642 | -+++ linux-4.19.146/security/Kconfig | |
641 | +--- linux-4.19.152.orig/security/Kconfig | |
642 | ++++ linux-4.19.152/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.146.orig/security/Makefile | |
652 | -+++ linux-4.19.146/security/Makefile | |
651 | +--- linux-4.19.152.orig/security/Makefile | |
652 | ++++ linux-4.19.152/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.146.orig/security/security.c | |
661 | -+++ linux-4.19.146/security/security.c | |
660 | +--- linux-4.19.152.orig/security/security.c | |
661 | ++++ linux-4.19.152/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.236. | |
1 | +This is TOMOYO Linux patch for kernel 4.4.240. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.236.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.240.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.236.orig/fs/exec.c | |
32 | -+++ linux-4.4.236/fs/exec.c | |
31 | +--- linux-4.4.240.orig/fs/exec.c | |
32 | ++++ linux-4.4.240/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.236.orig/fs/open.c | |
43 | -+++ linux-4.4.236/fs/open.c | |
42 | +--- linux-4.4.240.orig/fs/open.c | |
43 | ++++ linux-4.4.240/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.236.orig/fs/proc/version.c | |
54 | -+++ linux-4.4.236/fs/proc/version.c | |
53 | +--- linux-4.4.240.orig/fs/proc/version.c | |
54 | ++++ linux-4.4.240/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.236 2020/09/15\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.4.240 2020/10/24\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-4.4.236.orig/include/linux/init_task.h | |
67 | -+++ linux-4.4.236/include/linux/init_task.h | |
66 | +--- linux-4.4.240.orig/include/linux/init_task.h | |
67 | ++++ linux-4.4.240/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.236.orig/include/linux/sched.h | |
92 | -+++ linux-4.4.236/include/linux/sched.h | |
91 | +--- linux-4.4.240.orig/include/linux/sched.h | |
92 | ++++ linux-4.4.240/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.236.orig/include/linux/security.h | |
114 | -+++ linux-4.4.236/include/linux/security.h | |
113 | +--- linux-4.4.240.orig/include/linux/security.h | |
114 | ++++ linux-4.4.240/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.236.orig/include/net/ip.h | |
322 | -+++ linux-4.4.236/include/net/ip.h | |
321 | +--- linux-4.4.240.orig/include/net/ip.h | |
322 | ++++ linux-4.4.240/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.236.orig/kernel/fork.c | |
342 | -+++ linux-4.4.236/kernel/fork.c | |
341 | +--- linux-4.4.240.orig/kernel/fork.c | |
342 | ++++ linux-4.4.240/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.236.orig/kernel/kexec.c | |
370 | -+++ linux-4.4.236/kernel/kexec.c | |
369 | +--- linux-4.4.240.orig/kernel/kexec.c | |
370 | ++++ linux-4.4.240/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.236.orig/kernel/module.c | |
390 | -+++ linux-4.4.236/kernel/module.c | |
389 | +--- linux-4.4.240.orig/kernel/module.c | |
390 | ++++ linux-4.4.240/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.236.orig/kernel/ptrace.c | |
418 | -+++ linux-4.4.236/kernel/ptrace.c | |
417 | +--- linux-4.4.240.orig/kernel/ptrace.c | |
418 | ++++ linux-4.4.240/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.236.orig/kernel/reboot.c | |
444 | -+++ linux-4.4.236/kernel/reboot.c | |
443 | +--- linux-4.4.240.orig/kernel/reboot.c | |
444 | ++++ linux-4.4.240/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.236.orig/kernel/sched/core.c | |
463 | -+++ linux-4.4.236/kernel/sched/core.c | |
462 | +--- linux-4.4.240.orig/kernel/sched/core.c | |
463 | ++++ linux-4.4.240/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.236.orig/kernel/signal.c | |
474 | -+++ linux-4.4.236/kernel/signal.c | |
473 | +--- linux-4.4.240.orig/kernel/signal.c | |
474 | ++++ linux-4.4.240/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.236.orig/kernel/sys.c | |
521 | -+++ linux-4.4.236/kernel/sys.c | |
520 | +--- linux-4.4.240.orig/kernel/sys.c | |
521 | ++++ linux-4.4.240/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) |
@@ -530,7 +530,7 @@ | ||
530 | 530 | |
531 | 531 | /* normalize: avoid signed division (rounding problems) */ |
532 | 532 | error = -ESRCH; |
533 | -@@ -1216,6 +1220,8 @@ SYSCALL_DEFINE2(sethostname, char __user | |
533 | +@@ -1218,6 +1222,8 @@ SYSCALL_DEFINE2(sethostname, char __user | |
534 | 534 | |
535 | 535 | if (len < 0 || len > __NEW_UTS_LEN) |
536 | 536 | return -EINVAL; |
@@ -539,7 +539,7 @@ | ||
539 | 539 | errno = -EFAULT; |
540 | 540 | if (!copy_from_user(tmp, name, len)) { |
541 | 541 | struct new_utsname *u; |
542 | -@@ -1268,6 +1274,8 @@ SYSCALL_DEFINE2(setdomainname, char __us | |
542 | +@@ -1270,6 +1276,8 @@ SYSCALL_DEFINE2(setdomainname, char __us | |
543 | 543 | return -EPERM; |
544 | 544 | if (len < 0 || len > __NEW_UTS_LEN) |
545 | 545 | return -EINVAL; |
@@ -548,8 +548,8 @@ | ||
548 | 548 | |
549 | 549 | errno = -EFAULT; |
550 | 550 | if (!copy_from_user(tmp, name, len)) { |
551 | ---- linux-4.4.236.orig/kernel/time/ntp.c | |
552 | -+++ linux-4.4.236/kernel/time/ntp.c | |
551 | +--- linux-4.4.240.orig/kernel/time/ntp.c | |
552 | ++++ linux-4.4.240/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.236.orig/net/ipv4/raw.c | |
587 | -+++ linux-4.4.236/net/ipv4/raw.c | |
586 | +--- linux-4.4.240.orig/net/ipv4/raw.c | |
587 | ++++ linux-4.4.240/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.236.orig/net/ipv4/udp.c | |
600 | -+++ linux-4.4.236/net/ipv4/udp.c | |
599 | +--- linux-4.4.240.orig/net/ipv4/udp.c | |
600 | ++++ linux-4.4.240/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.236.orig/net/ipv6/raw.c | |
613 | -+++ linux-4.4.236/net/ipv6/raw.c | |
612 | +--- linux-4.4.240.orig/net/ipv6/raw.c | |
613 | ++++ linux-4.4.240/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.236.orig/net/ipv6/udp.c | |
626 | -+++ linux-4.4.236/net/ipv6/udp.c | |
625 | +--- linux-4.4.240.orig/net/ipv6/udp.c | |
626 | ++++ linux-4.4.240/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.236.orig/net/socket.c | |
639 | -+++ linux-4.4.236/net/socket.c | |
638 | +--- linux-4.4.240.orig/net/socket.c | |
639 | ++++ linux-4.4.240/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,9 +648,9 @@ | ||
648 | 648 | if (upeer_sockaddr) { |
649 | 649 | if (newsock->ops->getname(newsock, (struct sockaddr *)&address, |
650 | 650 | &len, 2) < 0) { |
651 | ---- linux-4.4.236.orig/net/unix/af_unix.c | |
652 | -+++ linux-4.4.236/net/unix/af_unix.c | |
653 | -@@ -2153,6 +2153,10 @@ static int unix_dgram_recvmsg(struct soc | |
651 | +--- linux-4.4.240.orig/net/unix/af_unix.c | |
652 | ++++ linux-4.4.240/net/unix/af_unix.c | |
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); |
656 | 656 |
@@ -661,8 +661,8 @@ | ||
661 | 661 | if (msg->msg_name) |
662 | 662 | unix_copy_addr(msg, skb->sk); |
663 | 663 | |
664 | ---- linux-4.4.236.orig/security/Kconfig | |
665 | -+++ linux-4.4.236/security/Kconfig | |
664 | +--- linux-4.4.240.orig/security/Kconfig | |
665 | ++++ linux-4.4.240/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.236.orig/security/Makefile | |
675 | -+++ linux-4.4.236/security/Makefile | |
674 | +--- linux-4.4.240.orig/security/Makefile | |
675 | ++++ linux-4.4.240/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.236. | |
1 | +This is TOMOYO Linux patch for kernel 4.9.240. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.236.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.240.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.236.orig/fs/exec.c | |
32 | -+++ linux-4.9.236/fs/exec.c | |
31 | +--- linux-4.9.240.orig/fs/exec.c | |
32 | ++++ linux-4.9.240/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.236.orig/fs/open.c | |
43 | -+++ linux-4.9.236/fs/open.c | |
42 | +--- linux-4.9.240.orig/fs/open.c | |
43 | ++++ linux-4.9.240/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.236.orig/fs/proc/version.c | |
54 | -+++ linux-4.9.236/fs/proc/version.c | |
53 | +--- linux-4.9.240.orig/fs/proc/version.c | |
54 | ++++ linux-4.9.240/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.236 2020/09/15\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.9.240 2020/10/24\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-4.9.236.orig/include/linux/init_task.h | |
67 | -+++ linux-4.9.236/include/linux/init_task.h | |
66 | +--- linux-4.9.240.orig/include/linux/init_task.h | |
67 | ++++ linux-4.9.240/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.236.orig/include/linux/sched.h | |
92 | -+++ linux-4.9.236/include/linux/sched.h | |
91 | +--- linux-4.9.240.orig/include/linux/sched.h | |
92 | ++++ linux-4.9.240/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.236.orig/include/linux/security.h | |
114 | -+++ linux-4.9.236/include/linux/security.h | |
113 | +--- linux-4.9.240.orig/include/linux/security.h | |
114 | ++++ linux-4.9.240/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.236.orig/include/net/ip.h | |
322 | -+++ linux-4.9.236/include/net/ip.h | |
321 | +--- linux-4.9.240.orig/include/net/ip.h | |
322 | ++++ linux-4.9.240/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.236.orig/kernel/fork.c | |
342 | -+++ linux-4.9.236/kernel/fork.c | |
341 | +--- linux-4.9.240.orig/kernel/fork.c | |
342 | ++++ linux-4.9.240/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.236.orig/kernel/kexec.c | |
370 | -+++ linux-4.9.236/kernel/kexec.c | |
369 | +--- linux-4.9.240.orig/kernel/kexec.c | |
370 | ++++ linux-4.9.240/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.236.orig/kernel/module.c | |
390 | -+++ linux-4.9.236/kernel/module.c | |
389 | +--- linux-4.9.240.orig/kernel/module.c | |
390 | ++++ linux-4.9.240/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.236.orig/kernel/ptrace.c | |
418 | -+++ linux-4.9.236/kernel/ptrace.c | |
417 | +--- linux-4.9.240.orig/kernel/ptrace.c | |
418 | ++++ linux-4.9.240/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.236.orig/kernel/reboot.c | |
444 | -+++ linux-4.9.236/kernel/reboot.c | |
443 | +--- linux-4.9.240.orig/kernel/reboot.c | |
444 | ++++ linux-4.9.240/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.236.orig/kernel/sched/core.c | |
463 | -+++ linux-4.9.236/kernel/sched/core.c | |
462 | +--- linux-4.9.240.orig/kernel/sched/core.c | |
463 | ++++ linux-4.9.240/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.236.orig/kernel/signal.c | |
474 | -+++ linux-4.9.236/kernel/signal.c | |
473 | +--- linux-4.9.240.orig/kernel/signal.c | |
474 | ++++ linux-4.9.240/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.236.orig/kernel/sys.c | |
521 | -+++ linux-4.9.236/kernel/sys.c | |
520 | +--- linux-4.9.240.orig/kernel/sys.c | |
521 | ++++ linux-4.9.240/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) |
@@ -530,7 +530,7 @@ | ||
530 | 530 | |
531 | 531 | /* normalize: avoid signed division (rounding problems) */ |
532 | 532 | error = -ESRCH; |
533 | -@@ -1216,6 +1220,8 @@ SYSCALL_DEFINE2(sethostname, char __user | |
533 | +@@ -1218,6 +1222,8 @@ SYSCALL_DEFINE2(sethostname, char __user | |
534 | 534 | |
535 | 535 | if (len < 0 || len > __NEW_UTS_LEN) |
536 | 536 | return -EINVAL; |
@@ -539,7 +539,7 @@ | ||
539 | 539 | errno = -EFAULT; |
540 | 540 | if (!copy_from_user(tmp, name, len)) { |
541 | 541 | struct new_utsname *u; |
542 | -@@ -1268,6 +1274,8 @@ SYSCALL_DEFINE2(setdomainname, char __us | |
542 | +@@ -1270,6 +1276,8 @@ SYSCALL_DEFINE2(setdomainname, char __us | |
543 | 543 | return -EPERM; |
544 | 544 | if (len < 0 || len > __NEW_UTS_LEN) |
545 | 545 | return -EINVAL; |
@@ -548,8 +548,8 @@ | ||
548 | 548 | |
549 | 549 | errno = -EFAULT; |
550 | 550 | if (!copy_from_user(tmp, name, len)) { |
551 | ---- linux-4.9.236.orig/kernel/time/ntp.c | |
552 | -+++ linux-4.9.236/kernel/time/ntp.c | |
551 | +--- linux-4.9.240.orig/kernel/time/ntp.c | |
552 | ++++ linux-4.9.240/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.236.orig/net/ipv4/raw.c | |
587 | -+++ linux-4.9.236/net/ipv4/raw.c | |
586 | +--- linux-4.9.240.orig/net/ipv4/raw.c | |
587 | ++++ linux-4.9.240/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.236.orig/net/ipv4/udp.c | |
600 | -+++ linux-4.9.236/net/ipv4/udp.c | |
599 | +--- linux-4.9.240.orig/net/ipv4/udp.c | |
600 | ++++ linux-4.9.240/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.236.orig/net/ipv6/raw.c | |
611 | -+++ linux-4.9.236/net/ipv6/raw.c | |
610 | +--- linux-4.9.240.orig/net/ipv6/raw.c | |
611 | ++++ linux-4.9.240/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.236.orig/net/ipv6/udp.c | |
624 | -+++ linux-4.9.236/net/ipv6/udp.c | |
623 | +--- linux-4.9.240.orig/net/ipv6/udp.c | |
624 | ++++ linux-4.9.240/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.236.orig/net/socket.c | |
635 | -+++ linux-4.9.236/net/socket.c | |
634 | +--- linux-4.9.240.orig/net/socket.c | |
635 | ++++ linux-4.9.240/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,9 +644,9 @@ | ||
644 | 644 | if (upeer_sockaddr) { |
645 | 645 | if (newsock->ops->getname(newsock, (struct sockaddr *)&address, |
646 | 646 | &len, 2) < 0) { |
647 | ---- linux-4.9.236.orig/net/unix/af_unix.c | |
648 | -+++ linux-4.9.236/net/unix/af_unix.c | |
649 | -@@ -2162,6 +2162,10 @@ static int unix_dgram_recvmsg(struct soc | |
647 | +--- linux-4.9.240.orig/net/unix/af_unix.c | |
648 | ++++ linux-4.9.240/net/unix/af_unix.c | |
649 | +@@ -2169,6 +2169,10 @@ static int unix_dgram_recvmsg(struct soc | |
650 | 650 | POLLOUT | POLLWRNORM | |
651 | 651 | POLLWRBAND); |
652 | 652 |
@@ -657,7 +657,7 @@ | ||
657 | 657 | if (msg->msg_name) |
658 | 658 | unix_copy_addr(msg, skb->sk); |
659 | 659 | |
660 | -@@ -2212,6 +2216,7 @@ static int unix_dgram_recvmsg(struct soc | |
660 | +@@ -2219,6 +2223,7 @@ static int unix_dgram_recvmsg(struct soc | |
661 | 661 | |
662 | 662 | out_free: |
663 | 663 | skb_free_datagram(sk, skb); |
@@ -665,8 +665,8 @@ | ||
665 | 665 | mutex_unlock(&u->iolock); |
666 | 666 | out: |
667 | 667 | return err; |
668 | ---- linux-4.9.236.orig/security/Kconfig | |
669 | -+++ linux-4.9.236/security/Kconfig | |
668 | +--- linux-4.9.240.orig/security/Kconfig | |
669 | ++++ linux-4.9.240/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.236.orig/security/Makefile | |
679 | -+++ linux-4.9.236/security/Makefile | |
678 | +--- linux-4.9.240.orig/security/Makefile | |
679 | ++++ linux-4.9.240/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 |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 5.4.66. | |
1 | +This is TOMOYO Linux patch for kernel 5.4.72. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.66.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.72.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.4.66.orig/fs/exec.c | |
32 | -+++ linux-5.4.66/fs/exec.c | |
33 | -@@ -1701,7 +1701,7 @@ static int exec_binprm(struct linux_binp | |
31 | +--- linux-5.4.72.orig/fs/exec.c | |
32 | ++++ linux-5.4.72/fs/exec.c | |
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(); |
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-5.4.66.orig/fs/open.c | |
43 | -+++ linux-5.4.66/fs/open.c | |
42 | +--- linux-5.4.72.orig/fs/open.c | |
43 | ++++ linux-5.4.72/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.66.orig/fs/proc/version.c | |
54 | -+++ linux-5.4.66/fs/proc/version.c | |
53 | +--- linux-5.4.72.orig/fs/proc/version.c | |
54 | ++++ linux-5.4.72/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.66 2020/09/18\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 5.4.72 2020/10/24\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-5.4.66.orig/include/linux/sched.h | |
67 | -+++ linux-5.4.66/include/linux/sched.h | |
66 | +--- linux-5.4.72.orig/include/linux/sched.h | |
67 | ++++ linux-5.4.72/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.66.orig/include/linux/security.h | |
88 | -+++ linux-5.4.66/include/linux/security.h | |
87 | +--- linux-5.4.72.orig/include/linux/security.h | |
88 | ++++ linux-5.4.72/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.66.orig/include/net/ip.h | |
319 | -+++ linux-5.4.66/include/net/ip.h | |
318 | +--- linux-5.4.72.orig/include/net/ip.h | |
319 | ++++ linux-5.4.72/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,9 +335,9 @@ | ||
335 | 335 | return 0; |
336 | 336 | } |
337 | 337 | |
338 | ---- linux-5.4.66.orig/init/init_task.c | |
339 | -+++ linux-5.4.66/init/init_task.c | |
340 | -@@ -181,6 +181,10 @@ struct task_struct init_task | |
338 | +--- linux-5.4.72.orig/init/init_task.c | |
339 | ++++ linux-5.4.72/init/init_task.c | |
340 | +@@ -182,6 +182,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.4.66.orig/kernel/kexec.c | |
352 | -+++ linux-5.4.66/kernel/kexec.c | |
351 | +--- linux-5.4.72.orig/kernel/kexec.c | |
352 | ++++ linux-5.4.72/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.66.orig/kernel/module.c | |
372 | -+++ linux-5.4.66/kernel/module.c | |
371 | +--- linux-5.4.72.orig/kernel/module.c | |
372 | ++++ linux-5.4.72/kernel/module.c | |
373 | 373 | @@ -55,6 +55,7 @@ |
374 | 374 | #include <linux/audit.h> |
375 | 375 | #include <uapi/linux/module.h> |
@@ -396,8 +396,8 @@ | ||
396 | 396 | |
397 | 397 | return 0; |
398 | 398 | } |
399 | ---- linux-5.4.66.orig/kernel/ptrace.c | |
400 | -+++ linux-5.4.66/kernel/ptrace.c | |
399 | +--- linux-5.4.72.orig/kernel/ptrace.c | |
400 | ++++ linux-5.4.72/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.66.orig/kernel/reboot.c | |
426 | -+++ linux-5.4.66/kernel/reboot.c | |
425 | +--- linux-5.4.72.orig/kernel/reboot.c | |
426 | ++++ linux-5.4.72/kernel/reboot.c | |
427 | 427 | @@ -17,6 +17,7 @@ |
428 | 428 | #include <linux/syscalls.h> |
429 | 429 | #include <linux/syscore_ops.h> |
@@ -441,9 +441,9 @@ | ||
441 | 441 | |
442 | 442 | /* |
443 | 443 | * If pid namespaces are enabled and the current task is in a child |
444 | ---- linux-5.4.66.orig/kernel/sched/core.c | |
445 | -+++ linux-5.4.66/kernel/sched/core.c | |
446 | -@@ -4662,6 +4662,8 @@ int can_nice(const struct task_struct *p | |
444 | +--- linux-5.4.72.orig/kernel/sched/core.c | |
445 | ++++ linux-5.4.72/kernel/sched/core.c | |
446 | +@@ -4663,6 +4663,8 @@ int can_nice(const struct task_struct *p | |
447 | 447 | SYSCALL_DEFINE1(nice, int, increment) |
448 | 448 | { |
449 | 449 | long nice, retval; |
@@ -452,8 +452,8 @@ | ||
452 | 452 | |
453 | 453 | /* |
454 | 454 | * Setpriority might change our priority at the same moment. |
455 | ---- linux-5.4.66.orig/kernel/signal.c | |
456 | -+++ linux-5.4.66/kernel/signal.c | |
455 | +--- linux-5.4.72.orig/kernel/signal.c | |
456 | ++++ linux-5.4.72/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.66.orig/kernel/sys.c | |
525 | -+++ linux-5.4.66/kernel/sys.c | |
524 | +--- linux-5.4.72.orig/kernel/sys.c | |
525 | ++++ linux-5.4.72/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) |
@@ -534,7 +534,7 @@ | ||
534 | 534 | |
535 | 535 | /* normalize: avoid signed division (rounding problems) */ |
536 | 536 | error = -ESRCH; |
537 | -@@ -1312,6 +1316,8 @@ SYSCALL_DEFINE2(sethostname, char __user | |
537 | +@@ -1314,6 +1318,8 @@ SYSCALL_DEFINE2(sethostname, char __user | |
538 | 538 | |
539 | 539 | if (len < 0 || len > __NEW_UTS_LEN) |
540 | 540 | return -EINVAL; |
@@ -543,7 +543,7 @@ | ||
543 | 543 | errno = -EFAULT; |
544 | 544 | if (!copy_from_user(tmp, name, len)) { |
545 | 545 | struct new_utsname *u; |
546 | -@@ -1364,6 +1370,8 @@ SYSCALL_DEFINE2(setdomainname, char __us | |
546 | +@@ -1366,6 +1372,8 @@ SYSCALL_DEFINE2(setdomainname, char __us | |
547 | 547 | return -EPERM; |
548 | 548 | if (len < 0 || len > __NEW_UTS_LEN) |
549 | 549 | return -EINVAL; |
@@ -552,8 +552,8 @@ | ||
552 | 552 | |
553 | 553 | errno = -EFAULT; |
554 | 554 | if (!copy_from_user(tmp, name, len)) { |
555 | ---- linux-5.4.66.orig/kernel/time/timekeeping.c | |
556 | -+++ linux-5.4.66/kernel/time/timekeeping.c | |
555 | +--- linux-5.4.72.orig/kernel/time/timekeeping.c | |
556 | ++++ linux-5.4.72/kernel/time/timekeeping.c | |
557 | 557 | @@ -22,6 +22,7 @@ |
558 | 558 | #include <linux/pvclock_gtod.h> |
559 | 559 | #include <linux/compiler.h> |
@@ -562,7 +562,7 @@ | ||
562 | 562 | |
563 | 563 | #include "tick-internal.h" |
564 | 564 | #include "ntp_internal.h" |
565 | -@@ -2253,10 +2254,15 @@ static int timekeeping_validate_timex(co | |
565 | +@@ -2252,10 +2253,15 @@ static int timekeeping_validate_timex(co | |
566 | 566 | if (!(txc->modes & ADJ_OFFSET_READONLY) && |
567 | 567 | !capable(CAP_SYS_TIME)) |
568 | 568 | return -EPERM; |
@@ -578,7 +578,7 @@ | ||
578 | 578 | /* |
579 | 579 | * if the quartz is off by more than 10% then |
580 | 580 | * something is VERY wrong! |
581 | -@@ -2271,6 +2277,8 @@ static int timekeeping_validate_timex(co | |
581 | +@@ -2270,6 +2276,8 @@ static int timekeeping_validate_timex(co | |
582 | 582 | /* In order to inject time, you gotta be super-user! */ |
583 | 583 | if (!capable(CAP_SYS_TIME)) |
584 | 584 | return -EPERM; |
@@ -587,8 +587,8 @@ | ||
587 | 587 | |
588 | 588 | /* |
589 | 589 | * Validate if a timespec/timeval used to inject a time |
590 | ---- linux-5.4.66.orig/net/ipv4/raw.c | |
591 | -+++ linux-5.4.66/net/ipv4/raw.c | |
590 | +--- linux-5.4.72.orig/net/ipv4/raw.c | |
591 | ++++ linux-5.4.72/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.66.orig/net/ipv4/udp.c | |
604 | -+++ linux-5.4.66/net/ipv4/udp.c | |
603 | +--- linux-5.4.72.orig/net/ipv4/udp.c | |
604 | ++++ linux-5.4.72/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.66.orig/net/ipv6/raw.c | |
615 | -+++ linux-5.4.66/net/ipv6/raw.c | |
614 | +--- linux-5.4.72.orig/net/ipv6/raw.c | |
615 | ++++ linux-5.4.72/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.66.orig/net/ipv6/udp.c | |
628 | -+++ linux-5.4.66/net/ipv6/udp.c | |
627 | +--- linux-5.4.72.orig/net/ipv6/udp.c | |
628 | ++++ linux-5.4.72/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.66.orig/net/socket.c | |
639 | -+++ linux-5.4.66/net/socket.c | |
638 | +--- linux-5.4.72.orig/net/socket.c | |
639 | ++++ linux-5.4.72/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,9 +648,9 @@ | ||
648 | 648 | if (upeer_sockaddr) { |
649 | 649 | len = newsock->ops->getname(newsock, |
650 | 650 | (struct sockaddr *)&address, 2); |
651 | ---- linux-5.4.66.orig/net/unix/af_unix.c | |
652 | -+++ linux-5.4.66/net/unix/af_unix.c | |
653 | -@@ -2087,6 +2087,10 @@ static int unix_dgram_recvmsg(struct soc | |
651 | +--- linux-5.4.72.orig/net/unix/af_unix.c | |
652 | ++++ linux-5.4.72/net/unix/af_unix.c | |
653 | +@@ -2094,6 +2094,10 @@ static int unix_dgram_recvmsg(struct soc | |
654 | 654 | EPOLLOUT | EPOLLWRNORM | |
655 | 655 | EPOLLWRBAND); |
656 | 656 |
@@ -661,7 +661,7 @@ | ||
661 | 661 | if (msg->msg_name) |
662 | 662 | unix_copy_addr(msg, skb->sk); |
663 | 663 | |
664 | -@@ -2137,6 +2141,7 @@ static int unix_dgram_recvmsg(struct soc | |
664 | +@@ -2144,6 +2148,7 @@ static int unix_dgram_recvmsg(struct soc | |
665 | 665 | |
666 | 666 | out_free: |
667 | 667 | skb_free_datagram(sk, skb); |
@@ -669,8 +669,8 @@ | ||
669 | 669 | mutex_unlock(&u->iolock); |
670 | 670 | out: |
671 | 671 | return err; |
672 | ---- linux-5.4.66.orig/security/Kconfig | |
673 | -+++ linux-5.4.66/security/Kconfig | |
672 | +--- linux-5.4.72.orig/security/Kconfig | |
673 | ++++ linux-5.4.72/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.66.orig/security/Makefile | |
683 | -+++ linux-5.4.66/security/Makefile | |
682 | +--- linux-5.4.72.orig/security/Makefile | |
683 | ++++ linux-5.4.72/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.66.orig/security/security.c | |
692 | -+++ linux-5.4.66/security/security.c | |
691 | +--- linux-5.4.72.orig/security/security.c | |
692 | ++++ linux-5.4.72/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.10. | |
1 | +This is TOMOYO Linux patch for kernel 5.8.16. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.10.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.16.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.8.10.orig/fs/exec.c | |
32 | -+++ linux-5.8.10/fs/exec.c | |
31 | +--- linux-5.8.16.orig/fs/exec.c | |
32 | ++++ linux-5.8.16/fs/exec.c | |
33 | 33 | @@ -1923,7 +1923,7 @@ static int __do_execve_file(int fd, stru |
34 | 34 | if (retval < 0) |
35 | 35 | goto out; |
@@ -39,8 +39,8 @@ | ||
39 | 39 | if (retval < 0) |
40 | 40 | goto out; |
41 | 41 | |
42 | ---- linux-5.8.10.orig/fs/open.c | |
43 | -+++ linux-5.8.10/fs/open.c | |
42 | +--- linux-5.8.16.orig/fs/open.c | |
43 | ++++ linux-5.8.16/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.10.orig/fs/proc/version.c | |
54 | -+++ linux-5.8.10/fs/proc/version.c | |
53 | +--- linux-5.8.16.orig/fs/proc/version.c | |
54 | ++++ linux-5.8.16/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.10 2020/09/18\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 5.8.16 2020/10/24\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-5.8.10.orig/include/linux/sched.h | |
67 | -+++ linux-5.8.10/include/linux/sched.h | |
66 | +--- linux-5.8.16.orig/include/linux/sched.h | |
67 | ++++ linux-5.8.16/include/linux/sched.h | |
68 | 68 | @@ -39,6 +39,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.8.10.orig/include/linux/security.h | |
88 | -+++ linux-5.8.10/include/linux/security.h | |
87 | +--- linux-5.8.16.orig/include/linux/security.h | |
88 | ++++ linux-5.8.16/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.10.orig/include/net/ip.h | |
319 | -+++ linux-5.8.10/include/net/ip.h | |
318 | +--- linux-5.8.16.orig/include/net/ip.h | |
319 | ++++ linux-5.8.16/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,8 +335,8 @@ | ||
335 | 335 | return false; |
336 | 336 | } |
337 | 337 | |
338 | ---- linux-5.8.10.orig/init/init_task.c | |
339 | -+++ linux-5.8.10/init/init_task.c | |
338 | +--- linux-5.8.16.orig/init/init_task.c | |
339 | ++++ linux-5.8.16/init/init_task.c | |
340 | 340 | @@ -204,6 +204,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.8.10.orig/kernel/kexec.c | |
352 | -+++ linux-5.8.10/kernel/kexec.c | |
351 | +--- linux-5.8.16.orig/kernel/kexec.c | |
352 | ++++ linux-5.8.16/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.10.orig/kernel/module.c | |
372 | -+++ linux-5.8.10/kernel/module.c | |
371 | +--- linux-5.8.16.orig/kernel/module.c | |
372 | ++++ linux-5.8.16/kernel/module.c | |
373 | 373 | @@ -58,6 +58,7 @@ |
374 | 374 | #include <linux/audit.h> |
375 | 375 | #include <uapi/linux/module.h> |
@@ -396,8 +396,8 @@ | ||
396 | 396 | |
397 | 397 | return 0; |
398 | 398 | } |
399 | ---- linux-5.8.10.orig/kernel/ptrace.c | |
400 | -+++ linux-5.8.10/kernel/ptrace.c | |
399 | +--- linux-5.8.16.orig/kernel/ptrace.c | |
400 | ++++ linux-5.8.16/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.10.orig/kernel/reboot.c | |
426 | -+++ linux-5.8.10/kernel/reboot.c | |
425 | +--- linux-5.8.16.orig/kernel/reboot.c | |
426 | ++++ linux-5.8.16/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.10.orig/kernel/sched/core.c | |
445 | -+++ linux-5.8.10/kernel/sched/core.c | |
444 | +--- linux-5.8.16.orig/kernel/sched/core.c | |
445 | ++++ linux-5.8.16/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.10.orig/kernel/signal.c | |
456 | -+++ linux-5.8.10/kernel/signal.c | |
455 | +--- linux-5.8.16.orig/kernel/signal.c | |
456 | ++++ linux-5.8.16/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.10.orig/kernel/sys.c | |
525 | -+++ linux-5.8.10/kernel/sys.c | |
524 | +--- linux-5.8.16.orig/kernel/sys.c | |
525 | ++++ linux-5.8.16/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.10.orig/kernel/time/timekeeping.c | |
556 | -+++ linux-5.8.10/kernel/time/timekeeping.c | |
555 | +--- linux-5.8.16.orig/kernel/time/timekeeping.c | |
556 | ++++ linux-5.8.16/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.10.orig/net/ipv4/raw.c | |
591 | -+++ linux-5.8.10/net/ipv4/raw.c | |
590 | +--- linux-5.8.16.orig/net/ipv4/raw.c | |
591 | ++++ linux-5.8.16/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.10.orig/net/ipv4/udp.c | |
604 | -+++ linux-5.8.10/net/ipv4/udp.c | |
603 | +--- linux-5.8.16.orig/net/ipv4/udp.c | |
604 | ++++ linux-5.8.16/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.10.orig/net/ipv6/raw.c | |
615 | -+++ linux-5.8.10/net/ipv6/raw.c | |
614 | +--- linux-5.8.16.orig/net/ipv6/raw.c | |
615 | ++++ linux-5.8.16/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.10.orig/net/ipv6/udp.c | |
628 | -+++ linux-5.8.10/net/ipv6/udp.c | |
627 | +--- linux-5.8.16.orig/net/ipv6/udp.c | |
628 | ++++ linux-5.8.16/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.10.orig/net/socket.c | |
639 | -+++ linux-5.8.10/net/socket.c | |
638 | +--- linux-5.8.16.orig/net/socket.c | |
639 | ++++ linux-5.8.16/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.10.orig/net/unix/af_unix.c | |
652 | -+++ linux-5.8.10/net/unix/af_unix.c | |
651 | +--- linux-5.8.16.orig/net/unix/af_unix.c | |
652 | ++++ linux-5.8.16/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.10.orig/security/Kconfig | |
673 | -+++ linux-5.8.10/security/Kconfig | |
672 | +--- linux-5.8.16.orig/security/Kconfig | |
673 | ++++ linux-5.8.16/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.10.orig/security/Makefile | |
683 | -+++ linux-5.8.10/security/Makefile | |
682 | +--- linux-5.8.16.orig/security/Makefile | |
683 | ++++ linux-5.8.16/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.10.orig/security/security.c | |
692 | -+++ linux-5.8.10/security/security.c | |
691 | +--- linux-5.8.16.orig/security/security.c | |
692 | ++++ linux-5.8.16/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-rc6. | |
1 | +This is TOMOYO Linux patch for kernel 5.9.1. | |
2 | 2 | |
3 | -Source code for this patch is https://git.kernel.org/torvalds/t/linux-5.9-rc6.tar.gz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.1.tar.xz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 - |
6 | 6 | fs/open.c | 2 + |
@@ -28,8 +28,8 @@ | ||
28 | 28 | security/security.c | 5 ++- |
29 | 29 | 24 files changed, 160 insertions(+), 30 deletions(-) |
30 | 30 | |
31 | ---- linux-5.9-rc6.orig/fs/exec.c | |
32 | -+++ linux-5.9-rc6/fs/exec.c | |
31 | +--- linux-5.9.1.orig/fs/exec.c | |
32 | ++++ linux-5.9.1/fs/exec.c | |
33 | 33 | @@ -1928,7 +1928,7 @@ static int bprm_execve(struct linux_binp |
34 | 34 | if (retval) |
35 | 35 | goto out; |
@@ -39,8 +39,8 @@ | ||
39 | 39 | if (retval < 0) |
40 | 40 | goto out; |
41 | 41 | |
42 | ---- linux-5.9-rc6.orig/fs/open.c | |
43 | -+++ linux-5.9-rc6/fs/open.c | |
42 | +--- linux-5.9.1.orig/fs/open.c | |
43 | ++++ linux-5.9.1/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-rc6.orig/fs/proc/version.c | |
54 | -+++ linux-5.9-rc6/fs/proc/version.c | |
53 | +--- linux-5.9.1.orig/fs/proc/version.c | |
54 | ++++ linux-5.9.1/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-rc6 2020/09/21\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 5.9.1 2020/10/24\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-5.9-rc6.orig/include/linux/sched.h | |
67 | -+++ linux-5.9-rc6/include/linux/sched.h | |
66 | +--- linux-5.9.1.orig/include/linux/sched.h | |
67 | ++++ linux-5.9.1/include/linux/sched.h | |
68 | 68 | @@ -41,6 +41,7 @@ struct backing_dev_info; |
69 | 69 | struct bio_list; |
70 | 70 | struct blk_plug; |
@@ -84,8 +84,8 @@ | ||
84 | 84 | |
85 | 85 | #ifdef CONFIG_GCC_PLUGIN_STACKLEAK |
86 | 86 | unsigned long lowest_stack; |
87 | ---- linux-5.9-rc6.orig/include/linux/security.h | |
88 | -+++ linux-5.9-rc6/include/linux/security.h | |
87 | +--- linux-5.9.1.orig/include/linux/security.h | |
88 | ++++ linux-5.9.1/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-rc6.orig/include/net/ip.h | |
319 | -+++ linux-5.9-rc6/include/net/ip.h | |
318 | +--- linux-5.9.1.orig/include/net/ip.h | |
319 | ++++ linux-5.9.1/include/net/ip.h | |
320 | 320 | @@ -338,6 +338,8 @@ void inet_get_local_port_range(struct ne |
321 | 321 | #ifdef CONFIG_SYSCTL |
322 | 322 | static inline bool inet_is_local_reserved_port(struct net *net, unsigned short port) |
@@ -335,8 +335,8 @@ | ||
335 | 335 | return false; |
336 | 336 | } |
337 | 337 | |
338 | ---- linux-5.9-rc6.orig/init/init_task.c | |
339 | -+++ linux-5.9-rc6/init/init_task.c | |
338 | +--- linux-5.9.1.orig/init/init_task.c | |
339 | ++++ linux-5.9.1/init/init_task.c | |
340 | 340 | @@ -209,6 +209,10 @@ struct task_struct init_task |
341 | 341 | #ifdef CONFIG_SECCOMP |
342 | 342 | .seccomp = { .filter_count = ATOMIC_INIT(0) }, |
@@ -348,8 +348,8 @@ | ||
348 | 348 | }; |
349 | 349 | EXPORT_SYMBOL(init_task); |
350 | 350 | |
351 | ---- linux-5.9-rc6.orig/kernel/kexec.c | |
352 | -+++ linux-5.9-rc6/kernel/kexec.c | |
351 | +--- linux-5.9.1.orig/kernel/kexec.c | |
352 | ++++ linux-5.9.1/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-rc6.orig/kernel/module.c | |
372 | -+++ linux-5.9-rc6/kernel/module.c | |
371 | +--- linux-5.9.1.orig/kernel/module.c | |
372 | ++++ linux-5.9.1/kernel/module.c | |
373 | 373 | @@ -58,6 +58,7 @@ |
374 | 374 | #include <linux/audit.h> |
375 | 375 | #include <uapi/linux/module.h> |
@@ -396,8 +396,8 @@ | ||
396 | 396 | |
397 | 397 | return 0; |
398 | 398 | } |
399 | ---- linux-5.9-rc6.orig/kernel/ptrace.c | |
400 | -+++ linux-5.9-rc6/kernel/ptrace.c | |
399 | +--- linux-5.9.1.orig/kernel/ptrace.c | |
400 | ++++ linux-5.9.1/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-rc6.orig/kernel/reboot.c | |
426 | -+++ linux-5.9-rc6/kernel/reboot.c | |
425 | +--- linux-5.9.1.orig/kernel/reboot.c | |
426 | ++++ linux-5.9.1/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-rc6.orig/kernel/sched/core.c | |
445 | -+++ linux-5.9-rc6/kernel/sched/core.c | |
444 | +--- linux-5.9.1.orig/kernel/sched/core.c | |
445 | ++++ linux-5.9.1/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-rc6.orig/kernel/signal.c | |
456 | -+++ linux-5.9-rc6/kernel/signal.c | |
455 | +--- linux-5.9.1.orig/kernel/signal.c | |
456 | ++++ linux-5.9.1/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-rc6.orig/kernel/sys.c | |
525 | -+++ linux-5.9-rc6/kernel/sys.c | |
524 | +--- linux-5.9.1.orig/kernel/sys.c | |
525 | ++++ linux-5.9.1/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-rc6.orig/kernel/time/timekeeping.c | |
556 | -+++ linux-5.9-rc6/kernel/time/timekeeping.c | |
555 | +--- linux-5.9.1.orig/kernel/time/timekeeping.c | |
556 | ++++ linux-5.9.1/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-rc6.orig/net/ipv4/raw.c | |
591 | -+++ linux-5.9-rc6/net/ipv4/raw.c | |
590 | +--- linux-5.9.1.orig/net/ipv4/raw.c | |
591 | ++++ linux-5.9.1/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-rc6.orig/net/ipv4/udp.c | |
604 | -+++ linux-5.9-rc6/net/ipv4/udp.c | |
603 | +--- linux-5.9.1.orig/net/ipv4/udp.c | |
604 | ++++ linux-5.9.1/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-rc6.orig/net/ipv6/raw.c | |
615 | -+++ linux-5.9-rc6/net/ipv6/raw.c | |
614 | +--- linux-5.9.1.orig/net/ipv6/raw.c | |
615 | ++++ linux-5.9.1/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-rc6.orig/net/ipv6/udp.c | |
628 | -+++ linux-5.9-rc6/net/ipv6/udp.c | |
627 | +--- linux-5.9.1.orig/net/ipv6/udp.c | |
628 | ++++ linux-5.9.1/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-rc6.orig/net/socket.c | |
639 | -+++ linux-5.9-rc6/net/socket.c | |
638 | +--- linux-5.9.1.orig/net/socket.c | |
639 | ++++ linux-5.9.1/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-rc6.orig/net/unix/af_unix.c | |
652 | -+++ linux-5.9-rc6/net/unix/af_unix.c | |
651 | +--- linux-5.9.1.orig/net/unix/af_unix.c | |
652 | ++++ linux-5.9.1/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-rc6.orig/security/Kconfig | |
673 | -+++ linux-5.9-rc6/security/Kconfig | |
672 | +--- linux-5.9.1.orig/security/Kconfig | |
673 | ++++ linux-5.9.1/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-rc6.orig/security/Makefile | |
683 | -+++ linux-5.9-rc6/security/Makefile | |
682 | +--- linux-5.9.1.orig/security/Makefile | |
683 | ++++ linux-5.9.1/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-rc6.orig/security/security.c | |
692 | -+++ linux-5.9-rc6/security/security.c | |
691 | +--- linux-5.9.1.orig/security/security.c | |
692 | ++++ linux-5.9.1/security/security.c | |
693 | 693 | @@ -1584,7 +1584,9 @@ int security_task_alloc(struct task_stru |
694 | 694 | |
695 | 695 | if (rc) |
@@ -12,6 +12,9 @@ | ||
12 | 12 | #include <linux/nsproxy.h> |
13 | 13 | #include <linux/mnt_namespace.h> |
14 | 14 | #endif |
15 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0) | |
16 | +#include <linux/proc_fs.h> | |
17 | +#endif | |
15 | 18 | |
16 | 19 | /***** SECTION1: Constants definition *****/ |
17 | 20 |
@@ -326,7 +329,16 @@ | ||
326 | 329 | char *ep; |
327 | 330 | const pid_t pid = (pid_t) simple_strtoul(pos + 1, &ep, 10); |
328 | 331 | |
332 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0) | |
329 | 333 | if (*ep == '/' && pid && pid == |
334 | + task_tgid_nr_ns(current, proc_pid_ns(sb)) { | |
335 | + pos = ep - 5; | |
336 | + if (pos < buffer) | |
337 | + goto out; | |
338 | + memmove(pos, "/self", 5); | |
339 | + } | |
340 | +#else | |
341 | + if (*ep == '/' && pid && pid == | |
330 | 342 | task_tgid_nr_ns(current, sb->s_fs_info)) { |
331 | 343 | pos = ep - 5; |
332 | 344 | if (pos < buffer) |
@@ -333,6 +345,7 @@ | ||
333 | 345 | goto out; |
334 | 346 | memmove(pos, "/self", 5); |
335 | 347 | } |
348 | +#endif | |
336 | 349 | goto prepend_filesystem_name; |
337 | 350 | } |
338 | 351 | /* Use filesystem name for unnamed devices. */ |