• R/O
  • SSH
  • HTTPS

tomoyo: コミット


コミットメタ情報

リビジョン6620 (tree)
日時2018-01-01 22:10:06
作者kumaneko

ログメッセージ

(メッセージはありません)

変更サマリ

差分

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.15.diff (revision 6619)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.15.diff (revision 6620)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.15-rc5.
1+This is TOMOYO Linux patch for kernel 4.15-rc6.
22
3-Source code for this patch is https://git.kernel.org/torvalds/t/linux-4.15-rc5.tar.gz
3+Source code for this patch is https://git.kernel.org/torvalds/t/linux-4.15-rc6.tar.gz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,8 +28,8 @@
2828 security/security.c | 9 +++++-
2929 24 files changed, 153 insertions(+), 29 deletions(-)
3030
31---- linux-4.15-rc5.orig/fs/exec.c
32-+++ linux-4.15-rc5/fs/exec.c
31+--- linux-4.15-rc6.orig/fs/exec.c
32++++ linux-4.15-rc6/fs/exec.c
3333 @@ -1672,7 +1672,7 @@ static int exec_binprm(struct linux_binp
3434 old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
3535 rcu_read_unlock();
@@ -39,8 +39,8 @@
3939 if (ret >= 0) {
4040 audit_bprm(bprm);
4141 trace_sched_process_exec(current, old_pid, bprm);
42---- linux-4.15-rc5.orig/fs/open.c
43-+++ linux-4.15-rc5/fs/open.c
42+--- linux-4.15-rc6.orig/fs/open.c
43++++ linux-4.15-rc6/fs/open.c
4444 @@ -1171,6 +1171,8 @@ EXPORT_SYMBOL(sys_close);
4545 */
4646 SYSCALL_DEFINE0(vhangup)
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-4.15-rc5.orig/fs/proc/version.c
54-+++ linux-4.15-rc5/fs/proc/version.c
53+--- linux-4.15-rc6.orig/fs/proc/version.c
54++++ linux-4.15-rc6/fs/proc/version.c
5555 @@ -33,3 +33,10 @@ static int __init proc_version_init(void
5656 return 0;
5757 }
@@ -59,12 +59,12 @@
5959 +
6060 +static int __init ccs_show_version(void)
6161 +{
62-+ printk(KERN_INFO "Hook version: 4.15-rc5 2017/12/24\n");
62++ printk(KERN_INFO "Hook version: 4.15-rc6 2018/01/01\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.15-rc5.orig/include/linux/init_task.h
67-+++ linux-4.15-rc5/include/linux/init_task.h
66+--- linux-4.15-rc6.orig/include/linux/init_task.h
67++++ linux-4.15-rc6/include/linux/init_task.h
6868 @@ -218,6 +218,14 @@ extern struct cred init_cred;
6969 #define INIT_TASK_SECURITY
7070 #endif
@@ -88,8 +88,8 @@
8888 }
8989
9090
91---- linux-4.15-rc5.orig/include/linux/sched.h
92-+++ linux-4.15-rc5/include/linux/sched.h
91+--- linux-4.15-rc6.orig/include/linux/sched.h
92++++ linux-4.15-rc6/include/linux/sched.h
9393 @@ -33,6 +33,7 @@ struct audit_context;
9494 struct backing_dev_info;
9595 struct bio_list;
@@ -109,8 +109,8 @@
109109
110110 /*
111111 * New fields for task_struct should be added above here, so that
112---- linux-4.15-rc5.orig/include/linux/security.h
113-+++ linux-4.15-rc5/include/linux/security.h
112+--- linux-4.15-rc6.orig/include/linux/security.h
113++++ linux-4.15-rc6/include/linux/security.h
114114 @@ -56,6 +56,7 @@ struct msg_queue;
115115 struct xattr;
116116 struct xfrm_sec_ctx;
@@ -331,8 +331,8 @@
331331 }
332332 #endif /* CONFIG_SECURITY_PATH */
333333
334---- linux-4.15-rc5.orig/include/net/ip.h
335-+++ linux-4.15-rc5/include/net/ip.h
334+--- linux-4.15-rc6.orig/include/net/ip.h
335++++ linux-4.15-rc6/include/net/ip.h
336336 @@ -266,6 +266,8 @@ void inet_get_local_port_range(struct ne
337337 #ifdef CONFIG_SYSCTL
338338 static inline int inet_is_local_reserved_port(struct net *net, int port)
@@ -351,8 +351,8 @@
351351 return 0;
352352 }
353353
354---- linux-4.15-rc5.orig/kernel/kexec.c
355-+++ linux-4.15-rc5/kernel/kexec.c
354+--- linux-4.15-rc6.orig/kernel/kexec.c
355++++ linux-4.15-rc6/kernel/kexec.c
356356 @@ -17,7 +17,7 @@
357357 #include <linux/syscalls.h>
358358 #include <linux/vmalloc.h>
@@ -371,8 +371,8 @@
371371
372372 /*
373373 * Verify we have a legal set of flags
374---- linux-4.15-rc5.orig/kernel/module.c
375-+++ linux-4.15-rc5/kernel/module.c
374+--- linux-4.15-rc6.orig/kernel/module.c
375++++ linux-4.15-rc6/kernel/module.c
376376 @@ -66,6 +66,7 @@
377377 #include <linux/audit.h>
378378 #include <uapi/linux/module.h>
@@ -399,8 +399,8 @@
399399
400400 return 0;
401401 }
402---- linux-4.15-rc5.orig/kernel/ptrace.c
403-+++ linux-4.15-rc5/kernel/ptrace.c
402+--- linux-4.15-rc6.orig/kernel/ptrace.c
403++++ linux-4.15-rc6/kernel/ptrace.c
404404 @@ -1123,6 +1123,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
405405 {
406406 struct task_struct *child;
@@ -425,8 +425,8 @@
425425
426426 if (request == PTRACE_TRACEME) {
427427 ret = ptrace_traceme();
428---- linux-4.15-rc5.orig/kernel/reboot.c
429-+++ linux-4.15-rc5/kernel/reboot.c
428+--- linux-4.15-rc6.orig/kernel/reboot.c
429++++ linux-4.15-rc6/kernel/reboot.c
430430 @@ -16,6 +16,7 @@
431431 #include <linux/syscalls.h>
432432 #include <linux/syscore_ops.h>
@@ -444,8 +444,8 @@
444444
445445 /*
446446 * If pid namespaces are enabled and the current task is in a child
447---- linux-4.15-rc5.orig/kernel/sched/core.c
448-+++ linux-4.15-rc5/kernel/sched/core.c
447+--- linux-4.15-rc6.orig/kernel/sched/core.c
448++++ linux-4.15-rc6/kernel/sched/core.c
449449 @@ -3861,6 +3861,8 @@ int can_nice(const struct task_struct *p
450450 SYSCALL_DEFINE1(nice, int, increment)
451451 {
@@ -455,8 +455,8 @@
455455
456456 /*
457457 * Setpriority might change our priority at the same moment.
458---- linux-4.15-rc5.orig/kernel/signal.c
459-+++ linux-4.15-rc5/kernel/signal.c
458+--- linux-4.15-rc6.orig/kernel/signal.c
459++++ linux-4.15-rc6/kernel/signal.c
460460 @@ -2936,6 +2936,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait,
461461 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
462462 {
@@ -502,8 +502,8 @@
502502
503503 return do_send_specific(tgid, pid, sig, info);
504504 }
505---- linux-4.15-rc5.orig/kernel/sys.c
506-+++ linux-4.15-rc5/kernel/sys.c
505+--- linux-4.15-rc6.orig/kernel/sys.c
506++++ linux-4.15-rc6/kernel/sys.c
507507 @@ -197,6 +197,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
508508
509509 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -533,8 +533,8 @@
533533
534534 down_write(&uts_sem);
535535 errno = -EFAULT;
536---- linux-4.15-rc5.orig/kernel/time/timekeeping.c
537-+++ linux-4.15-rc5/kernel/time/timekeeping.c
536+--- linux-4.15-rc6.orig/kernel/time/timekeeping.c
537++++ linux-4.15-rc6/kernel/time/timekeeping.c
538538 @@ -25,6 +25,7 @@
539539 #include <linux/stop_machine.h>
540540 #include <linux/pvclock_gtod.h>
@@ -568,8 +568,8 @@
568568
569569 /*
570570 * Validate if a timespec/timeval used to inject a time
571---- linux-4.15-rc5.orig/net/ipv4/raw.c
572-+++ linux-4.15-rc5/net/ipv4/raw.c
571+--- linux-4.15-rc6.orig/net/ipv4/raw.c
572++++ linux-4.15-rc6/net/ipv4/raw.c
573573 @@ -766,6 +766,10 @@ static int raw_recvmsg(struct sock *sk,
574574 skb = skb_recv_datagram(sk, flags, noblock, &err);
575575 if (!skb)
@@ -581,8 +581,8 @@
581581
582582 copied = skb->len;
583583 if (len < copied) {
584---- linux-4.15-rc5.orig/net/ipv4/udp.c
585-+++ linux-4.15-rc5/net/ipv4/udp.c
584+--- linux-4.15-rc6.orig/net/ipv4/udp.c
585++++ linux-4.15-rc6/net/ipv4/udp.c
586586 @@ -1589,6 +1589,8 @@ try_again:
587587 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
588588 if (!skb)
@@ -592,8 +592,8 @@
592592
593593 ulen = udp_skb_len(skb);
594594 copied = len;
595---- linux-4.15-rc5.orig/net/ipv6/raw.c
596-+++ linux-4.15-rc5/net/ipv6/raw.c
595+--- linux-4.15-rc6.orig/net/ipv6/raw.c
596++++ linux-4.15-rc6/net/ipv6/raw.c
597597 @@ -483,6 +483,10 @@ static int rawv6_recvmsg(struct sock *sk
598598 skb = skb_recv_datagram(sk, flags, noblock, &err);
599599 if (!skb)
@@ -605,8 +605,8 @@
605605
606606 copied = skb->len;
607607 if (copied > len) {
608---- linux-4.15-rc5.orig/net/ipv6/udp.c
609-+++ linux-4.15-rc5/net/ipv6/udp.c
608+--- linux-4.15-rc6.orig/net/ipv6/udp.c
609++++ linux-4.15-rc6/net/ipv6/udp.c
610610 @@ -371,6 +371,8 @@ try_again:
611611 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
612612 if (!skb)
@@ -616,8 +616,8 @@
616616
617617 ulen = udp6_skb_len(skb);
618618 copied = len;
619---- linux-4.15-rc5.orig/net/socket.c
620-+++ linux-4.15-rc5/net/socket.c
619+--- linux-4.15-rc6.orig/net/socket.c
620++++ linux-4.15-rc6/net/socket.c
621621 @@ -1552,6 +1552,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
622622 if (err < 0)
623623 goto out_fd;
@@ -629,8 +629,8 @@
629629 if (upeer_sockaddr) {
630630 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
631631 &len, 2) < 0) {
632---- linux-4.15-rc5.orig/net/unix/af_unix.c
633-+++ linux-4.15-rc5/net/unix/af_unix.c
632+--- linux-4.15-rc6.orig/net/unix/af_unix.c
633++++ linux-4.15-rc6/net/unix/af_unix.c
634634 @@ -2132,6 +2132,10 @@ static int unix_dgram_recvmsg(struct soc
635635 POLLOUT | POLLWRNORM |
636636 POLLWRBAND);
@@ -650,9 +650,9 @@
650650 mutex_unlock(&u->iolock);
651651 out:
652652 return err;
653---- linux-4.15-rc5.orig/security/Kconfig
654-+++ linux-4.15-rc5/security/Kconfig
655-@@ -251,5 +251,7 @@ config DEFAULT_SECURITY
653+--- linux-4.15-rc6.orig/security/Kconfig
654++++ linux-4.15-rc6/security/Kconfig
655+@@ -261,5 +261,7 @@ config DEFAULT_SECURITY
656656 default "apparmor" if DEFAULT_SECURITY_APPARMOR
657657 default "" if DEFAULT_SECURITY_DAC
658658
@@ -660,8 +660,8 @@
660660 +
661661 endmenu
662662
663---- linux-4.15-rc5.orig/security/Makefile
664-+++ linux-4.15-rc5/security/Makefile
663+--- linux-4.15-rc6.orig/security/Makefile
664++++ linux-4.15-rc6/security/Makefile
665665 @@ -30,3 +30,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
666666 # Object integrity file lists
667667 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -669,8 +669,8 @@
669669 +
670670 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
671671 +obj-$(CONFIG_CCSECURITY) += ccsecurity/
672---- linux-4.15-rc5.orig/security/security.c
673-+++ linux-4.15-rc5/security/security.c
672+--- linux-4.15-rc6.orig/security/security.c
673++++ linux-4.15-rc6/security/security.c
674674 @@ -977,12 +977,19 @@ int security_file_open(struct file *file
675675
676676 int security_task_alloc(struct task_struct *task, unsigned long clone_flags)
旧リポジトリブラウザで表示