(empty log message)
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 5.12-rc2. | |
1 | +This is TOMOYO Linux patch for kernel 5.12-rc3. | |
2 | 2 | |
3 | -Source code for this patch is https://git.kernel.org/torvalds/t/linux-5.12-rc2.tar.gz | |
3 | +Source code for this patch is https://git.kernel.org/torvalds/t/linux-5.12-rc3.tar.gz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 - |
6 | 6 | fs/open.c | 2 + |
@@ -28,8 +28,8 @@ | ||
28 | 28 | security/security.c | 5 ++- |
29 | 29 | 24 files changed, 160 insertions(+), 30 deletions(-) |
30 | 30 | |
31 | ---- linux-5.12-rc2.orig/fs/exec.c | |
32 | -+++ linux-5.12-rc2/fs/exec.c | |
31 | +--- linux-5.12-rc3.orig/fs/exec.c | |
32 | ++++ linux-5.12-rc3/fs/exec.c | |
33 | 33 | @@ -1827,7 +1827,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.12-rc2.orig/fs/open.c | |
43 | -+++ linux-5.12-rc2/fs/open.c | |
42 | +--- linux-5.12-rc3.orig/fs/open.c | |
43 | ++++ linux-5.12-rc3/fs/open.c | |
44 | 44 | @@ -1346,6 +1346,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.12-rc2.orig/fs/proc/version.c | |
54 | -+++ linux-5.12-rc2/fs/proc/version.c | |
53 | +--- linux-5.12-rc3.orig/fs/proc/version.c | |
54 | ++++ linux-5.12-rc3/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.12-rc2 2021/03/13\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 5.12-rc3 2021/03/16\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-5.12-rc2.orig/include/linux/sched.h | |
67 | -+++ linux-5.12-rc2/include/linux/sched.h | |
66 | +--- linux-5.12-rc3.orig/include/linux/sched.h | |
67 | ++++ linux-5.12-rc3/include/linux/sched.h | |
68 | 68 | @@ -43,6 +43,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.12-rc2.orig/include/linux/security.h | |
88 | -+++ linux-5.12-rc2/include/linux/security.h | |
87 | +--- linux-5.12-rc3.orig/include/linux/security.h | |
88 | ++++ linux-5.12-rc3/include/linux/security.h | |
89 | 89 | @@ -59,6 +59,7 @@ struct fs_parameter; |
90 | 90 | enum fs_value_type; |
91 | 91 | struct watch; |
@@ -315,8 +315,8 @@ | ||
315 | 315 | } |
316 | 316 | #endif /* CONFIG_SECURITY_PATH */ |
317 | 317 | |
318 | ---- linux-5.12-rc2.orig/include/net/ip.h | |
319 | -+++ linux-5.12-rc2/include/net/ip.h | |
318 | +--- linux-5.12-rc3.orig/include/net/ip.h | |
319 | ++++ linux-5.12-rc3/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.12-rc2.orig/init/init_task.c | |
339 | -+++ linux-5.12-rc2/init/init_task.c | |
338 | +--- linux-5.12-rc3.orig/init/init_task.c | |
339 | ++++ linux-5.12-rc3/init/init_task.c | |
340 | 340 | @@ -213,6 +213,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.12-rc2.orig/kernel/kexec.c | |
352 | -+++ linux-5.12-rc2/kernel/kexec.c | |
351 | +--- linux-5.12-rc3.orig/kernel/kexec.c | |
352 | ++++ linux-5.12-rc3/kernel/kexec.c | |
353 | 353 | @@ -16,7 +16,7 @@ |
354 | 354 | #include <linux/syscalls.h> |
355 | 355 | #include <linux/vmalloc.h> |
@@ -368,8 +368,8 @@ | ||
368 | 368 | |
369 | 369 | /* Permit LSMs and IMA to fail the kexec */ |
370 | 370 | result = security_kernel_load_data(LOADING_KEXEC_IMAGE, false); |
371 | ---- linux-5.12-rc2.orig/kernel/module.c | |
372 | -+++ linux-5.12-rc2/kernel/module.c | |
371 | +--- linux-5.12-rc3.orig/kernel/module.c | |
372 | ++++ linux-5.12-rc3/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.12-rc2.orig/kernel/ptrace.c | |
400 | -+++ linux-5.12-rc2/kernel/ptrace.c | |
399 | +--- linux-5.12-rc3.orig/kernel/ptrace.c | |
400 | ++++ linux-5.12-rc3/kernel/ptrace.c | |
401 | 401 | @@ -1238,6 +1238,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l |
402 | 402 | { |
403 | 403 | struct task_struct *child; |
@@ -422,8 +422,8 @@ | ||
422 | 422 | |
423 | 423 | if (request == PTRACE_TRACEME) { |
424 | 424 | ret = ptrace_traceme(); |
425 | ---- linux-5.12-rc2.orig/kernel/reboot.c | |
426 | -+++ linux-5.12-rc2/kernel/reboot.c | |
425 | +--- linux-5.12-rc3.orig/kernel/reboot.c | |
426 | ++++ linux-5.12-rc3/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.12-rc2.orig/kernel/sched/core.c | |
445 | -+++ linux-5.12-rc2/kernel/sched/core.c | |
446 | -@@ -5780,6 +5780,8 @@ int can_nice(const struct task_struct *p | |
444 | +--- linux-5.12-rc3.orig/kernel/sched/core.c | |
445 | ++++ linux-5.12-rc3/kernel/sched/core.c | |
446 | +@@ -5778,6 +5778,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.12-rc2.orig/kernel/signal.c | |
456 | -+++ linux-5.12-rc2/kernel/signal.c | |
455 | +--- linux-5.12-rc3.orig/kernel/signal.c | |
456 | ++++ linux-5.12-rc3/kernel/signal.c | |
457 | 457 | @@ -3677,6 +3677,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.12-rc2.orig/kernel/sys.c | |
525 | -+++ linux-5.12-rc2/kernel/sys.c | |
524 | +--- linux-5.12-rc3.orig/kernel/sys.c | |
525 | ++++ linux-5.12-rc3/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.12-rc2.orig/kernel/time/timekeeping.c | |
556 | -+++ linux-5.12-rc2/kernel/time/timekeeping.c | |
555 | +--- linux-5.12-rc3.orig/kernel/time/timekeeping.c | |
556 | ++++ linux-5.12-rc3/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.12-rc2.orig/net/ipv4/raw.c | |
591 | -+++ linux-5.12-rc2/net/ipv4/raw.c | |
590 | +--- linux-5.12-rc3.orig/net/ipv4/raw.c | |
591 | ++++ linux-5.12-rc3/net/ipv4/raw.c | |
592 | 592 | @@ -768,6 +768,10 @@ static int raw_recvmsg(struct sock *sk, |
593 | 593 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
594 | 594 | if (!skb) |
@@ -600,8 +600,8 @@ | ||
600 | 600 | |
601 | 601 | copied = skb->len; |
602 | 602 | if (len < copied) { |
603 | ---- linux-5.12-rc2.orig/net/ipv4/udp.c | |
604 | -+++ linux-5.12-rc2/net/ipv4/udp.c | |
603 | +--- linux-5.12-rc3.orig/net/ipv4/udp.c | |
604 | ++++ linux-5.12-rc3/net/ipv4/udp.c | |
605 | 605 | @@ -1806,6 +1806,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.12-rc2.orig/net/ipv6/raw.c | |
615 | -+++ linux-5.12-rc2/net/ipv6/raw.c | |
614 | +--- linux-5.12-rc3.orig/net/ipv6/raw.c | |
615 | ++++ linux-5.12-rc3/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.12-rc2.orig/net/ipv6/udp.c | |
628 | -+++ linux-5.12-rc2/net/ipv6/udp.c | |
627 | +--- linux-5.12-rc3.orig/net/ipv6/udp.c | |
628 | ++++ linux-5.12-rc3/net/ipv6/udp.c | |
629 | 629 | @@ -342,6 +342,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.12-rc2.orig/net/socket.c | |
639 | -+++ linux-5.12-rc2/net/socket.c | |
638 | +--- linux-5.12-rc3.orig/net/socket.c | |
639 | ++++ linux-5.12-rc3/net/socket.c | |
640 | 640 | @@ -1738,6 +1738,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.12-rc2.orig/net/unix/af_unix.c | |
652 | -+++ linux-5.12-rc2/net/unix/af_unix.c | |
651 | +--- linux-5.12-rc3.orig/net/unix/af_unix.c | |
652 | ++++ linux-5.12-rc3/net/unix/af_unix.c | |
653 | 653 | @@ -2128,6 +2128,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.12-rc2.orig/security/Kconfig | |
673 | -+++ linux-5.12-rc2/security/Kconfig | |
672 | +--- linux-5.12-rc3.orig/security/Kconfig | |
673 | ++++ linux-5.12-rc3/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.12-rc2.orig/security/Makefile | |
683 | -+++ linux-5.12-rc2/security/Makefile | |
682 | +--- linux-5.12-rc3.orig/security/Makefile | |
683 | ++++ linux-5.12-rc3/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.12-rc2.orig/security/security.c | |
692 | -+++ linux-5.12-rc2/security/security.c | |
691 | +--- linux-5.12-rc3.orig/security/security.c | |
692 | ++++ linux-5.12-rc3/security/security.c | |
693 | 693 | @@ -1599,7 +1599,9 @@ int security_task_alloc(struct task_stru |
694 | 694 | |
695 | 695 | if (rc) |