• R/O
  • SSH
  • HTTPS

tomoyo: Commit


Commit MetaInfo

Revision6658 (tree)
Time2018-07-16 21:54:29
Authorkumaneko

Log Message

(empty log message)

Change Summary

Incremental Difference

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.18.diff (revision 6657)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.18.diff (revision 6658)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.18-rc4.
1+This is TOMOYO Linux patch for kernel 4.18-rc5.
22
3-Source code for this patch is https://git.kernel.org/torvalds/t/linux-4.18-rc4.tar.gz
3+Source code for this patch is https://git.kernel.org/torvalds/t/linux-4.18-rc5.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, 148 insertions(+), 29 deletions(-)
3030
31---- linux-4.18-rc4.orig/fs/exec.c
32-+++ linux-4.18-rc4/fs/exec.c
31+--- linux-4.18-rc5.orig/fs/exec.c
32++++ linux-4.18-rc5/fs/exec.c
3333 @@ -1692,7 +1692,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.18-rc4.orig/fs/open.c
43-+++ linux-4.18-rc4/fs/open.c
42+--- linux-4.18-rc5.orig/fs/open.c
43++++ linux-4.18-rc5/fs/open.c
4444 @@ -1212,6 +1212,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd)
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.18-rc4.orig/fs/proc/version.c
54-+++ linux-4.18-rc4/fs/proc/version.c
53+--- linux-4.18-rc5.orig/fs/proc/version.c
54++++ linux-4.18-rc5/fs/proc/version.c
5555 @@ -21,3 +21,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.18-rc4 2018/07/12\n");
62++ printk(KERN_INFO "Hook version: 4.18-rc5 2018/07/16\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.18-rc4.orig/include/linux/sched.h
67-+++ linux-4.18-rc4/include/linux/sched.h
66+--- linux-4.18-rc5.orig/include/linux/sched.h
67++++ linux-4.18-rc5/include/linux/sched.h
6868 @@ -34,6 +34,7 @@ struct audit_context;
6969 struct backing_dev_info;
7070 struct bio_list;
@@ -84,8 +84,8 @@
8484
8585 /*
8686 * New fields for task_struct should be added above here, so that
87---- linux-4.18-rc4.orig/include/linux/security.h
88-+++ linux-4.18-rc4/include/linux/security.h
87+--- linux-4.18-rc5.orig/include/linux/security.h
88++++ linux-4.18-rc5/include/linux/security.h
8989 @@ -53,6 +53,7 @@ struct msg_msg;
9090 struct xattr;
9191 struct xfrm_sec_ctx;
@@ -306,8 +306,8 @@
306306 }
307307 #endif /* CONFIG_SECURITY_PATH */
308308
309---- linux-4.18-rc4.orig/include/net/ip.h
310-+++ linux-4.18-rc4/include/net/ip.h
309+--- linux-4.18-rc5.orig/include/net/ip.h
310++++ linux-4.18-rc5/include/net/ip.h
311311 @@ -278,6 +278,8 @@ void inet_get_local_port_range(struct ne
312312 #ifdef CONFIG_SYSCTL
313313 static inline int inet_is_local_reserved_port(struct net *net, int port)
@@ -326,8 +326,8 @@
326326 return 0;
327327 }
328328
329---- linux-4.18-rc4.orig/init/init_task.c
330-+++ linux-4.18-rc4/init/init_task.c
329+--- linux-4.18-rc5.orig/init/init_task.c
330++++ linux-4.18-rc5/init/init_task.c
331331 @@ -176,6 +176,10 @@ struct task_struct init_task
332332 #ifdef CONFIG_SECURITY
333333 .security = NULL,
@@ -339,8 +339,8 @@
339339 };
340340 EXPORT_SYMBOL(init_task);
341341
342---- linux-4.18-rc4.orig/kernel/kexec.c
343-+++ linux-4.18-rc4/kernel/kexec.c
342+--- linux-4.18-rc5.orig/kernel/kexec.c
343++++ linux-4.18-rc5/kernel/kexec.c
344344 @@ -17,7 +17,7 @@
345345 #include <linux/syscalls.h>
346346 #include <linux/vmalloc.h>
@@ -359,8 +359,8 @@
359359
360360 /*
361361 * Verify we have a legal set of flags
362---- linux-4.18-rc4.orig/kernel/module.c
363-+++ linux-4.18-rc4/kernel/module.c
362+--- linux-4.18-rc5.orig/kernel/module.c
363++++ linux-4.18-rc5/kernel/module.c
364364 @@ -66,6 +66,7 @@
365365 #include <linux/audit.h>
366366 #include <uapi/linux/module.h>
@@ -387,8 +387,8 @@
387387
388388 return 0;
389389 }
390---- linux-4.18-rc4.orig/kernel/ptrace.c
391-+++ linux-4.18-rc4/kernel/ptrace.c
390+--- linux-4.18-rc5.orig/kernel/ptrace.c
391++++ linux-4.18-rc5/kernel/ptrace.c
392392 @@ -1112,6 +1112,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
393393 {
394394 struct task_struct *child;
@@ -413,8 +413,8 @@
413413
414414 if (request == PTRACE_TRACEME) {
415415 ret = ptrace_traceme();
416---- linux-4.18-rc4.orig/kernel/reboot.c
417-+++ linux-4.18-rc4/kernel/reboot.c
416+--- linux-4.18-rc5.orig/kernel/reboot.c
417++++ linux-4.18-rc5/kernel/reboot.c
418418 @@ -16,6 +16,7 @@
419419 #include <linux/syscalls.h>
420420 #include <linux/syscore_ops.h>
@@ -432,8 +432,8 @@
432432
433433 /*
434434 * If pid namespaces are enabled and the current task is in a child
435---- linux-4.18-rc4.orig/kernel/sched/core.c
436-+++ linux-4.18-rc4/kernel/sched/core.c
435+--- linux-4.18-rc5.orig/kernel/sched/core.c
436++++ linux-4.18-rc5/kernel/sched/core.c
437437 @@ -3972,6 +3972,8 @@ int can_nice(const struct task_struct *p
438438 SYSCALL_DEFINE1(nice, int, increment)
439439 {
@@ -443,8 +443,8 @@
443443
444444 /*
445445 * Setpriority might change our priority at the same moment.
446---- linux-4.18-rc4.orig/kernel/signal.c
447-+++ linux-4.18-rc4/kernel/signal.c
446+--- linux-4.18-rc5.orig/kernel/signal.c
447++++ linux-4.18-rc5/kernel/signal.c
448448 @@ -3167,6 +3167,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait,
449449 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
450450 {
@@ -490,8 +490,8 @@
490490
491491 return do_send_specific(tgid, pid, sig, info);
492492 }
493---- linux-4.18-rc4.orig/kernel/sys.c
494-+++ linux-4.18-rc4/kernel/sys.c
493+--- linux-4.18-rc5.orig/kernel/sys.c
494++++ linux-4.18-rc5/kernel/sys.c
495495 @@ -204,6 +204,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
496496
497497 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -521,8 +521,8 @@
521521
522522 down_write(&uts_sem);
523523 errno = -EFAULT;
524---- linux-4.18-rc4.orig/kernel/time/timekeeping.c
525-+++ linux-4.18-rc4/kernel/time/timekeeping.c
524+--- linux-4.18-rc5.orig/kernel/time/timekeeping.c
525++++ linux-4.18-rc5/kernel/time/timekeeping.c
526526 @@ -25,6 +25,7 @@
527527 #include <linux/stop_machine.h>
528528 #include <linux/pvclock_gtod.h>
@@ -556,8 +556,8 @@
556556
557557 /*
558558 * Validate if a timespec/timeval used to inject a time
559---- linux-4.18-rc4.orig/net/ipv4/raw.c
560-+++ linux-4.18-rc4/net/ipv4/raw.c
559+--- linux-4.18-rc5.orig/net/ipv4/raw.c
560++++ linux-4.18-rc5/net/ipv4/raw.c
561561 @@ -779,6 +779,10 @@ static int raw_recvmsg(struct sock *sk,
562562 skb = skb_recv_datagram(sk, flags, noblock, &err);
563563 if (!skb)
@@ -569,8 +569,8 @@
569569
570570 copied = skb->len;
571571 if (len < copied) {
572---- linux-4.18-rc4.orig/net/ipv4/udp.c
573-+++ linux-4.18-rc4/net/ipv4/udp.c
572+--- linux-4.18-rc5.orig/net/ipv4/udp.c
573++++ linux-4.18-rc5/net/ipv4/udp.c
574574 @@ -1659,6 +1659,8 @@ try_again:
575575 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
576576 if (!skb)
@@ -580,8 +580,8 @@
580580
581581 ulen = udp_skb_len(skb);
582582 copied = len;
583---- linux-4.18-rc4.orig/net/ipv6/raw.c
584-+++ linux-4.18-rc4/net/ipv6/raw.c
583+--- linux-4.18-rc5.orig/net/ipv6/raw.c
584++++ linux-4.18-rc5/net/ipv6/raw.c
585585 @@ -483,6 +483,10 @@ static int rawv6_recvmsg(struct sock *sk
586586 skb = skb_recv_datagram(sk, flags, noblock, &err);
587587 if (!skb)
@@ -593,8 +593,8 @@
593593
594594 copied = skb->len;
595595 if (copied > len) {
596---- linux-4.18-rc4.orig/net/ipv6/udp.c
597-+++ linux-4.18-rc4/net/ipv6/udp.c
596+--- linux-4.18-rc5.orig/net/ipv6/udp.c
597++++ linux-4.18-rc5/net/ipv6/udp.c
598598 @@ -339,6 +339,8 @@ try_again:
599599 skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
600600 if (!skb)
@@ -604,8 +604,8 @@
604604
605605 ulen = udp6_skb_len(skb);
606606 copied = len;
607---- linux-4.18-rc4.orig/net/socket.c
608-+++ linux-4.18-rc4/net/socket.c
607+--- linux-4.18-rc5.orig/net/socket.c
608++++ linux-4.18-rc5/net/socket.c
609609 @@ -1600,6 +1600,10 @@ int __sys_accept4(int fd, struct sockadd
610610 if (err < 0)
611611 goto out_fd;
@@ -617,8 +617,8 @@
617617 if (upeer_sockaddr) {
618618 len = newsock->ops->getname(newsock,
619619 (struct sockaddr *)&address, 2);
620---- linux-4.18-rc4.orig/net/unix/af_unix.c
621-+++ linux-4.18-rc4/net/unix/af_unix.c
620+--- linux-4.18-rc5.orig/net/unix/af_unix.c
621++++ linux-4.18-rc5/net/unix/af_unix.c
622622 @@ -2122,6 +2122,10 @@ static int unix_dgram_recvmsg(struct soc
623623 EPOLLOUT | EPOLLWRNORM |
624624 EPOLLWRBAND);
@@ -638,8 +638,8 @@
638638 mutex_unlock(&u->iolock);
639639 out:
640640 return err;
641---- linux-4.18-rc4.orig/security/Kconfig
642-+++ linux-4.18-rc4/security/Kconfig
641+--- linux-4.18-rc5.orig/security/Kconfig
642++++ linux-4.18-rc5/security/Kconfig
643643 @@ -277,5 +277,7 @@ config DEFAULT_SECURITY
644644 default "apparmor" if DEFAULT_SECURITY_APPARMOR
645645 default "" if DEFAULT_SECURITY_DAC
@@ -648,8 +648,8 @@
648648 +
649649 endmenu
650650
651---- linux-4.18-rc4.orig/security/Makefile
652-+++ linux-4.18-rc4/security/Makefile
651+--- linux-4.18-rc5.orig/security/Makefile
652++++ linux-4.18-rc5/security/Makefile
653653 @@ -30,3 +30,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
654654 # Object integrity file lists
655655 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -657,8 +657,8 @@
657657 +
658658 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
659659 +obj-$(CONFIG_CCSECURITY) += ccsecurity/
660---- linux-4.18-rc4.orig/security/security.c
661-+++ linux-4.18-rc4/security/security.c
660+--- linux-4.18-rc5.orig/security/security.c
661++++ linux-4.18-rc5/security/security.c
662662 @@ -983,12 +983,19 @@ int security_file_open(struct file *file
663663
664664 int security_task_alloc(struct task_struct *task, unsigned long clone_flags)
Show on old repository browser