(メッセージはありません)
@@ -18,9 +18,9 @@ | ||
18 | 18 | rpm -ivh kernel-2.6.18-128.7.1.el5.src.rpm || die "Can't install source package." |
19 | 19 | |
20 | 20 | cd /usr/src/redhat/SOURCES/ || die "Can't chdir to /usr/src/redhat/SOURCES/ ." |
21 | -if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ] | |
21 | +if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ] | |
22 | 22 | then |
23 | - wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch." | |
23 | + wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch." | |
24 | 24 | fi |
25 | 25 | |
26 | 26 | if [ ! -r ccs-patch-2.6.18-centos-5.3-20110614.diff ] |
@@ -38,7 +38,7 @@ | ||
38 | 38 | # by setting the define to ".local" or ".bz123456" |
39 | 39 | # |
40 | 40 | -#% define buildid |
41 | -+%define buildid _tomoyo_1.8.7p2 | |
41 | ++%define buildid _tomoyo_1.8.8 | |
42 | 42 | # |
43 | 43 | %define sublevel 18 |
44 | 44 | %define kversion 2.6.%{sublevel} |
@@ -66,7 +66,7 @@ | ||
66 | 66 | # END OF PATCH APPLICATIONS |
67 | 67 | |
68 | 68 | +# TOMOYO Linux |
69 | -+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz | |
69 | ++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz | |
70 | 70 | +patch -sp1 < %_sourcedir/ccs-patch-2.6.18-centos-5.3-20110614.diff |
71 | 71 | + |
72 | 72 | cp %{SOURCE10} Documentation/ |
@@ -18,9 +18,9 @@ | ||
18 | 18 | rpm -ivh kernel-2.6.33.3-85.fc13.src.rpm || die "Can't install source package." |
19 | 19 | |
20 | 20 | cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ." |
21 | -if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ] | |
21 | +if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ] | |
22 | 22 | then |
23 | - wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch." | |
23 | + wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch." | |
24 | 24 | fi |
25 | 25 | |
26 | 26 | if [ ! -r ccs-patch-2.6.33-fedora-13-20110614.diff ] |
@@ -38,7 +38,7 @@ | ||
38 | 38 | # (Uncomment the '#' and both spaces below to set the buildid.) |
39 | 39 | # |
40 | 40 | -# % define buildid .local |
41 | -+%define buildid _tomoyo_1.8.7p2 | |
41 | ++%define buildid _tomoyo_1.8.8 | |
42 | 42 | ################################################################### |
43 | 43 | |
44 | 44 | # buildid can also be specified on the rpmbuild command line |
@@ -77,7 +77,7 @@ | ||
77 | 77 | # END OF PATCH APPLICATIONS |
78 | 78 | |
79 | 79 | +# TOMOYO Linux |
80 | -+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz | |
80 | ++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz | |
81 | 81 | +patch -sp1 < %_sourcedir/ccs-patch-2.6.33-fedora-13-20110614.diff |
82 | 82 | + |
83 | 83 | %endif |
@@ -3,7 +3,7 @@ | ||
3 | 3 | * |
4 | 4 | * Copyright (C) 2005-2012 NTT DATA CORPORATION |
5 | 5 | * |
6 | - * Version: 1.8.7 2020/05/05 | |
6 | + * Version: 1.8.8 2020/11/11 | |
7 | 7 | */ |
8 | 8 | |
9 | 9 | #ifndef _LINUX_CCSECURITY_H |
@@ -3,7 +3,7 @@ | ||
3 | 3 | * |
4 | 4 | * Copyright (C) 2005-2012 NTT DATA CORPORATION |
5 | 5 | * |
6 | - * Version: 1.8.7 2020/05/05 | |
6 | + * Version: 1.8.8 2020/11/11 | |
7 | 7 | */ |
8 | 8 | |
9 | 9 | #ifndef _LINUX_LSM2CCSECURITY_H |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 4.14.205. | |
1 | +This is TOMOYO Linux patch for kernel 4.14.206. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.205.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.206.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.205.orig/fs/exec.c | |
32 | -+++ linux-4.14.205/fs/exec.c | |
31 | +--- linux-4.14.206.orig/fs/exec.c | |
32 | ++++ linux-4.14.206/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.205.orig/fs/open.c | |
43 | -+++ linux-4.14.205/fs/open.c | |
42 | +--- linux-4.14.206.orig/fs/open.c | |
43 | ++++ linux-4.14.206/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.205.orig/fs/proc/version.c | |
54 | -+++ linux-4.14.205/fs/proc/version.c | |
53 | +--- linux-4.14.206.orig/fs/proc/version.c | |
54 | ++++ linux-4.14.206/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.205 2020/11/10\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.14.206 2020/11/11\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-4.14.205.orig/include/linux/init_task.h | |
67 | -+++ linux-4.14.205/include/linux/init_task.h | |
66 | +--- linux-4.14.206.orig/include/linux/init_task.h | |
67 | ++++ linux-4.14.206/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.205.orig/include/linux/sched.h | |
92 | -+++ linux-4.14.205/include/linux/sched.h | |
91 | +--- linux-4.14.206.orig/include/linux/sched.h | |
92 | ++++ linux-4.14.206/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.205.orig/include/linux/security.h | |
113 | -+++ linux-4.14.205/include/linux/security.h | |
112 | +--- linux-4.14.206.orig/include/linux/security.h | |
113 | ++++ linux-4.14.206/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.205.orig/include/net/ip.h | |
335 | -+++ linux-4.14.205/include/net/ip.h | |
334 | +--- linux-4.14.206.orig/include/net/ip.h | |
335 | ++++ linux-4.14.206/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.205.orig/kernel/kexec.c | |
355 | -+++ linux-4.14.205/kernel/kexec.c | |
354 | +--- linux-4.14.206.orig/kernel/kexec.c | |
355 | ++++ linux-4.14.206/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.205.orig/kernel/module.c | |
375 | -+++ linux-4.14.205/kernel/module.c | |
374 | +--- linux-4.14.206.orig/kernel/module.c | |
375 | ++++ linux-4.14.206/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.205.orig/kernel/ptrace.c | |
403 | -+++ linux-4.14.205/kernel/ptrace.c | |
402 | +--- linux-4.14.206.orig/kernel/ptrace.c | |
403 | ++++ linux-4.14.206/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.205.orig/kernel/reboot.c | |
429 | -+++ linux-4.14.205/kernel/reboot.c | |
428 | +--- linux-4.14.206.orig/kernel/reboot.c | |
429 | ++++ linux-4.14.206/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.205.orig/kernel/sched/core.c | |
448 | -+++ linux-4.14.205/kernel/sched/core.c | |
447 | +--- linux-4.14.206.orig/kernel/sched/core.c | |
448 | ++++ linux-4.14.206/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.205.orig/kernel/signal.c | |
459 | -+++ linux-4.14.205/kernel/signal.c | |
458 | +--- linux-4.14.206.orig/kernel/signal.c | |
459 | ++++ linux-4.14.206/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.205.orig/kernel/sys.c | |
506 | -+++ linux-4.14.205/kernel/sys.c | |
505 | +--- linux-4.14.206.orig/kernel/sys.c | |
506 | ++++ linux-4.14.206/kernel/sys.c | |
507 | 507 | @@ -193,6 +193,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
508 | 508 | |
509 | 509 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -533,8 +533,8 @@ | ||
533 | 533 | |
534 | 534 | errno = -EFAULT; |
535 | 535 | if (!copy_from_user(tmp, name, len)) { |
536 | ---- linux-4.14.205.orig/kernel/time/ntp.c | |
537 | -+++ linux-4.14.205/kernel/time/ntp.c | |
536 | +--- linux-4.14.206.orig/kernel/time/ntp.c | |
537 | ++++ linux-4.14.206/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.205.orig/net/ipv4/raw.c | |
572 | -+++ linux-4.14.205/net/ipv4/raw.c | |
571 | +--- linux-4.14.206.orig/net/ipv4/raw.c | |
572 | ++++ linux-4.14.206/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.205.orig/net/ipv4/udp.c | |
585 | -+++ linux-4.14.205/net/ipv4/udp.c | |
584 | +--- linux-4.14.206.orig/net/ipv4/udp.c | |
585 | ++++ linux-4.14.206/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.205.orig/net/ipv6/raw.c | |
596 | -+++ linux-4.14.205/net/ipv6/raw.c | |
595 | +--- linux-4.14.206.orig/net/ipv6/raw.c | |
596 | ++++ linux-4.14.206/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.205.orig/net/ipv6/udp.c | |
609 | -+++ linux-4.14.205/net/ipv6/udp.c | |
608 | +--- linux-4.14.206.orig/net/ipv6/udp.c | |
609 | ++++ linux-4.14.206/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.205.orig/net/socket.c | |
620 | -+++ linux-4.14.205/net/socket.c | |
619 | +--- linux-4.14.206.orig/net/socket.c | |
620 | ++++ linux-4.14.206/net/socket.c | |
621 | 621 | @@ -1588,6 +1588,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct |
622 | 622 | if (err < 0) |
623 | 623 | goto out_fd; |
@@ -629,8 +629,8 @@ | ||
629 | 629 | if (upeer_sockaddr) { |
630 | 630 | if (newsock->ops->getname(newsock, (struct sockaddr *)&address, |
631 | 631 | &len, 2) < 0) { |
632 | ---- linux-4.14.205.orig/net/unix/af_unix.c | |
633 | -+++ linux-4.14.205/net/unix/af_unix.c | |
632 | +--- linux-4.14.206.orig/net/unix/af_unix.c | |
633 | ++++ linux-4.14.206/net/unix/af_unix.c | |
634 | 634 | @@ -2162,6 +2162,10 @@ static int unix_dgram_recvmsg(struct soc |
635 | 635 | POLLOUT | POLLWRNORM | |
636 | 636 | POLLWRBAND); |
@@ -650,8 +650,8 @@ | ||
650 | 650 | mutex_unlock(&u->iolock); |
651 | 651 | out: |
652 | 652 | return err; |
653 | ---- linux-4.14.205.orig/security/Kconfig | |
654 | -+++ linux-4.14.205/security/Kconfig | |
653 | +--- linux-4.14.206.orig/security/Kconfig | |
654 | ++++ linux-4.14.206/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.205.orig/security/Makefile | |
664 | -+++ linux-4.14.205/security/Makefile | |
663 | +--- linux-4.14.206.orig/security/Makefile | |
664 | ++++ linux-4.14.206/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.205.orig/security/security.c | |
673 | -+++ linux-4.14.205/security/security.c | |
672 | +--- linux-4.14.206.orig/security/security.c | |
673 | ++++ linux-4.14.206/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.155. | |
1 | +This is TOMOYO Linux patch for kernel 4.19.157. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.155.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.157.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.155.orig/fs/exec.c | |
32 | -+++ linux-4.19.155/fs/exec.c | |
31 | +--- linux-4.19.157.orig/fs/exec.c | |
32 | ++++ linux-4.19.157/fs/exec.c | |
33 | 33 | @@ -1707,7 +1707,7 @@ static int exec_binprm(struct linux_binp |
34 | 34 | old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent)); |
35 | 35 | rcu_read_unlock(); |
@@ -39,8 +39,8 @@ | ||
39 | 39 | if (ret >= 0) { |
40 | 40 | audit_bprm(bprm); |
41 | 41 | trace_sched_process_exec(current, old_pid, bprm); |
42 | ---- linux-4.19.155.orig/fs/open.c | |
43 | -+++ linux-4.19.155/fs/open.c | |
42 | +--- linux-4.19.157.orig/fs/open.c | |
43 | ++++ linux-4.19.157/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.155.orig/fs/proc/version.c | |
54 | -+++ linux-4.19.155/fs/proc/version.c | |
53 | +--- linux-4.19.157.orig/fs/proc/version.c | |
54 | ++++ linux-4.19.157/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.155 2020/11/10\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.19.157 2020/11/11\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-4.19.155.orig/include/linux/sched.h | |
67 | -+++ linux-4.19.155/include/linux/sched.h | |
66 | +--- linux-4.19.157.orig/include/linux/sched.h | |
67 | ++++ linux-4.19.157/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.155.orig/include/linux/security.h | |
88 | -+++ linux-4.19.155/include/linux/security.h | |
87 | +--- linux-4.19.157.orig/include/linux/security.h | |
88 | ++++ linux-4.19.157/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.155.orig/include/net/ip.h | |
310 | -+++ linux-4.19.155/include/net/ip.h | |
309 | +--- linux-4.19.157.orig/include/net/ip.h | |
310 | ++++ linux-4.19.157/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.155.orig/init/init_task.c | |
330 | -+++ linux-4.19.155/init/init_task.c | |
329 | +--- linux-4.19.157.orig/init/init_task.c | |
330 | ++++ linux-4.19.157/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.155.orig/kernel/kexec.c | |
343 | -+++ linux-4.19.155/kernel/kexec.c | |
342 | +--- linux-4.19.157.orig/kernel/kexec.c | |
343 | ++++ linux-4.19.157/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.155.orig/kernel/module.c | |
363 | -+++ linux-4.19.155/kernel/module.c | |
362 | +--- linux-4.19.157.orig/kernel/module.c | |
363 | ++++ linux-4.19.157/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.155.orig/kernel/ptrace.c | |
391 | -+++ linux-4.19.155/kernel/ptrace.c | |
390 | +--- linux-4.19.157.orig/kernel/ptrace.c | |
391 | ++++ linux-4.19.157/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.155.orig/kernel/reboot.c | |
417 | -+++ linux-4.19.155/kernel/reboot.c | |
416 | +--- linux-4.19.157.orig/kernel/reboot.c | |
417 | ++++ linux-4.19.157/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.155.orig/kernel/sched/core.c | |
436 | -+++ linux-4.19.155/kernel/sched/core.c | |
435 | +--- linux-4.19.157.orig/kernel/sched/core.c | |
436 | ++++ linux-4.19.157/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,9 +443,9 @@ | ||
443 | 443 | |
444 | 444 | /* |
445 | 445 | * Setpriority might change our priority at the same moment. |
446 | ---- linux-4.19.155.orig/kernel/signal.c | |
447 | -+++ linux-4.19.155/kernel/signal.c | |
448 | -@@ -3285,6 +3285,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait, | |
446 | +--- linux-4.19.157.orig/kernel/signal.c | |
447 | ++++ linux-4.19.157/kernel/signal.c | |
448 | +@@ -3286,6 +3286,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait, | |
449 | 449 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
450 | 450 | { |
451 | 451 | struct siginfo info; |
@@ -454,7 +454,7 @@ | ||
454 | 454 | |
455 | 455 | clear_siginfo(&info); |
456 | 456 | info.si_signo = sig; |
457 | -@@ -3355,6 +3357,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid | |
457 | +@@ -3356,6 +3358,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid | |
458 | 458 | /* This is only valid for single tasks */ |
459 | 459 | if (pid <= 0 || tgid <= 0) |
460 | 460 | return -EINVAL; |
@@ -463,7 +463,7 @@ | ||
463 | 463 | |
464 | 464 | return do_tkill(tgid, pid, sig); |
465 | 465 | } |
466 | -@@ -3371,6 +3375,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int, | |
466 | +@@ -3372,6 +3376,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int, | |
467 | 467 | /* This is only valid for single tasks */ |
468 | 468 | if (pid <= 0) |
469 | 469 | return -EINVAL; |
@@ -472,7 +472,7 @@ | ||
472 | 472 | |
473 | 473 | return do_tkill(0, pid, sig); |
474 | 474 | } |
475 | -@@ -3385,6 +3391,8 @@ static int do_rt_sigqueueinfo(pid_t pid, | |
475 | +@@ -3386,6 +3392,8 @@ static int do_rt_sigqueueinfo(pid_t pid, | |
476 | 476 | return -EPERM; |
477 | 477 | |
478 | 478 | info->si_signo = sig; |
@@ -481,7 +481,7 @@ | ||
481 | 481 | |
482 | 482 | /* POSIX.1b doesn't mention process groups. */ |
483 | 483 | return kill_proc_info(sig, info, pid); |
484 | -@@ -3433,6 +3441,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg | |
484 | +@@ -3434,6 +3442,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg | |
485 | 485 | return -EPERM; |
486 | 486 | |
487 | 487 | info->si_signo = sig; |
@@ -490,8 +490,8 @@ | ||
490 | 490 | |
491 | 491 | return do_send_specific(tgid, pid, sig, info); |
492 | 492 | } |
493 | ---- linux-4.19.155.orig/kernel/sys.c | |
494 | -+++ linux-4.19.155/kernel/sys.c | |
493 | +--- linux-4.19.157.orig/kernel/sys.c | |
494 | ++++ linux-4.19.157/kernel/sys.c | |
495 | 495 | @@ -201,6 +201,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
496 | 496 | |
497 | 497 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -521,8 +521,8 @@ | ||
521 | 521 | |
522 | 522 | errno = -EFAULT; |
523 | 523 | if (!copy_from_user(tmp, name, len)) { |
524 | ---- linux-4.19.155.orig/kernel/time/timekeeping.c | |
525 | -+++ linux-4.19.155/kernel/time/timekeeping.c | |
524 | +--- linux-4.19.157.orig/kernel/time/timekeeping.c | |
525 | ++++ linux-4.19.157/kernel/time/timekeeping.c | |
526 | 526 | @@ -26,6 +26,7 @@ |
527 | 527 | #include <linux/stop_machine.h> |
528 | 528 | #include <linux/pvclock_gtod.h> |
@@ -556,8 +556,8 @@ | ||
556 | 556 | |
557 | 557 | /* |
558 | 558 | * Validate if a timespec/timeval used to inject a time |
559 | ---- linux-4.19.155.orig/net/ipv4/raw.c | |
560 | -+++ linux-4.19.155/net/ipv4/raw.c | |
559 | +--- linux-4.19.157.orig/net/ipv4/raw.c | |
560 | ++++ linux-4.19.157/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.155.orig/net/ipv4/udp.c | |
573 | -+++ linux-4.19.155/net/ipv4/udp.c | |
572 | +--- linux-4.19.157.orig/net/ipv4/udp.c | |
573 | ++++ linux-4.19.157/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.155.orig/net/ipv6/raw.c | |
584 | -+++ linux-4.19.155/net/ipv6/raw.c | |
583 | +--- linux-4.19.157.orig/net/ipv6/raw.c | |
584 | ++++ linux-4.19.157/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.155.orig/net/ipv6/udp.c | |
597 | -+++ linux-4.19.155/net/ipv6/udp.c | |
596 | +--- linux-4.19.157.orig/net/ipv6/udp.c | |
597 | ++++ linux-4.19.157/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.155.orig/net/socket.c | |
608 | -+++ linux-4.19.155/net/socket.c | |
607 | +--- linux-4.19.157.orig/net/socket.c | |
608 | ++++ linux-4.19.157/net/socket.c | |
609 | 609 | @@ -1590,6 +1590,10 @@ int __sys_accept4(int fd, struct sockadd |
610 | 610 | if (err < 0) |
611 | 611 | goto out_fd; |
@@ -617,8 +617,8 @@ | ||
617 | 617 | if (upeer_sockaddr) { |
618 | 618 | len = newsock->ops->getname(newsock, |
619 | 619 | (struct sockaddr *)&address, 2); |
620 | ---- linux-4.19.155.orig/net/unix/af_unix.c | |
621 | -+++ linux-4.19.155/net/unix/af_unix.c | |
620 | +--- linux-4.19.157.orig/net/unix/af_unix.c | |
621 | ++++ linux-4.19.157/net/unix/af_unix.c | |
622 | 622 | @@ -2158,6 +2158,10 @@ static int unix_dgram_recvmsg(struct soc |
623 | 623 | EPOLLOUT | EPOLLWRNORM | |
624 | 624 | EPOLLWRBAND); |
@@ -638,8 +638,8 @@ | ||
638 | 638 | mutex_unlock(&u->iolock); |
639 | 639 | out: |
640 | 640 | return err; |
641 | ---- linux-4.19.155.orig/security/Kconfig | |
642 | -+++ linux-4.19.155/security/Kconfig | |
641 | +--- linux-4.19.157.orig/security/Kconfig | |
642 | ++++ linux-4.19.157/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.155.orig/security/Makefile | |
652 | -+++ linux-4.19.155/security/Makefile | |
651 | +--- linux-4.19.157.orig/security/Makefile | |
652 | ++++ linux-4.19.157/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.155.orig/security/security.c | |
661 | -+++ linux-4.19.155/security/security.c | |
660 | +--- linux-4.19.157.orig/security/security.c | |
661 | ++++ linux-4.19.157/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.242. | |
1 | +This is TOMOYO Linux patch for kernel 4.4.243. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.242.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.243.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.242.orig/fs/exec.c | |
32 | -+++ linux-4.4.242/fs/exec.c | |
31 | +--- linux-4.4.243.orig/fs/exec.c | |
32 | ++++ linux-4.4.243/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.242.orig/fs/open.c | |
43 | -+++ linux-4.4.242/fs/open.c | |
42 | +--- linux-4.4.243.orig/fs/open.c | |
43 | ++++ linux-4.4.243/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.242.orig/fs/proc/version.c | |
54 | -+++ linux-4.4.242/fs/proc/version.c | |
53 | +--- linux-4.4.243.orig/fs/proc/version.c | |
54 | ++++ linux-4.4.243/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.242 2020/11/10\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.4.243 2020/11/11\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-4.4.242.orig/include/linux/init_task.h | |
67 | -+++ linux-4.4.242/include/linux/init_task.h | |
66 | +--- linux-4.4.243.orig/include/linux/init_task.h | |
67 | ++++ linux-4.4.243/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.242.orig/include/linux/sched.h | |
92 | -+++ linux-4.4.242/include/linux/sched.h | |
91 | +--- linux-4.4.243.orig/include/linux/sched.h | |
92 | ++++ linux-4.4.243/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.242.orig/include/linux/security.h | |
114 | -+++ linux-4.4.242/include/linux/security.h | |
113 | +--- linux-4.4.243.orig/include/linux/security.h | |
114 | ++++ linux-4.4.243/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.242.orig/include/net/ip.h | |
322 | -+++ linux-4.4.242/include/net/ip.h | |
321 | +--- linux-4.4.243.orig/include/net/ip.h | |
322 | ++++ linux-4.4.243/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.242.orig/kernel/fork.c | |
342 | -+++ linux-4.4.242/kernel/fork.c | |
341 | +--- linux-4.4.243.orig/kernel/fork.c | |
342 | ++++ linux-4.4.243/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.242.orig/kernel/kexec.c | |
370 | -+++ linux-4.4.242/kernel/kexec.c | |
369 | +--- linux-4.4.243.orig/kernel/kexec.c | |
370 | ++++ linux-4.4.243/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.242.orig/kernel/module.c | |
390 | -+++ linux-4.4.242/kernel/module.c | |
389 | +--- linux-4.4.243.orig/kernel/module.c | |
390 | ++++ linux-4.4.243/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.242.orig/kernel/ptrace.c | |
418 | -+++ linux-4.4.242/kernel/ptrace.c | |
417 | +--- linux-4.4.243.orig/kernel/ptrace.c | |
418 | ++++ linux-4.4.243/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.242.orig/kernel/reboot.c | |
444 | -+++ linux-4.4.242/kernel/reboot.c | |
443 | +--- linux-4.4.243.orig/kernel/reboot.c | |
444 | ++++ linux-4.4.243/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.242.orig/kernel/sched/core.c | |
463 | -+++ linux-4.4.242/kernel/sched/core.c | |
462 | +--- linux-4.4.243.orig/kernel/sched/core.c | |
463 | ++++ linux-4.4.243/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.242.orig/kernel/signal.c | |
474 | -+++ linux-4.4.242/kernel/signal.c | |
473 | +--- linux-4.4.243.orig/kernel/signal.c | |
474 | ++++ linux-4.4.243/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.242.orig/kernel/sys.c | |
521 | -+++ linux-4.4.242/kernel/sys.c | |
520 | +--- linux-4.4.243.orig/kernel/sys.c | |
521 | ++++ linux-4.4.243/kernel/sys.c | |
522 | 522 | @@ -185,6 +185,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
523 | 523 | |
524 | 524 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -548,8 +548,8 @@ | ||
548 | 548 | |
549 | 549 | errno = -EFAULT; |
550 | 550 | if (!copy_from_user(tmp, name, len)) { |
551 | ---- linux-4.4.242.orig/kernel/time/ntp.c | |
552 | -+++ linux-4.4.242/kernel/time/ntp.c | |
551 | +--- linux-4.4.243.orig/kernel/time/ntp.c | |
552 | ++++ linux-4.4.243/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.242.orig/net/ipv4/raw.c | |
587 | -+++ linux-4.4.242/net/ipv4/raw.c | |
586 | +--- linux-4.4.243.orig/net/ipv4/raw.c | |
587 | ++++ linux-4.4.243/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.242.orig/net/ipv4/udp.c | |
600 | -+++ linux-4.4.242/net/ipv4/udp.c | |
599 | +--- linux-4.4.243.orig/net/ipv4/udp.c | |
600 | ++++ linux-4.4.243/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.242.orig/net/ipv6/raw.c | |
613 | -+++ linux-4.4.242/net/ipv6/raw.c | |
612 | +--- linux-4.4.243.orig/net/ipv6/raw.c | |
613 | ++++ linux-4.4.243/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.242.orig/net/ipv6/udp.c | |
626 | -+++ linux-4.4.242/net/ipv6/udp.c | |
625 | +--- linux-4.4.243.orig/net/ipv6/udp.c | |
626 | ++++ linux-4.4.243/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.242.orig/net/socket.c | |
639 | -+++ linux-4.4.242/net/socket.c | |
638 | +--- linux-4.4.243.orig/net/socket.c | |
639 | ++++ linux-4.4.243/net/socket.c | |
640 | 640 | @@ -1465,6 +1465,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct |
641 | 641 | if (err < 0) |
642 | 642 | goto out_fd; |
@@ -648,8 +648,8 @@ | ||
648 | 648 | if (upeer_sockaddr) { |
649 | 649 | if (newsock->ops->getname(newsock, (struct sockaddr *)&address, |
650 | 650 | &len, 2) < 0) { |
651 | ---- linux-4.4.242.orig/net/unix/af_unix.c | |
652 | -+++ linux-4.4.242/net/unix/af_unix.c | |
651 | +--- linux-4.4.243.orig/net/unix/af_unix.c | |
652 | ++++ linux-4.4.243/net/unix/af_unix.c | |
653 | 653 | @@ -2160,6 +2160,10 @@ static int unix_dgram_recvmsg(struct soc |
654 | 654 | wake_up_interruptible_sync_poll(&u->peer_wait, |
655 | 655 | POLLOUT | POLLWRNORM | POLLWRBAND); |
@@ -661,8 +661,8 @@ | ||
661 | 661 | if (msg->msg_name) |
662 | 662 | unix_copy_addr(msg, skb->sk); |
663 | 663 | |
664 | ---- linux-4.4.242.orig/security/Kconfig | |
665 | -+++ linux-4.4.242/security/Kconfig | |
664 | +--- linux-4.4.243.orig/security/Kconfig | |
665 | ++++ linux-4.4.243/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.242.orig/security/Makefile | |
675 | -+++ linux-4.4.242/security/Makefile | |
674 | +--- linux-4.4.243.orig/security/Makefile | |
675 | ++++ linux-4.4.243/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.242. | |
1 | +This is TOMOYO Linux patch for kernel 4.9.243. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.242.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.243.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.242.orig/fs/exec.c | |
32 | -+++ linux-4.9.242/fs/exec.c | |
31 | +--- linux-4.9.243.orig/fs/exec.c | |
32 | ++++ linux-4.9.243/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.242.orig/fs/open.c | |
43 | -+++ linux-4.9.242/fs/open.c | |
42 | +--- linux-4.9.243.orig/fs/open.c | |
43 | ++++ linux-4.9.243/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.242.orig/fs/proc/version.c | |
54 | -+++ linux-4.9.242/fs/proc/version.c | |
53 | +--- linux-4.9.243.orig/fs/proc/version.c | |
54 | ++++ linux-4.9.243/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.242 2020/11/10\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.9.243 2020/11/11\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-4.9.242.orig/include/linux/init_task.h | |
67 | -+++ linux-4.9.242/include/linux/init_task.h | |
66 | +--- linux-4.9.243.orig/include/linux/init_task.h | |
67 | ++++ linux-4.9.243/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.242.orig/include/linux/sched.h | |
92 | -+++ linux-4.9.242/include/linux/sched.h | |
91 | +--- linux-4.9.243.orig/include/linux/sched.h | |
92 | ++++ linux-4.9.243/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.242.orig/include/linux/security.h | |
114 | -+++ linux-4.9.242/include/linux/security.h | |
113 | +--- linux-4.9.243.orig/include/linux/security.h | |
114 | ++++ linux-4.9.243/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.242.orig/include/net/ip.h | |
322 | -+++ linux-4.9.242/include/net/ip.h | |
321 | +--- linux-4.9.243.orig/include/net/ip.h | |
322 | ++++ linux-4.9.243/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.242.orig/kernel/fork.c | |
342 | -+++ linux-4.9.242/kernel/fork.c | |
341 | +--- linux-4.9.243.orig/kernel/fork.c | |
342 | ++++ linux-4.9.243/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.242.orig/kernel/kexec.c | |
370 | -+++ linux-4.9.242/kernel/kexec.c | |
369 | +--- linux-4.9.243.orig/kernel/kexec.c | |
370 | ++++ linux-4.9.243/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.242.orig/kernel/module.c | |
390 | -+++ linux-4.9.242/kernel/module.c | |
389 | +--- linux-4.9.243.orig/kernel/module.c | |
390 | ++++ linux-4.9.243/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.242.orig/kernel/ptrace.c | |
418 | -+++ linux-4.9.242/kernel/ptrace.c | |
417 | +--- linux-4.9.243.orig/kernel/ptrace.c | |
418 | ++++ linux-4.9.243/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.242.orig/kernel/reboot.c | |
444 | -+++ linux-4.9.242/kernel/reboot.c | |
443 | +--- linux-4.9.243.orig/kernel/reboot.c | |
444 | ++++ linux-4.9.243/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.242.orig/kernel/sched/core.c | |
463 | -+++ linux-4.9.242/kernel/sched/core.c | |
462 | +--- linux-4.9.243.orig/kernel/sched/core.c | |
463 | ++++ linux-4.9.243/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.242.orig/kernel/signal.c | |
474 | -+++ linux-4.9.242/kernel/signal.c | |
473 | +--- linux-4.9.243.orig/kernel/signal.c | |
474 | ++++ linux-4.9.243/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.242.orig/kernel/sys.c | |
521 | -+++ linux-4.9.242/kernel/sys.c | |
520 | +--- linux-4.9.243.orig/kernel/sys.c | |
521 | ++++ linux-4.9.243/kernel/sys.c | |
522 | 522 | @@ -185,6 +185,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
523 | 523 | |
524 | 524 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -548,8 +548,8 @@ | ||
548 | 548 | |
549 | 549 | errno = -EFAULT; |
550 | 550 | if (!copy_from_user(tmp, name, len)) { |
551 | ---- linux-4.9.242.orig/kernel/time/ntp.c | |
552 | -+++ linux-4.9.242/kernel/time/ntp.c | |
551 | +--- linux-4.9.243.orig/kernel/time/ntp.c | |
552 | ++++ linux-4.9.243/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.242.orig/net/ipv4/raw.c | |
587 | -+++ linux-4.9.242/net/ipv4/raw.c | |
586 | +--- linux-4.9.243.orig/net/ipv4/raw.c | |
587 | ++++ linux-4.9.243/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.242.orig/net/ipv4/udp.c | |
600 | -+++ linux-4.9.242/net/ipv4/udp.c | |
599 | +--- linux-4.9.243.orig/net/ipv4/udp.c | |
600 | ++++ linux-4.9.243/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.242.orig/net/ipv6/raw.c | |
611 | -+++ linux-4.9.242/net/ipv6/raw.c | |
610 | +--- linux-4.9.243.orig/net/ipv6/raw.c | |
611 | ++++ linux-4.9.243/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.242.orig/net/ipv6/udp.c | |
624 | -+++ linux-4.9.242/net/ipv6/udp.c | |
623 | +--- linux-4.9.243.orig/net/ipv6/udp.c | |
624 | ++++ linux-4.9.243/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.242.orig/net/socket.c | |
635 | -+++ linux-4.9.242/net/socket.c | |
634 | +--- linux-4.9.243.orig/net/socket.c | |
635 | ++++ linux-4.9.243/net/socket.c | |
636 | 636 | @@ -1482,6 +1482,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct |
637 | 637 | if (err < 0) |
638 | 638 | goto out_fd; |
@@ -644,8 +644,8 @@ | ||
644 | 644 | if (upeer_sockaddr) { |
645 | 645 | if (newsock->ops->getname(newsock, (struct sockaddr *)&address, |
646 | 646 | &len, 2) < 0) { |
647 | ---- linux-4.9.242.orig/net/unix/af_unix.c | |
648 | -+++ linux-4.9.242/net/unix/af_unix.c | |
647 | +--- linux-4.9.243.orig/net/unix/af_unix.c | |
648 | ++++ linux-4.9.243/net/unix/af_unix.c | |
649 | 649 | @@ -2169,6 +2169,10 @@ static int unix_dgram_recvmsg(struct soc |
650 | 650 | POLLOUT | POLLWRNORM | |
651 | 651 | POLLWRBAND); |
@@ -665,8 +665,8 @@ | ||
665 | 665 | mutex_unlock(&u->iolock); |
666 | 666 | out: |
667 | 667 | return err; |
668 | ---- linux-4.9.242.orig/security/Kconfig | |
669 | -+++ linux-4.9.242/security/Kconfig | |
668 | +--- linux-4.9.243.orig/security/Kconfig | |
669 | ++++ linux-4.9.243/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.242.orig/security/Makefile | |
679 | -+++ linux-4.9.242/security/Makefile | |
678 | +--- linux-4.9.243.orig/security/Makefile | |
679 | ++++ linux-4.9.243/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.75. | |
1 | +This is TOMOYO Linux patch for kernel 5.4.77. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.75.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.77.tar.xz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 - |
6 | 6 | fs/open.c | 2 + |
@@ -28,8 +28,8 @@ | ||
28 | 28 | security/security.c | 5 ++- |
29 | 29 | 24 files changed, 160 insertions(+), 30 deletions(-) |
30 | 30 | |
31 | ---- linux-5.4.75.orig/fs/exec.c | |
32 | -+++ linux-5.4.75/fs/exec.c | |
31 | +--- linux-5.4.77.orig/fs/exec.c | |
32 | ++++ linux-5.4.77/fs/exec.c | |
33 | 33 | @@ -1730,7 +1730,7 @@ static int exec_binprm(struct linux_binp |
34 | 34 | old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent)); |
35 | 35 | rcu_read_unlock(); |
@@ -39,8 +39,8 @@ | ||
39 | 39 | if (ret >= 0) { |
40 | 40 | audit_bprm(bprm); |
41 | 41 | trace_sched_process_exec(current, old_pid, bprm); |
42 | ---- linux-5.4.75.orig/fs/open.c | |
43 | -+++ linux-5.4.75/fs/open.c | |
42 | +--- linux-5.4.77.orig/fs/open.c | |
43 | ++++ linux-5.4.77/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.75.orig/fs/proc/version.c | |
54 | -+++ linux-5.4.75/fs/proc/version.c | |
53 | +--- linux-5.4.77.orig/fs/proc/version.c | |
54 | ++++ linux-5.4.77/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.75 2020/11/10\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 5.4.77 2020/11/11\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-5.4.75.orig/include/linux/sched.h | |
67 | -+++ linux-5.4.75/include/linux/sched.h | |
66 | +--- linux-5.4.77.orig/include/linux/sched.h | |
67 | ++++ linux-5.4.77/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.75.orig/include/linux/security.h | |
88 | -+++ linux-5.4.75/include/linux/security.h | |
87 | +--- linux-5.4.77.orig/include/linux/security.h | |
88 | ++++ linux-5.4.77/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.75.orig/include/net/ip.h | |
319 | -+++ linux-5.4.75/include/net/ip.h | |
318 | +--- linux-5.4.77.orig/include/net/ip.h | |
319 | ++++ linux-5.4.77/include/net/ip.h | |
320 | 320 | @@ -341,6 +341,8 @@ void inet_get_local_port_range(struct ne |
321 | 321 | #ifdef CONFIG_SYSCTL |
322 | 322 | static inline int inet_is_local_reserved_port(struct net *net, int port) |
@@ -335,8 +335,8 @@ | ||
335 | 335 | return 0; |
336 | 336 | } |
337 | 337 | |
338 | ---- linux-5.4.75.orig/init/init_task.c | |
339 | -+++ linux-5.4.75/init/init_task.c | |
338 | +--- linux-5.4.77.orig/init/init_task.c | |
339 | ++++ linux-5.4.77/init/init_task.c | |
340 | 340 | @@ -182,6 +182,10 @@ struct task_struct init_task |
341 | 341 | #ifdef CONFIG_SECURITY |
342 | 342 | .security = NULL, |
@@ -348,8 +348,8 @@ | ||
348 | 348 | }; |
349 | 349 | EXPORT_SYMBOL(init_task); |
350 | 350 | |
351 | ---- linux-5.4.75.orig/kernel/kexec.c | |
352 | -+++ linux-5.4.75/kernel/kexec.c | |
351 | +--- linux-5.4.77.orig/kernel/kexec.c | |
352 | ++++ linux-5.4.77/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.75.orig/kernel/module.c | |
372 | -+++ linux-5.4.75/kernel/module.c | |
371 | +--- linux-5.4.77.orig/kernel/module.c | |
372 | ++++ linux-5.4.77/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.75.orig/kernel/ptrace.c | |
400 | -+++ linux-5.4.75/kernel/ptrace.c | |
399 | +--- linux-5.4.77.orig/kernel/ptrace.c | |
400 | ++++ linux-5.4.77/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.75.orig/kernel/reboot.c | |
426 | -+++ linux-5.4.75/kernel/reboot.c | |
425 | +--- linux-5.4.77.orig/kernel/reboot.c | |
426 | ++++ linux-5.4.77/kernel/reboot.c | |
427 | 427 | @@ -17,6 +17,7 @@ |
428 | 428 | #include <linux/syscalls.h> |
429 | 429 | #include <linux/syscore_ops.h> |
@@ -441,8 +441,8 @@ | ||
441 | 441 | |
442 | 442 | /* |
443 | 443 | * If pid namespaces are enabled and the current task is in a child |
444 | ---- linux-5.4.75.orig/kernel/sched/core.c | |
445 | -+++ linux-5.4.75/kernel/sched/core.c | |
444 | +--- linux-5.4.77.orig/kernel/sched/core.c | |
445 | ++++ linux-5.4.77/kernel/sched/core.c | |
446 | 446 | @@ -4663,6 +4663,8 @@ int can_nice(const struct task_struct *p |
447 | 447 | SYSCALL_DEFINE1(nice, int, increment) |
448 | 448 | { |
@@ -452,9 +452,9 @@ | ||
452 | 452 | |
453 | 453 | /* |
454 | 454 | * Setpriority might change our priority at the same moment. |
455 | ---- linux-5.4.75.orig/kernel/signal.c | |
456 | -+++ linux-5.4.75/kernel/signal.c | |
457 | -@@ -3643,6 +3643,8 @@ static inline void prepare_kill_siginfo( | |
455 | +--- linux-5.4.77.orig/kernel/signal.c | |
456 | ++++ linux-5.4.77/kernel/signal.c | |
457 | +@@ -3644,6 +3644,8 @@ static inline void prepare_kill_siginfo( | |
458 | 458 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
459 | 459 | { |
460 | 460 | struct kernel_siginfo info; |
@@ -463,7 +463,7 @@ | ||
463 | 463 | |
464 | 464 | prepare_kill_siginfo(sig, &info); |
465 | 465 | |
466 | -@@ -3741,6 +3743,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int, | |
466 | +@@ -3742,6 +3744,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int, | |
467 | 467 | if (!access_pidfd_pidns(pid)) |
468 | 468 | goto err; |
469 | 469 |
@@ -485,7 +485,7 @@ | ||
485 | 485 | if (info) { |
486 | 486 | ret = copy_siginfo_from_user_any(&kinfo, info); |
487 | 487 | if (unlikely(ret)) |
488 | -@@ -3825,6 +3842,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid | |
488 | +@@ -3826,6 +3843,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid | |
489 | 489 | /* This is only valid for single tasks */ |
490 | 490 | if (pid <= 0 || tgid <= 0) |
491 | 491 | return -EINVAL; |
@@ -494,7 +494,7 @@ | ||
494 | 494 | |
495 | 495 | return do_tkill(tgid, pid, sig); |
496 | 496 | } |
497 | -@@ -3841,6 +3860,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int, | |
497 | +@@ -3842,6 +3861,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int, | |
498 | 498 | /* This is only valid for single tasks */ |
499 | 499 | if (pid <= 0) |
500 | 500 | return -EINVAL; |
@@ -503,7 +503,7 @@ | ||
503 | 503 | |
504 | 504 | return do_tkill(0, pid, sig); |
505 | 505 | } |
506 | -@@ -3853,6 +3874,8 @@ static int do_rt_sigqueueinfo(pid_t pid, | |
506 | +@@ -3854,6 +3875,8 @@ static int do_rt_sigqueueinfo(pid_t pid, | |
507 | 507 | if ((info->si_code >= 0 || info->si_code == SI_TKILL) && |
508 | 508 | (task_pid_vnr(current) != pid)) |
509 | 509 | return -EPERM; |
@@ -512,7 +512,7 @@ | ||
512 | 512 | |
513 | 513 | /* POSIX.1b doesn't mention process groups. */ |
514 | 514 | return kill_proc_info(sig, info, pid); |
515 | -@@ -3900,6 +3923,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg | |
515 | +@@ -3901,6 +3924,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg | |
516 | 516 | if ((info->si_code >= 0 || info->si_code == SI_TKILL) && |
517 | 517 | (task_pid_vnr(current) != pid)) |
518 | 518 | return -EPERM; |
@@ -521,8 +521,8 @@ | ||
521 | 521 | |
522 | 522 | return do_send_specific(tgid, pid, sig, info); |
523 | 523 | } |
524 | ---- linux-5.4.75.orig/kernel/sys.c | |
525 | -+++ linux-5.4.75/kernel/sys.c | |
524 | +--- linux-5.4.77.orig/kernel/sys.c | |
525 | ++++ linux-5.4.77/kernel/sys.c | |
526 | 526 | @@ -204,6 +204,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
527 | 527 | |
528 | 528 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -552,8 +552,8 @@ | ||
552 | 552 | |
553 | 553 | errno = -EFAULT; |
554 | 554 | if (!copy_from_user(tmp, name, len)) { |
555 | ---- linux-5.4.75.orig/kernel/time/timekeeping.c | |
556 | -+++ linux-5.4.75/kernel/time/timekeeping.c | |
555 | +--- linux-5.4.77.orig/kernel/time/timekeeping.c | |
556 | ++++ linux-5.4.77/kernel/time/timekeeping.c | |
557 | 557 | @@ -22,6 +22,7 @@ |
558 | 558 | #include <linux/pvclock_gtod.h> |
559 | 559 | #include <linux/compiler.h> |
@@ -587,8 +587,8 @@ | ||
587 | 587 | |
588 | 588 | /* |
589 | 589 | * Validate if a timespec/timeval used to inject a time |
590 | ---- linux-5.4.75.orig/net/ipv4/raw.c | |
591 | -+++ linux-5.4.75/net/ipv4/raw.c | |
590 | +--- linux-5.4.77.orig/net/ipv4/raw.c | |
591 | ++++ linux-5.4.77/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.75.orig/net/ipv4/udp.c | |
604 | -+++ linux-5.4.75/net/ipv4/udp.c | |
603 | +--- linux-5.4.77.orig/net/ipv4/udp.c | |
604 | ++++ linux-5.4.77/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.75.orig/net/ipv6/raw.c | |
615 | -+++ linux-5.4.75/net/ipv6/raw.c | |
614 | +--- linux-5.4.77.orig/net/ipv6/raw.c | |
615 | ++++ linux-5.4.77/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.75.orig/net/ipv6/udp.c | |
628 | -+++ linux-5.4.75/net/ipv6/udp.c | |
627 | +--- linux-5.4.77.orig/net/ipv6/udp.c | |
628 | ++++ linux-5.4.77/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.75.orig/net/socket.c | |
639 | -+++ linux-5.4.75/net/socket.c | |
638 | +--- linux-5.4.77.orig/net/socket.c | |
639 | ++++ linux-5.4.77/net/socket.c | |
640 | 640 | @@ -1755,6 +1755,10 @@ int __sys_accept4(int fd, struct sockadd |
641 | 641 | if (err < 0) |
642 | 642 | goto out_fd; |
@@ -648,8 +648,8 @@ | ||
648 | 648 | if (upeer_sockaddr) { |
649 | 649 | len = newsock->ops->getname(newsock, |
650 | 650 | (struct sockaddr *)&address, 2); |
651 | ---- linux-5.4.75.orig/net/unix/af_unix.c | |
652 | -+++ linux-5.4.75/net/unix/af_unix.c | |
651 | +--- linux-5.4.77.orig/net/unix/af_unix.c | |
652 | ++++ linux-5.4.77/net/unix/af_unix.c | |
653 | 653 | @@ -2094,6 +2094,10 @@ static int unix_dgram_recvmsg(struct soc |
654 | 654 | EPOLLOUT | EPOLLWRNORM | |
655 | 655 | EPOLLWRBAND); |
@@ -669,8 +669,8 @@ | ||
669 | 669 | mutex_unlock(&u->iolock); |
670 | 670 | out: |
671 | 671 | return err; |
672 | ---- linux-5.4.75.orig/security/Kconfig | |
673 | -+++ linux-5.4.75/security/Kconfig | |
672 | +--- linux-5.4.77.orig/security/Kconfig | |
673 | ++++ linux-5.4.77/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.75.orig/security/Makefile | |
683 | -+++ linux-5.4.75/security/Makefile | |
682 | +--- linux-5.4.77.orig/security/Makefile | |
683 | ++++ linux-5.4.77/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.75.orig/security/security.c | |
692 | -+++ linux-5.4.75/security/security.c | |
691 | +--- linux-5.4.77.orig/security/security.c | |
692 | ++++ linux-5.4.77/security/security.c | |
693 | 693 | @@ -1507,7 +1507,9 @@ int security_task_alloc(struct task_stru |
694 | 694 | |
695 | 695 | if (rc) |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 5.9.6. | |
1 | +This is TOMOYO Linux patch for kernel 5.9.8. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.6.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.8.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.6.orig/fs/exec.c | |
32 | -+++ linux-5.9.6/fs/exec.c | |
31 | +--- linux-5.9.8.orig/fs/exec.c | |
32 | ++++ linux-5.9.8/fs/exec.c | |
33 | 33 | @@ -1948,7 +1948,7 @@ static int bprm_execve(struct linux_binp |
34 | 34 | if (retval) |
35 | 35 | goto out; |
@@ -39,8 +39,8 @@ | ||
39 | 39 | if (retval < 0) |
40 | 40 | goto out; |
41 | 41 | |
42 | ---- linux-5.9.6.orig/fs/open.c | |
43 | -+++ linux-5.9.6/fs/open.c | |
42 | +--- linux-5.9.8.orig/fs/open.c | |
43 | ++++ linux-5.9.8/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.6.orig/fs/proc/version.c | |
54 | -+++ linux-5.9.6/fs/proc/version.c | |
53 | +--- linux-5.9.8.orig/fs/proc/version.c | |
54 | ++++ linux-5.9.8/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.6 2020/11/10\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 5.9.8 2020/11/11\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-5.9.6.orig/include/linux/sched.h | |
67 | -+++ linux-5.9.6/include/linux/sched.h | |
66 | +--- linux-5.9.8.orig/include/linux/sched.h | |
67 | ++++ linux-5.9.8/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.6.orig/include/linux/security.h | |
88 | -+++ linux-5.9.6/include/linux/security.h | |
87 | +--- linux-5.9.8.orig/include/linux/security.h | |
88 | ++++ linux-5.9.8/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.6.orig/include/net/ip.h | |
319 | -+++ linux-5.9.6/include/net/ip.h | |
318 | +--- linux-5.9.8.orig/include/net/ip.h | |
319 | ++++ linux-5.9.8/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.6.orig/init/init_task.c | |
339 | -+++ linux-5.9.6/init/init_task.c | |
338 | +--- linux-5.9.8.orig/init/init_task.c | |
339 | ++++ linux-5.9.8/init/init_task.c | |
340 | 340 | @@ -212,6 +212,10 @@ struct task_struct init_task |
341 | 341 | #ifdef CONFIG_SECCOMP |
342 | 342 | .seccomp = { .filter_count = ATOMIC_INIT(0) }, |
@@ -348,8 +348,8 @@ | ||
348 | 348 | }; |
349 | 349 | EXPORT_SYMBOL(init_task); |
350 | 350 | |
351 | ---- linux-5.9.6.orig/kernel/kexec.c | |
352 | -+++ linux-5.9.6/kernel/kexec.c | |
351 | +--- linux-5.9.8.orig/kernel/kexec.c | |
352 | ++++ linux-5.9.8/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.6.orig/kernel/module.c | |
372 | -+++ linux-5.9.6/kernel/module.c | |
371 | +--- linux-5.9.8.orig/kernel/module.c | |
372 | ++++ linux-5.9.8/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.6.orig/kernel/ptrace.c | |
400 | -+++ linux-5.9.6/kernel/ptrace.c | |
399 | +--- linux-5.9.8.orig/kernel/ptrace.c | |
400 | ++++ linux-5.9.8/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.6.orig/kernel/reboot.c | |
426 | -+++ linux-5.9.6/kernel/reboot.c | |
425 | +--- linux-5.9.8.orig/kernel/reboot.c | |
426 | ++++ linux-5.9.8/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.6.orig/kernel/sched/core.c | |
445 | -+++ linux-5.9.6/kernel/sched/core.c | |
444 | +--- linux-5.9.8.orig/kernel/sched/core.c | |
445 | ++++ linux-5.9.8/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,9 +452,9 @@ | ||
452 | 452 | |
453 | 453 | /* |
454 | 454 | * Setpriority might change our priority at the same moment. |
455 | ---- linux-5.9.6.orig/kernel/signal.c | |
456 | -+++ linux-5.9.6/kernel/signal.c | |
457 | -@@ -3657,6 +3657,8 @@ static inline void prepare_kill_siginfo( | |
455 | +--- linux-5.9.8.orig/kernel/signal.c | |
456 | ++++ linux-5.9.8/kernel/signal.c | |
457 | +@@ -3658,6 +3658,8 @@ static inline void prepare_kill_siginfo( | |
458 | 458 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
459 | 459 | { |
460 | 460 | struct kernel_siginfo info; |
@@ -463,7 +463,7 @@ | ||
463 | 463 | |
464 | 464 | prepare_kill_siginfo(sig, &info); |
465 | 465 | |
466 | -@@ -3755,6 +3757,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int, | |
466 | +@@ -3756,6 +3758,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int, | |
467 | 467 | if (!access_pidfd_pidns(pid)) |
468 | 468 | goto err; |
469 | 469 |
@@ -485,7 +485,7 @@ | ||
485 | 485 | if (info) { |
486 | 486 | ret = copy_siginfo_from_user_any(&kinfo, info); |
487 | 487 | if (unlikely(ret)) |
488 | -@@ -3839,6 +3856,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid | |
488 | +@@ -3840,6 +3857,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid | |
489 | 489 | /* This is only valid for single tasks */ |
490 | 490 | if (pid <= 0 || tgid <= 0) |
491 | 491 | return -EINVAL; |
@@ -494,7 +494,7 @@ | ||
494 | 494 | |
495 | 495 | return do_tkill(tgid, pid, sig); |
496 | 496 | } |
497 | -@@ -3855,6 +3874,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int, | |
497 | +@@ -3856,6 +3875,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int, | |
498 | 498 | /* This is only valid for single tasks */ |
499 | 499 | if (pid <= 0) |
500 | 500 | return -EINVAL; |
@@ -503,7 +503,7 @@ | ||
503 | 503 | |
504 | 504 | return do_tkill(0, pid, sig); |
505 | 505 | } |
506 | -@@ -3867,6 +3888,8 @@ static int do_rt_sigqueueinfo(pid_t pid, | |
506 | +@@ -3868,6 +3889,8 @@ static int do_rt_sigqueueinfo(pid_t pid, | |
507 | 507 | if ((info->si_code >= 0 || info->si_code == SI_TKILL) && |
508 | 508 | (task_pid_vnr(current) != pid)) |
509 | 509 | return -EPERM; |
@@ -512,7 +512,7 @@ | ||
512 | 512 | |
513 | 513 | /* POSIX.1b doesn't mention process groups. */ |
514 | 514 | return kill_proc_info(sig, info, pid); |
515 | -@@ -3914,6 +3937,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg | |
515 | +@@ -3915,6 +3938,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg | |
516 | 516 | if ((info->si_code >= 0 || info->si_code == SI_TKILL) && |
517 | 517 | (task_pid_vnr(current) != pid)) |
518 | 518 | return -EPERM; |
@@ -521,8 +521,8 @@ | ||
521 | 521 | |
522 | 522 | return do_send_specific(tgid, pid, sig, info); |
523 | 523 | } |
524 | ---- linux-5.9.6.orig/kernel/sys.c | |
525 | -+++ linux-5.9.6/kernel/sys.c | |
524 | +--- linux-5.9.8.orig/kernel/sys.c | |
525 | ++++ linux-5.9.8/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.6.orig/kernel/time/timekeeping.c | |
556 | -+++ linux-5.9.6/kernel/time/timekeeping.c | |
555 | +--- linux-5.9.8.orig/kernel/time/timekeeping.c | |
556 | ++++ linux-5.9.8/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.6.orig/net/ipv4/raw.c | |
591 | -+++ linux-5.9.6/net/ipv4/raw.c | |
590 | +--- linux-5.9.8.orig/net/ipv4/raw.c | |
591 | ++++ linux-5.9.8/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.6.orig/net/ipv4/udp.c | |
604 | -+++ linux-5.9.6/net/ipv4/udp.c | |
603 | +--- linux-5.9.8.orig/net/ipv4/udp.c | |
604 | ++++ linux-5.9.8/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.6.orig/net/ipv6/raw.c | |
615 | -+++ linux-5.9.6/net/ipv6/raw.c | |
614 | +--- linux-5.9.8.orig/net/ipv6/raw.c | |
615 | ++++ linux-5.9.8/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.6.orig/net/ipv6/udp.c | |
628 | -+++ linux-5.9.6/net/ipv6/udp.c | |
627 | +--- linux-5.9.8.orig/net/ipv6/udp.c | |
628 | ++++ linux-5.9.8/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.6.orig/net/socket.c | |
639 | -+++ linux-5.9.6/net/socket.c | |
638 | +--- linux-5.9.8.orig/net/socket.c | |
639 | ++++ linux-5.9.8/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.6.orig/net/unix/af_unix.c | |
652 | -+++ linux-5.9.6/net/unix/af_unix.c | |
651 | +--- linux-5.9.8.orig/net/unix/af_unix.c | |
652 | ++++ linux-5.9.8/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.6.orig/security/Kconfig | |
673 | -+++ linux-5.9.6/security/Kconfig | |
672 | +--- linux-5.9.8.orig/security/Kconfig | |
673 | ++++ linux-5.9.8/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.6.orig/security/Makefile | |
683 | -+++ linux-5.9.6/security/Makefile | |
682 | +--- linux-5.9.8.orig/security/Makefile | |
683 | ++++ linux-5.9.8/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.6.orig/security/security.c | |
692 | -+++ linux-5.9.6/security/security.c | |
691 | +--- linux-5.9.8.orig/security/security.c | |
692 | ++++ linux-5.9.8/security/security.c | |
693 | 693 | @@ -1584,7 +1584,9 @@ int security_task_alloc(struct task_stru |
694 | 694 | |
695 | 695 | if (rc) |
@@ -3,7 +3,7 @@ | ||
3 | 3 | * |
4 | 4 | * Copyright (C) 2005-2012 NTT DATA CORPORATION |
5 | 5 | * |
6 | - * Version: 1.8.7 2020/05/05 | |
6 | + * Version: 1.8.8 2020/11/11 | |
7 | 7 | */ |
8 | 8 | |
9 | 9 | #include "internal.h" |
@@ -3,7 +3,7 @@ | ||
3 | 3 | * |
4 | 4 | * Copyright (C) 2005-2012 NTT DATA CORPORATION |
5 | 5 | * |
6 | - * Version: 1.8.7 2020/05/05 | |
6 | + * Version: 1.8.8 2020/11/11 | |
7 | 7 | */ |
8 | 8 | |
9 | 9 | #ifndef _SECURITY_CCSECURITY_INTERNAL_H |
@@ -3,7 +3,7 @@ | ||
3 | 3 | * |
4 | 4 | * Copyright (C) 2005-2012 NTT DATA CORPORATION |
5 | 5 | * |
6 | - * Version: 1.8.7 2020/05/05 | |
6 | + * Version: 1.8.8 2020/11/11 | |
7 | 7 | */ |
8 | 8 | |
9 | 9 | #include <linux/version.h> |
@@ -3,7 +3,7 @@ | ||
3 | 3 | * |
4 | 4 | * Copyright (C) 2005-2012 NTT DATA CORPORATION |
5 | 5 | * |
6 | - * Version: 1.8.7 2020/05/05 | |
6 | + * Version: 1.8.8 2020/11/11 | |
7 | 7 | */ |
8 | 8 | |
9 | 9 | #include <linux/path.h> |
@@ -3,7 +3,7 @@ | ||
3 | 3 | * |
4 | 4 | * Copyright (C) 2005-2012 NTT DATA CORPORATION |
5 | 5 | * |
6 | - * Version: 1.8.7 2020/05/05 | |
6 | + * Version: 1.8.8 2020/11/11 | |
7 | 7 | */ |
8 | 8 | |
9 | 9 | #include "internal.h" |
@@ -3,7 +3,7 @@ | ||
3 | 3 | * |
4 | 4 | * Copyright (C) 2005-2012 NTT DATA CORPORATION |
5 | 5 | * |
6 | - * Version: 1.8.7+ 2020/08/20 | |
6 | + * Version: 1.8.8 2020/11/11 | |
7 | 7 | */ |
8 | 8 | |
9 | 9 | #include "internal.h" |
@@ -3,7 +3,7 @@ | ||
3 | 3 | * |
4 | 4 | * Copyright (C) 2005-2012 NTT DATA CORPORATION |
5 | 5 | * |
6 | - * Version: 1.8.7+ 2020/08/20 | |
6 | + * Version: 1.8.8 2020/11/11 | |
7 | 7 | */ |
8 | 8 | |
9 | 9 | #include "internal.h" |
@@ -2496,7 +2496,7 @@ | ||
2496 | 2496 | struct ccs_domain_info *domain; |
2497 | 2497 | const int idx = ccs_read_lock(); |
2498 | 2498 | ccs_policy_loaded = true; |
2499 | - printk(KERN_INFO "CCSecurity: 1.8.7+ 2020/08/20\n"); | |
2499 | + printk(KERN_INFO "CCSecurity: 1.8.8 2020/11/11\n"); | |
2500 | 2500 | list_for_each_entry_srcu(domain, &ccs_domain_list, list, &ccs_ss) { |
2501 | 2501 | const u8 profile = domain->profile; |
2502 | 2502 | struct ccs_policy_namespace *ns = domain->ns; |
@@ -5180,7 +5180,7 @@ | ||
5180 | 5180 | { |
5181 | 5181 | if (head->r.eof) |
5182 | 5182 | return; |
5183 | - ccs_set_string(head, "1.8.7"); | |
5183 | + ccs_set_string(head, "1.8.8"); | |
5184 | 5184 | head->r.eof = true; |
5185 | 5185 | } |
5186 | 5186 |
@@ -3,7 +3,7 @@ | ||
3 | 3 | * |
4 | 4 | * Copyright (C) 2005-2012 NTT DATA CORPORATION |
5 | 5 | * |
6 | - * Version: 1.8.7+ 2020/08/20 | |
6 | + * Version: 1.8.8 2020/11/11 | |
7 | 7 | */ |
8 | 8 | |
9 | 9 | #include "internal.h" |
@@ -18,9 +18,9 @@ | ||
18 | 18 | rpm -ivh kernel-2.6.18-398.1.AXS3.src.rpm || die "Can't install source package." |
19 | 19 | |
20 | 20 | cd /usr/src/asianux/SOURCES/ || die "Can't chdir to /usr/src/asianux/SOURCES/ ." |
21 | -if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ] | |
21 | +if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ] | |
22 | 22 | then |
23 | - wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch." | |
23 | + wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch." | |
24 | 24 | fi |
25 | 25 | |
26 | 26 | cd /tmp/ || die "Can't chdir to /tmp/ ." |
@@ -33,7 +33,7 @@ | ||
33 | 33 | %define rpmversion 2.6.%{sublevel} |
34 | 34 | # %dist is defined in Asianux VPBS |
35 | 35 | -%define release %{revision}.1%{dist} |
36 | -+%define release %{revision}.1%{dist}_tomoyo_1.8.7p2 | |
36 | ++%define release %{revision}.1%{dist}_tomoyo_1.8.8 | |
37 | 37 | %define signmodules 0 |
38 | 38 | %define xen_hv_cset 15502 |
39 | 39 | %define xen_abi_ver 3.1 |
@@ -61,7 +61,7 @@ | ||
61 | 61 | # end of Asianux patches |
62 | 62 | |
63 | 63 | +# TOMOYO Linux |
64 | -+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz | |
64 | ++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz | |
65 | 65 | +patch -sp1 < patches/ccs-patch-2.6.18-asianux-3.diff |
66 | 66 | + |
67 | 67 | cp %{SOURCE10} Documentation/ |
@@ -18,9 +18,9 @@ | ||
18 | 18 | rpm -ivh kernel-2.4.21-63.EL.src.rpm || die "Can't install source package." |
19 | 19 | |
20 | 20 | cd /usr/src/redhat/SOURCES/ || die "Can't chdir to /usr/src/redhat/SOURCES/ ." |
21 | -if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ] | |
21 | +if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ] | |
22 | 22 | then |
23 | - wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch." | |
23 | + wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch." | |
24 | 24 | fi |
25 | 25 | |
26 | 26 | cd /tmp/ || die "Can't chdir to /tmp/ ." |
@@ -33,7 +33,7 @@ | ||
33 | 33 | # adding some text to the end of the version number. |
34 | 34 | # |
35 | 35 | -%define release 63.EL |
36 | -+%define release 63.EL_tomoyo_1.8.7p2 | |
36 | ++%define release 63.EL_tomoyo_1.8.8 | |
37 | 37 | %define sublevel 21 |
38 | 38 | %define kversion 2.4.%{sublevel} |
39 | 39 | # /usr/src/%{kslnk} -> /usr/src/linux-%{KVERREL} |
@@ -51,7 +51,7 @@ | ||
51 | 51 | # END OF PATCH APPLICATIONS |
52 | 52 | |
53 | 53 | +# TOMOYO Linux |
54 | -+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz | |
54 | ++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz | |
55 | 55 | +patch -sp1 < patches/ccs-patch-2.4.21-centos-3.diff |
56 | 56 | + |
57 | 57 | cp %{SOURCE10} Documentation/ |
@@ -18,9 +18,9 @@ | ||
18 | 18 | rpm -ivh kernel-2.6.9-103.EL.src.rpm || die "Can't install source package." |
19 | 19 | |
20 | 20 | cd /usr/src/redhat/SOURCES/ || die "Can't chdir to /usr/src/redhat/SOURCES/ ." |
21 | -if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ] | |
21 | +if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ] | |
22 | 22 | then |
23 | - wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch." | |
23 | + wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch." | |
24 | 24 | fi |
25 | 25 | |
26 | 26 | cd /tmp/ || die "Can't chdir to /tmp/ ." |
@@ -33,7 +33,7 @@ | ||
33 | 33 | # adding some text to the end of the version number. |
34 | 34 | # |
35 | 35 | -%define release 103.EL |
36 | -+%define release 103.EL_tomoyo_1.8.7p2 | |
36 | ++%define release 103.EL_tomoyo_1.8.8 | |
37 | 37 | %define sublevel 9 |
38 | 38 | %define kversion 2.6.%{sublevel} |
39 | 39 | %define rpmversion 2.6.%{sublevel} |
@@ -61,7 +61,7 @@ | ||
61 | 61 | # END OF PATCH APPLICATIONS |
62 | 62 | |
63 | 63 | +# TOMOYO Linux |
64 | -+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz | |
64 | ++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz | |
65 | 65 | +patch -sp1 < patches/ccs-patch-2.6.9-centos-4.diff |
66 | 66 | + |
67 | 67 | cp %{SOURCE10} Documentation/ |
@@ -18,9 +18,9 @@ | ||
18 | 18 | rpm -ivh kernel-2.6.18-419.el5.src.rpm || die "Can't install source package." |
19 | 19 | |
20 | 20 | cd /usr/src/redhat/SOURCES/ || die "Can't chdir to /usr/src/redhat/SOURCES/ ." |
21 | -if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ] | |
21 | +if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ] | |
22 | 22 | then |
23 | - wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch." | |
23 | + wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch." | |
24 | 24 | fi |
25 | 25 | |
26 | 26 | cd /tmp/ || die "Can't chdir to /tmp/ ." |
@@ -33,7 +33,7 @@ | ||
33 | 33 | # by setting the define to ".local" or ".bz123456" |
34 | 34 | # |
35 | 35 | -#% define buildid |
36 | -+%define buildid _tomoyo_1.8.7p2 | |
36 | ++%define buildid _tomoyo_1.8.8 | |
37 | 37 | # |
38 | 38 | %define sublevel 18 |
39 | 39 | %define stablerev 4 |
@@ -61,7 +61,7 @@ | ||
61 | 61 | %endif |
62 | 62 | |
63 | 63 | +# TOMOYO Linux |
64 | -+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz | |
64 | ++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz | |
65 | 65 | +patch -sp1 < patches/ccs-patch-2.6.18-centos-5.diff |
66 | 66 | + |
67 | 67 | cp %{SOURCE10} Documentation/ |
@@ -18,9 +18,9 @@ | ||
18 | 18 | rpm -ivh kernel-2.6.32-754.35.1.el6.src.rpm || die "Can't install source package." |
19 | 19 | |
20 | 20 | cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ." |
21 | -if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ] | |
21 | +if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ] | |
22 | 22 | then |
23 | - wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch." | |
23 | + wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch." | |
24 | 24 | fi |
25 | 25 | |
26 | 26 | cd ~/rpmbuild/SPECS/ || die "Can't chdir to ~/rpmbuild/SPECS/ ." |
@@ -33,7 +33,7 @@ | ||
33 | 33 | # by setting the define to ".local" or ".bz123456" |
34 | 34 | # |
35 | 35 | -# % define buildid .local |
36 | -+%define buildid _tomoyo_1.8.7p2 | |
36 | ++%define buildid _tomoyo_1.8.8 | |
37 | 37 | |
38 | 38 | %define distro_build 754.35.1 |
39 | 39 | %define kabi_build 754 |
@@ -69,7 +69,7 @@ | ||
69 | 69 | ApplyOptionalPatch linux-kernel-test.patch |
70 | 70 | |
71 | 71 | +# TOMOYO Linux |
72 | -+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz | |
72 | ++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz | |
73 | 73 | +patch -sp1 < patches/ccs-patch-2.6.32-centos-6.diff |
74 | 74 | + |
75 | 75 | # Any further pre-build tree manipulations happen here. |
@@ -18,9 +18,9 @@ | ||
18 | 18 | rpm -ivh kernel-3.10.0-1160.2.2.el7.src.rpm || die "Can't install source package." |
19 | 19 | |
20 | 20 | cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ." |
21 | -if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ] | |
21 | +if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ] | |
22 | 22 | then |
23 | - wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch." | |
23 | + wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch." | |
24 | 24 | fi |
25 | 25 | |
26 | 26 | cd ~/rpmbuild/SPECS/ || die "Can't chdir to ~/rpmbuild/SPECS/ ." |
@@ -33,7 +33,7 @@ | ||
33 | 33 | %define dist .el7 |
34 | 34 | |
35 | 35 | -# % define buildid .local |
36 | -+%define buildid _tomoyo_1.8.7p2 | |
36 | ++%define buildid _tomoyo_1.8.8 | |
37 | 37 | |
38 | 38 | # If there's no unversioned python, select version explicitly, |
39 | 39 | # so it's possible to at least do rh-srpm. |
@@ -69,7 +69,7 @@ | ||
69 | 69 | ApplyOptionalPatch debrand-rh-i686-cpu.patch |
70 | 70 | |
71 | 71 | +# TOMOYO Linux |
72 | -+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz | |
72 | ++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz | |
73 | 73 | +patch -sp1 < patches/ccs-patch-3.10-centos-7.diff |
74 | 74 | + |
75 | 75 | # Any further pre-build tree manipulations happen here. |
@@ -18,9 +18,9 @@ | ||
18 | 18 | rpm -ivh kernel-4.18.0-193.28.1.el8_2.src.rpm || die "Can't install source package." |
19 | 19 | |
20 | 20 | cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ." |
21 | -if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ] | |
21 | +if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ] | |
22 | 22 | then |
23 | - wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch." | |
23 | + wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch." | |
24 | 24 | fi |
25 | 25 | |
26 | 26 | cd ~/rpmbuild/SPECS/ || die "Can't chdir to ~/rpmbuild/SPECS/ ." |
@@ -33,7 +33,7 @@ | ||
33 | 33 | %endif |
34 | 34 | |
35 | 35 | -# define buildid .local |
36 | -+%define buildid _tomoyo_1.8.7p2 | |
36 | ++%define buildid _tomoyo_1.8.8 | |
37 | 37 | |
38 | 38 | %define rpmversion 4.18.0 |
39 | 39 | %define pkgrelease 193.28.1.el8_2 |
@@ -42,7 +42,7 @@ | ||
42 | 42 | # END OF PATCH APPLICATIONS |
43 | 43 | |
44 | 44 | +# TOMOYO Linux |
45 | -+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz | |
45 | ++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz | |
46 | 46 | +patch -sp1 < patches/ccs-patch-4.18-centos-8.diff |
47 | 47 | + |
48 | 48 | # Any further pre-build tree manipulations happen here. |
@@ -38,9 +38,9 @@ | ||
38 | 38 | # Download TOMOYO Linux patches. |
39 | 39 | mkdir -p ~/rpmbuild/SOURCES/ |
40 | 40 | cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ." |
41 | -if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ] | |
41 | +if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ] | |
42 | 42 | then |
43 | - wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch." | |
43 | + wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch." | |
44 | 44 | fi |
45 | 45 | |
46 | 46 | # Install kernel source packages. |
@@ -52,7 +52,7 @@ | ||
52 | 52 | |
53 | 53 | # Apply patches and create kernel config. |
54 | 54 | cd linux-source-2.6.32 || die "Can't chdir to linux-source-2.6.32/ ." |
55 | -tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.7-20200922.tar.gz || die "Can't extract patch." | |
55 | +tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20201111.tar.gz || die "Can't extract patch." | |
56 | 56 | patch -p1 < patches/ccs-patch-2.6.32-debian-squeeze.diff || die "Can't apply patch." |
57 | 57 | cat /boot/config-2.6.32-5-686 config.ccs > .config || die "Can't create config." |
58 | 58 |
@@ -23,10 +23,10 @@ | ||
23 | 23 | # Download TOMOYO Linux patches. |
24 | 24 | mkdir -p ~/rpmbuild/SOURCES/ |
25 | 25 | cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ." |
26 | -if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ] | |
26 | +if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ] | |
27 | 27 | then |
28 | 28 | apt-get -y install wget |
29 | - wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch." | |
29 | + wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch." | |
30 | 30 | fi |
31 | 31 | |
32 | 32 | # Install kernel source packages. |
@@ -38,7 +38,7 @@ | ||
38 | 38 | |
39 | 39 | # Apply patches and create kernel config. |
40 | 40 | cd linux-source-3.2 || die "Can't chdir to linux-source-3.2/ ." |
41 | -tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.7-20200922.tar.gz || die "Can't extract patch." | |
41 | +tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20201111.tar.gz || die "Can't extract patch." | |
42 | 42 | patch -p1 < patches/ccs-patch-3.2-debian-wheezy.diff || die "Can't apply patch." |
43 | 43 | cat /boot/config-3.2.0-$ABI_VERSION-$ORIGINAL_FLAVOUR config.ccs > .config || die "Can't create config." |
44 | 44 | sed -i -e 's/SUBLEVEL = .*/SUBLEVEL = 0/' Makefile || die "Can't edit Makefile" |
@@ -20,9 +20,9 @@ | ||
20 | 20 | rpm -ivh kernel-3.14.27-100.fc19.src.rpm || die "Can't install source package." |
21 | 21 | |
22 | 22 | cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ." |
23 | -if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ] | |
23 | +if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ] | |
24 | 24 | then |
25 | - wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch." | |
25 | + wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch." | |
26 | 26 | fi |
27 | 27 | |
28 | 28 | cd ~/rpmbuild/SPECS/ || die "Can't chdir to ~/rpmbuild/SPECS/ ." |
@@ -35,7 +35,7 @@ | ||
35 | 35 | # (Uncomment the '#' and both spaces below to set the buildid.) |
36 | 36 | # |
37 | 37 | -# % define buildid .local |
38 | -+%define buildid _tomoyo_1.8.7p2 | |
38 | ++%define buildid _tomoyo_1.8.8 | |
39 | 39 | ################################################################### |
40 | 40 | |
41 | 41 | # The buildid can also be specified on the rpmbuild command line |
@@ -71,7 +71,7 @@ | ||
71 | 71 | # END OF PATCH APPLICATIONS |
72 | 72 | |
73 | 73 | +# TOMOYO Linux |
74 | -+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz | |
74 | ++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz | |
75 | 75 | +patch -sp1 < patches/ccs-patch-3.14-fedora-19.diff |
76 | 76 | + |
77 | 77 | %endif |
@@ -20,9 +20,9 @@ | ||
20 | 20 | rpm -ivh kernel-3.19.8-100.fc20.src.rpm || die "Can't install source package." |
21 | 21 | |
22 | 22 | cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ." |
23 | -if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ] | |
23 | +if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ] | |
24 | 24 | then |
25 | - wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch." | |
25 | + wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch." | |
26 | 26 | fi |
27 | 27 | |
28 | 28 | cd ~/rpmbuild/SPECS/ || die "Can't chdir to ~/rpmbuild/SPECS/ ." |
@@ -35,7 +35,7 @@ | ||
35 | 35 | # (Uncomment the '#' and both spaces below to set the buildid.) |
36 | 36 | # |
37 | 37 | -# % define buildid .local |
38 | -+%define buildid _tomoyo_1.8.7p2 | |
38 | ++%define buildid _tomoyo_1.8.8 | |
39 | 39 | ################################################################### |
40 | 40 | |
41 | 41 | # The buildid can also be specified on the rpmbuild command line |
@@ -71,7 +71,7 @@ | ||
71 | 71 | # END OF PATCH APPLICATIONS |
72 | 72 | |
73 | 73 | +# TOMOYO Linux |
74 | -+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz | |
74 | ++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz | |
75 | 75 | +patch -sp1 < patches/ccs-patch-3.19-fedora-20.diff |
76 | 76 | + |
77 | 77 | %endif |
@@ -75,9 +75,9 @@ | ||
75 | 75 | rpm -ivh kernel-default-3.7.10-1.45.1.nosrc.rpm || die "Can't install source package." |
76 | 76 | |
77 | 77 | cd /usr/src/packages/SOURCES/ || die "Can't chdir to /usr/src/packages/SOURCES/ ." |
78 | -if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ] | |
78 | +if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ] | |
79 | 79 | then |
80 | - wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch." | |
80 | + wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch." | |
81 | 81 | fi |
82 | 82 | |
83 | 83 | cd /tmp/ || die "Can't chdir to /tmp/ ." |
@@ -96,7 +96,7 @@ | ||
96 | 96 | Group: System/Kernel |
97 | 97 | Version: 3.7.10 |
98 | 98 | -Release: 1.45.1 |
99 | -+Release: 1.45.1_tomoyo_1.8.7p2 | |
99 | ++Release: 1.45.1_tomoyo_1.8.8 | |
100 | 100 | %if 0%{?is_kotd} |
101 | 101 | %else |
102 | 102 | %endif |
@@ -105,7 +105,7 @@ | ||
105 | 105 | %_sourcedir/series.conf .. $SYMBOLS |
106 | 106 | |
107 | 107 | +# TOMOYO Linux |
108 | -+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz | |
108 | ++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz | |
109 | 109 | +patch -sp1 < patches/ccs-patch-3.7-suse-12.3.diff |
110 | 110 | +cat config.ccs >> ../config/%cpu_arch_flavor |
111 | 111 | + |
@@ -29,9 +29,9 @@ | ||
29 | 29 | # Download TOMOYO Linux patches. |
30 | 30 | mkdir -p ~/rpmbuild/SOURCES/ |
31 | 31 | cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ." |
32 | -if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ] | |
32 | +if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ] | |
33 | 33 | then |
34 | - wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch." | |
34 | + wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch." | |
35 | 35 | fi |
36 | 36 | |
37 | 37 | # Install kernel source packages. |
@@ -44,7 +44,7 @@ | ||
44 | 44 | # Apply patches and create kernel config. |
45 | 45 | cd linux-2.6.32/ || die "Can't chdir to linux-2.6.32/ ." |
46 | 46 | update_maintainer |
47 | -tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.7-20200922.tar.gz || die "Can't extract patch." | |
47 | +tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20201111.tar.gz || die "Can't extract patch." | |
48 | 48 | patch -p1 < patches/ccs-patch-2.6.32-ubuntu-10.04.diff || die "Can't apply patch." |
49 | 49 | rm -fR patches/ specs/ || die "Can't delete patch." |
50 | 50 | for i in `find debian.master/ -type f -name '*'${ORIGINAL_FLAVOUR}'*'`; do cp -p $i `echo $i | sed -e 's/'${ORIGINAL_FLAVOUR}'/'${NEW_FLAVOUR}'/g'`; done |
@@ -29,9 +29,9 @@ | ||
29 | 29 | # Download TOMOYO Linux patches. |
30 | 30 | mkdir -p ~/rpmbuild/SOURCES/ |
31 | 31 | cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ." |
32 | -if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ] | |
32 | +if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ] | |
33 | 33 | then |
34 | - wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch." | |
34 | + wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch." | |
35 | 35 | fi |
36 | 36 | |
37 | 37 | # Install kernel source packages. |
@@ -44,7 +44,7 @@ | ||
44 | 44 | # Apply patches and create kernel config. |
45 | 45 | cd linux-3.2.0/ || die "Can't chdir to linux-3.2.0/ ." |
46 | 46 | update_maintainer |
47 | -tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.7-20200922.tar.gz || die "Can't extract patch." | |
47 | +tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20201111.tar.gz || die "Can't extract patch." | |
48 | 48 | patch -p1 < patches/ccs-patch-3.2-ubuntu-12.04.diff || die "Can't apply patch." |
49 | 49 | rm -fR patches/ specs/ || die "Can't delete patch." |
50 | 50 | for i in `find debian.master/ -type f -name '*'${ORIGINAL_FLAVOUR}'*'`; do cp -p $i `echo $i | sed -e 's/'${ORIGINAL_FLAVOUR}'/'${NEW_FLAVOUR}'/g'`; done |
@@ -29,9 +29,9 @@ | ||
29 | 29 | # Download TOMOYO Linux patches. |
30 | 30 | mkdir -p ~/rpmbuild/SOURCES/ |
31 | 31 | cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ." |
32 | -if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ] | |
32 | +if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ] | |
33 | 33 | then |
34 | - wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch." | |
34 | + wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch." | |
35 | 35 | fi |
36 | 36 | |
37 | 37 | # Install kernel source packages. |
@@ -44,7 +44,7 @@ | ||
44 | 44 | # Apply patches and create kernel config. |
45 | 45 | cd linux-3.5.0/ || die "Can't chdir to linux-3.5.0/ ." |
46 | 46 | update_maintainer |
47 | -tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.7-20200922.tar.gz || die "Can't extract patch." | |
47 | +tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20201111.tar.gz || die "Can't extract patch." | |
48 | 48 | patch -p1 < patches/ccs-patch-3.5-ubuntu-12.10.diff || die "Can't apply patch." |
49 | 49 | rm -fR patches/ specs/ || die "Can't delete patch." |
50 | 50 | for i in `find debian.master/ -type f -name '*'${ORIGINAL_FLAVOUR}'*'`; do cp -p $i `echo $i | sed -e 's/'${ORIGINAL_FLAVOUR}'/'${NEW_FLAVOUR}'/g'`; done |
@@ -29,9 +29,9 @@ | ||
29 | 29 | # Download TOMOYO Linux patches. |
30 | 30 | mkdir -p ~/rpmbuild/SOURCES/ |
31 | 31 | cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ." |
32 | -if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ] | |
32 | +if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ] | |
33 | 33 | then |
34 | - wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch." | |
34 | + wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch." | |
35 | 35 | fi |
36 | 36 | |
37 | 37 | # Install kernel source packages. |
@@ -44,7 +44,7 @@ | ||
44 | 44 | # Apply patches and create kernel config. |
45 | 45 | cd linux-3.8.0/ || die "Can't chdir to linux-3.8.0/ ." |
46 | 46 | update_maintainer |
47 | -tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.7-20200922.tar.gz || die "Can't extract patch." | |
47 | +tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20201111.tar.gz || die "Can't extract patch." | |
48 | 48 | patch -p1 < patches/ccs-patch-3.8-ubuntu-13.04.diff || die "Can't apply patch." |
49 | 49 | rm -fR patches/ specs/ || die "Can't delete patch." |
50 | 50 | for i in `find debian.master/ -type f -name '*'${ORIGINAL_FLAVOUR}'*'`; do cp -p $i `echo $i | sed -e 's/'${ORIGINAL_FLAVOUR}'/'${NEW_FLAVOUR}'/g'`; done |
@@ -29,9 +29,9 @@ | ||
29 | 29 | # Download TOMOYO Linux patches. |
30 | 30 | mkdir -p ~/rpmbuild/SOURCES/ |
31 | 31 | cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ." |
32 | -if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ] | |
32 | +if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ] | |
33 | 33 | then |
34 | - wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch." | |
34 | + wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch." | |
35 | 35 | fi |
36 | 36 | |
37 | 37 | # Install kernel source packages. |
@@ -44,7 +44,7 @@ | ||
44 | 44 | # Apply patches and create kernel config. |
45 | 45 | cd linux-3.11.0/ || die "Can't chdir to linux-3.11.0/ ." |
46 | 46 | update_maintainer |
47 | -tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.7-20200922.tar.gz || die "Can't extract patch." | |
47 | +tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20201111.tar.gz || die "Can't extract patch." | |
48 | 48 | patch -p1 < patches/ccs-patch-3.11-ubuntu-13.10.diff || die "Can't apply patch." |
49 | 49 | rm -fR patches/ specs/ || die "Can't delete patch." |
50 | 50 | for i in `find debian.master/ -type f -name '*'${ORIGINAL_FLAVOUR}'*'`; do cp -p $i `echo $i | sed -e 's/'${ORIGINAL_FLAVOUR}'/'${NEW_FLAVOUR}'/g'`; done |
@@ -29,9 +29,9 @@ | ||
29 | 29 | # Download TOMOYO Linux patches. |
30 | 30 | mkdir -p ~/rpmbuild/SOURCES/ |
31 | 31 | cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ." |
32 | -if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ] | |
32 | +if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ] | |
33 | 33 | then |
34 | - wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch." | |
34 | + wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch." | |
35 | 35 | fi |
36 | 36 | |
37 | 37 | # Install kernel source packages. |
@@ -44,7 +44,7 @@ | ||
44 | 44 | # Apply patches and create kernel config. |
45 | 45 | cd linux-3.13.0/ || die "Can't chdir to linux-3.13.0/ ." |
46 | 46 | update_maintainer |
47 | -tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.7-20200922.tar.gz || die "Can't extract patch." | |
47 | +tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.8-20201111.tar.gz || die "Can't extract patch." | |
48 | 48 | patch -p1 < patches/ccs-patch-3.13-ubuntu-14.04.diff || die "Can't apply patch." |
49 | 49 | rm -fR patches/ specs/ || die "Can't delete patch." |
50 | 50 | for i in `find debian.master/ -type f -name '*'${ORIGINAL_FLAVOUR}'*'`; do cp -p $i `echo $i | sed -e 's/'${ORIGINAL_FLAVOUR}'/'${NEW_FLAVOUR}'/g'`; done |
@@ -18,9 +18,9 @@ | ||
18 | 18 | rpm -ivh kernel-4.4.110-2vl6.src.rpm || die "Can't install source package." |
19 | 19 | |
20 | 20 | cd ~/rpm/SOURCES/ || die "Can't chdir to ~/rpm/SOURCES/ ." |
21 | -if [ ! -r ccs-patch-1.8.7-20200922.tar.gz ] | |
21 | +if [ ! -r ccs-patch-1.8.8-20201111.tar.gz ] | |
22 | 22 | then |
23 | - wget -O ccs-patch-1.8.7-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.7-20200922.tar.gz' || die "Can't download patch." | |
23 | + wget -O ccs-patch-1.8.8-20201111.tar.gz 'https://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.8-20201111.tar.gz' || die "Can't download patch." | |
24 | 24 | fi |
25 | 25 | |
26 | 26 | cd /tmp/ || die "Can't chdir to /tmp/ ." |
@@ -33,7 +33,7 @@ | ||
33 | 33 | %define kversion 4.%{sublevel} |
34 | 34 | %define rpmversion 4.%{sublevel}.%{patchlevel} |
35 | 35 | -%define release 2%{?_dist_release} |
36 | -+%define release 2%{?_dist_release}_tomoyo_1.8.7p2 | |
36 | ++%define release 2%{?_dist_release}_tomoyo_1.8.8 | |
37 | 37 | |
38 | 38 | %define make_target bzImage |
39 | 39 | %define hdrarch %_target_cpu |
@@ -61,7 +61,7 @@ | ||
61 | 61 | # END OF PATCH APPLICATIONS |
62 | 62 | |
63 | 63 | +# TOMOYO Linux |
64 | -+tar -zxf %_sourcedir/ccs-patch-1.8.7-20200922.tar.gz | |
64 | ++tar -zxf %_sourcedir/ccs-patch-1.8.8-20201111.tar.gz | |
65 | 65 | +patch -sp1 < patches/ccs-patch-4.4-vine-linux-6.diff |
66 | 66 | + |
67 | 67 | cp %{SOURCE10} Documentation/ |