• R/O
  • SSH
  • HTTPS

tomoyo: コミット


コミットメタ情報

リビジョン6664 (tree)
日時2018-09-04 11:59:20
作者kumaneko

ログメッセージ

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

変更サマリ

差分

--- tags/htdocs/repos-1.8/CentOS6/repodata/repomd.xml (revision 6663)
+++ tags/htdocs/repos-1.8/CentOS6/repodata/repomd.xml (revision 6664)
@@ -1,28 +1,28 @@
11 <?xml version="1.0" encoding="UTF-8"?>
22 <repomd xmlns="http://linux.duke.edu/metadata/repo" xmlns:rpm="http://linux.duke.edu/metadata/rpm">
3- <revision>1531545575</revision>
3+ <revision>1536029613</revision>
44 <data type="filelists">
5- <checksum type="sha256">6982cde9aa364a1d8d04b0e5c91902d255a6b3ef917d948dbd2c5379462cde80</checksum>
6- <open-checksum type="sha256">7b95dc591b9789918f651230a2f578b3d78c7b670e9ea1fb644a02d8f7322b7f</open-checksum>
5+ <checksum type="sha256">b51226f94407927392247df8ef64047a2eab8dacca30218d3c06c380b9e1edb9</checksum>
6+ <open-checksum type="sha256">0531e2134741e231157b3d44981fb5df607fb69d646d169e3acdc708cb1e3fdf</open-checksum>
77 <location href="repodata/filelists.xml.gz"/>
8- <timestamp>1531545576</timestamp>
9- <size>79318</size>
10- <open-size>1435761</open-size>
8+ <timestamp>1536029613</timestamp>
9+ <size>79324</size>
10+ <open-size>1435970</open-size>
1111 </data>
1212 <data type="other">
13- <checksum type="sha256">24627cbfb7bedd584a97eef574dc5b1b14873e0880ade762096c577740dc9a2c</checksum>
14- <open-checksum type="sha256">91f782c555152464b8ed048bab5f9f00159ce751ee2069b00b4e8c93e1daa5e6</open-checksum>
13+ <checksum type="sha256">ea50968c9b3198ced21016e1955a4c7b3dbfd715d0e8a88fcc861db9b508b871</checksum>
14+ <open-checksum type="sha256">277fcdf5617abbbf8711b3503db468aa210ff7368e6d7d798466605f2718096f</open-checksum>
1515 <location href="repodata/other.xml.gz"/>
16- <timestamp>1531545576</timestamp>
17- <size>8093</size>
18- <open-size>75041</open-size>
16+ <timestamp>1536029613</timestamp>
17+ <size>9474</size>
18+ <open-size>97658</open-size>
1919 </data>
2020 <data type="primary">
21- <checksum type="sha256">a7a3fe636fcaa72839534736f636b0bc33e05370575dbd0e322d546cc9e3e266</checksum>
22- <open-checksum type="sha256">9a07cdaea702f341df22b82ed2d540dbe988ce44a31b402aa3807a06457a550a</open-checksum>
21+ <checksum type="sha256">7d8cd326b6f717ae7477a757c181743cecfd8c9ac8bfade5943e7f83f13da4c4</checksum>
22+ <open-checksum type="sha256">16fcfe30818d0c4dacfdf76236be3eb1eed95a4b8ec76aa99c452cb64be857d2</open-checksum>
2323 <location href="repodata/primary.xml.gz"/>
24- <timestamp>1531545576</timestamp>
25- <size>160663</size>
26- <open-size>1111746</open-size>
24+ <timestamp>1536029613</timestamp>
25+ <size>160690</size>
26+ <open-size>1111917</open-size>
2727 </data>
2828 </repomd>
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-3.18.diff (revision 6663)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-3.18.diff (revision 6664)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 3.18.119.
1+This is TOMOYO Linux patch for kernel 3.18.120.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.119.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.120.tar.xz
44 ---
55 fs/exec.c | 2
66 fs/open.c | 2
@@ -29,8 +29,8 @@
2929 security/security.c | 111 +++++++++++++++++++++++++++++++++++++++++-----
3030 25 files changed, 252 insertions(+), 37 deletions(-)
3131
32---- linux-3.18.119.orig/fs/exec.c
33-+++ linux-3.18.119/fs/exec.c
32+--- linux-3.18.120.orig/fs/exec.c
33++++ linux-3.18.120/fs/exec.c
3434 @@ -1463,7 +1463,7 @@ static int exec_binprm(struct linux_binp
3535 old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
3636 rcu_read_unlock();
@@ -40,8 +40,8 @@
4040 if (ret >= 0) {
4141 audit_bprm(bprm);
4242 trace_sched_process_exec(current, old_pid, bprm);
43---- linux-3.18.119.orig/fs/open.c
44-+++ linux-3.18.119/fs/open.c
43+--- linux-3.18.120.orig/fs/open.c
44++++ linux-3.18.120/fs/open.c
4545 @@ -1091,6 +1091,8 @@ EXPORT_SYMBOL(sys_close);
4646 */
4747 SYSCALL_DEFINE0(vhangup)
@@ -51,8 +51,8 @@
5151 if (capable(CAP_SYS_TTY_CONFIG)) {
5252 tty_vhangup_self();
5353 return 0;
54---- linux-3.18.119.orig/fs/proc/version.c
55-+++ linux-3.18.119/fs/proc/version.c
54+--- linux-3.18.120.orig/fs/proc/version.c
55++++ linux-3.18.120/fs/proc/version.c
5656 @@ -32,3 +32,10 @@ static int __init proc_version_init(void
5757 return 0;
5858 }
@@ -60,12 +60,12 @@
6060 +
6161 +static int __init ccs_show_version(void)
6262 +{
63-+ printk(KERN_INFO "Hook version: 3.18.119 2018/08/25\n");
63++ printk(KERN_INFO "Hook version: 3.18.120 2018/09/04\n");
6464 + return 0;
6565 +}
6666 +fs_initcall(ccs_show_version);
67---- linux-3.18.119.orig/include/linux/init_task.h
68-+++ linux-3.18.119/include/linux/init_task.h
67+--- linux-3.18.120.orig/include/linux/init_task.h
68++++ linux-3.18.120/include/linux/init_task.h
6969 @@ -166,6 +166,14 @@ extern struct task_group root_task_group
7070 # define INIT_RT_MUTEXES(tsk)
7171 #endif
@@ -89,8 +89,8 @@
8989 }
9090
9191
92---- linux-3.18.119.orig/include/linux/sched.h
93-+++ linux-3.18.119/include/linux/sched.h
92+--- linux-3.18.120.orig/include/linux/sched.h
93++++ linux-3.18.120/include/linux/sched.h
9494 @@ -6,6 +6,8 @@
9595 #include <linux/sched/prio.h>
9696
@@ -111,8 +111,8 @@
111111 };
112112
113113 /* Future-safe accessor for struct task_struct's cpus_allowed. */
114---- linux-3.18.119.orig/include/linux/security.h
115-+++ linux-3.18.119/include/linux/security.h
114+--- linux-3.18.120.orig/include/linux/security.h
115++++ linux-3.18.120/include/linux/security.h
116116 @@ -53,6 +53,7 @@ struct msg_queue;
117117 struct xattr;
118118 struct xfrm_sec_ctx;
@@ -324,8 +324,8 @@
324324 }
325325 #endif /* CONFIG_SECURITY_PATH */
326326
327---- linux-3.18.119.orig/include/net/ip.h
328-+++ linux-3.18.119/include/net/ip.h
327+--- linux-3.18.120.orig/include/net/ip.h
328++++ linux-3.18.120/include/net/ip.h
329329 @@ -218,6 +218,8 @@ void inet_get_local_port_range(struct ne
330330 #ifdef CONFIG_SYSCTL
331331 static inline int inet_is_local_reserved_port(struct net *net, int port)
@@ -344,8 +344,8 @@
344344 return 0;
345345 }
346346 #endif
347---- linux-3.18.119.orig/kernel/fork.c
348-+++ linux-3.18.119/kernel/fork.c
347+--- linux-3.18.120.orig/kernel/fork.c
348++++ linux-3.18.120/kernel/fork.c
349349 @@ -246,6 +246,7 @@ void __put_task_struct(struct task_struc
350350 delayacct_tsk_free(tsk);
351351 put_signal_struct(tsk->signal);
@@ -372,8 +372,8 @@
372372 bad_fork_cleanup_perf:
373373 perf_event_free_task(p);
374374 bad_fork_cleanup_policy:
375---- linux-3.18.119.orig/kernel/kexec.c
376-+++ linux-3.18.119/kernel/kexec.c
375+--- linux-3.18.120.orig/kernel/kexec.c
376++++ linux-3.18.120/kernel/kexec.c
377377 @@ -41,6 +41,7 @@
378378 #include <asm/uaccess.h>
379379 #include <asm/io.h>
@@ -391,8 +391,8 @@
391391
392392 /*
393393 * Verify we have a legal set of flags
394---- linux-3.18.119.orig/kernel/module.c
395-+++ linux-3.18.119/kernel/module.c
394+--- linux-3.18.120.orig/kernel/module.c
395++++ linux-3.18.120/kernel/module.c
396396 @@ -62,6 +62,7 @@
397397 #include <linux/bsearch.h>
398398 #include <uapi/linux/module.h>
@@ -419,8 +419,8 @@
419419
420420 return 0;
421421 }
422---- linux-3.18.119.orig/kernel/ptrace.c
423-+++ linux-3.18.119/kernel/ptrace.c
422+--- linux-3.18.120.orig/kernel/ptrace.c
423++++ linux-3.18.120/kernel/ptrace.c
424424 @@ -1081,6 +1081,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
425425 {
426426 struct task_struct *child;
@@ -445,8 +445,8 @@
445445
446446 if (request == PTRACE_TRACEME) {
447447 ret = ptrace_traceme();
448---- linux-3.18.119.orig/kernel/reboot.c
449-+++ linux-3.18.119/kernel/reboot.c
448+--- linux-3.18.120.orig/kernel/reboot.c
449++++ linux-3.18.120/kernel/reboot.c
450450 @@ -16,6 +16,7 @@
451451 #include <linux/syscalls.h>
452452 #include <linux/syscore_ops.h>
@@ -464,8 +464,8 @@
464464
465465 /*
466466 * If pid namespaces are enabled and the current task is in a child
467---- linux-3.18.119.orig/kernel/sched/core.c
468-+++ linux-3.18.119/kernel/sched/core.c
467+--- linux-3.18.120.orig/kernel/sched/core.c
468++++ linux-3.18.120/kernel/sched/core.c
469469 @@ -3218,6 +3218,8 @@ int can_nice(const struct task_struct *p
470470 SYSCALL_DEFINE1(nice, int, increment)
471471 {
@@ -475,8 +475,8 @@
475475
476476 /*
477477 * Setpriority might change our priority at the same moment.
478---- linux-3.18.119.orig/kernel/signal.c
479-+++ linux-3.18.119/kernel/signal.c
478+--- linux-3.18.120.orig/kernel/signal.c
479++++ linux-3.18.120/kernel/signal.c
480480 @@ -2901,6 +2901,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
481481 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
482482 {
@@ -522,8 +522,8 @@
522522
523523 return do_send_specific(tgid, pid, sig, info);
524524 }
525---- linux-3.18.119.orig/kernel/sys.c
526-+++ linux-3.18.119/kernel/sys.c
525+--- linux-3.18.120.orig/kernel/sys.c
526++++ linux-3.18.120/kernel/sys.c
527527 @@ -171,6 +171,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
528528
529529 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -553,8 +553,8 @@
553553
554554 down_write(&uts_sem);
555555 errno = -EFAULT;
556---- linux-3.18.119.orig/kernel/time/ntp.c
557-+++ linux-3.18.119/kernel/time/ntp.c
556+--- linux-3.18.120.orig/kernel/time/ntp.c
557++++ linux-3.18.120/kernel/time/ntp.c
558558 @@ -16,6 +16,7 @@
559559 #include <linux/mm.h>
560560 #include <linux/module.h>
@@ -588,8 +588,8 @@
588588
589589 /*
590590 * Check for potential multiplication overflows that can
591---- linux-3.18.119.orig/net/ipv4/raw.c
592-+++ linux-3.18.119/net/ipv4/raw.c
591+--- linux-3.18.120.orig/net/ipv4/raw.c
592++++ linux-3.18.120/net/ipv4/raw.c
593593 @@ -719,6 +719,10 @@ static int raw_recvmsg(struct kiocb *ioc
594594 skb = skb_recv_datagram(sk, flags, noblock, &err);
595595 if (!skb)
@@ -601,8 +601,8 @@
601601
602602 copied = skb->len;
603603 if (len < copied) {
604---- linux-3.18.119.orig/net/ipv4/udp.c
605-+++ linux-3.18.119/net/ipv4/udp.c
604+--- linux-3.18.120.orig/net/ipv4/udp.c
605++++ linux-3.18.120/net/ipv4/udp.c
606606 @@ -1266,6 +1266,10 @@ try_again:
607607 &peeked, &off, &err);
608608 if (!skb)
@@ -614,8 +614,8 @@
614614
615615 ulen = skb->len - sizeof(struct udphdr);
616616 copied = len;
617---- linux-3.18.119.orig/net/ipv6/raw.c
618-+++ linux-3.18.119/net/ipv6/raw.c
617+--- linux-3.18.120.orig/net/ipv6/raw.c
618++++ linux-3.18.120/net/ipv6/raw.c
619619 @@ -478,6 +478,10 @@ static int rawv6_recvmsg(struct kiocb *i
620620 skb = skb_recv_datagram(sk, flags, noblock, &err);
621621 if (!skb)
@@ -627,8 +627,8 @@
627627
628628 copied = skb->len;
629629 if (copied > len) {
630---- linux-3.18.119.orig/net/ipv6/udp.c
631-+++ linux-3.18.119/net/ipv6/udp.c
630+--- linux-3.18.120.orig/net/ipv6/udp.c
631++++ linux-3.18.120/net/ipv6/udp.c
632632 @@ -403,6 +403,10 @@ try_again:
633633 &peeked, &off, &err);
634634 if (!skb)
@@ -640,8 +640,8 @@
640640
641641 ulen = skb->len - sizeof(struct udphdr);
642642 copied = len;
643---- linux-3.18.119.orig/net/socket.c
644-+++ linux-3.18.119/net/socket.c
643+--- linux-3.18.120.orig/net/socket.c
644++++ linux-3.18.120/net/socket.c
645645 @@ -1637,6 +1637,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
646646 if (err < 0)
647647 goto out_fd;
@@ -653,8 +653,8 @@
653653 if (upeer_sockaddr) {
654654 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
655655 &len, 2) < 0) {
656---- linux-3.18.119.orig/net/unix/af_unix.c
657-+++ linux-3.18.119/net/unix/af_unix.c
656+--- linux-3.18.120.orig/net/unix/af_unix.c
657++++ linux-3.18.120/net/unix/af_unix.c
658658 @@ -1981,6 +1981,10 @@ static int unix_dgram_recvmsg(struct kio
659659 wake_up_interruptible_sync_poll(&u->peer_wait,
660660 POLLOUT | POLLWRNORM | POLLWRBAND);
@@ -666,8 +666,8 @@
666666 if (msg->msg_name)
667667 unix_copy_addr(msg, skb->sk);
668668
669---- linux-3.18.119.orig/security/Kconfig
670-+++ linux-3.18.119/security/Kconfig
669+--- linux-3.18.120.orig/security/Kconfig
670++++ linux-3.18.120/security/Kconfig
671671 @@ -167,5 +167,7 @@ config DEFAULT_SECURITY
672672 default "yama" if DEFAULT_SECURITY_YAMA
673673 default "" if DEFAULT_SECURITY_DAC
@@ -676,8 +676,8 @@
676676 +
677677 endmenu
678678
679---- linux-3.18.119.orig/security/Makefile
680-+++ linux-3.18.119/security/Makefile
679+--- linux-3.18.120.orig/security/Makefile
680++++ linux-3.18.120/security/Makefile
681681 @@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
682682 # Object integrity file lists
683683 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -685,8 +685,8 @@
685685 +
686686 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
687687 +obj-$(CONFIG_CCSECURITY) += ccsecurity/
688---- linux-3.18.119.orig/security/security.c
689-+++ linux-3.18.119/security/security.c
688+--- linux-3.18.120.orig/security/security.c
689++++ linux-3.18.120/security/security.c
690690 @@ -203,7 +203,10 @@ int security_syslog(int type)
691691
692692 int security_settime(const struct timespec *ts, const struct timezone *tz)
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.19.diff (revision 6663)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.19.diff (revision 6664)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.19-rc1.
1+This is TOMOYO Linux patch for kernel 4.19-rc2.
22
3-Source code for this patch is https://git.kernel.org/torvalds/t/linux-4.19-rc1.tar.gz
3+Source code for this patch is https://git.kernel.org/torvalds/t/linux-4.19-rc2.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.orig/fs/exec.c
32-+++ linux/fs/exec.c
31+--- linux-4.19-rc2.orig/fs/exec.c
32++++ linux-4.19-rc2/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.orig/fs/open.c
43-+++ linux/fs/open.c
42+--- linux-4.19-rc2.orig/fs/open.c
43++++ linux-4.19-rc2/fs/open.c
4444 @@ -1174,6 +1174,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.orig/fs/proc/version.c
54-+++ linux/fs/proc/version.c
53+--- linux-4.19-rc2.orig/fs/proc/version.c
54++++ linux-4.19-rc2/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.19-rc1 2018/08/27\n");
62++ printk(KERN_INFO "Hook version: 4.19-rc2 2018/09/04\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux.orig/include/linux/sched.h
67-+++ linux/include/linux/sched.h
66+--- linux-4.19-rc2.orig/include/linux/sched.h
67++++ linux-4.19-rc2/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.orig/include/linux/security.h
88-+++ linux/include/linux/security.h
87+--- linux-4.19-rc2.orig/include/linux/security.h
88++++ linux-4.19-rc2/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.orig/include/net/ip.h
310-+++ linux/include/net/ip.h
309+--- linux-4.19-rc2.orig/include/net/ip.h
310++++ linux-4.19-rc2/include/net/ip.h
311311 @@ -301,6 +301,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.orig/init/init_task.c
330-+++ linux/init/init_task.c
329+--- linux-4.19-rc2.orig/init/init_task.c
330++++ linux-4.19-rc2/init/init_task.c
331331 @@ -179,6 +179,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.orig/kernel/kexec.c
343-+++ linux/kernel/kexec.c
342+--- linux-4.19-rc2.orig/kernel/kexec.c
343++++ linux-4.19-rc2/kernel/kexec.c
344344 @@ -18,7 +18,7 @@
345345 #include <linux/syscalls.h>
346346 #include <linux/vmalloc.h>
@@ -359,8 +359,8 @@
359359
360360 /* Permit LSMs and IMA to fail the kexec */
361361 result = security_kernel_load_data(LOADING_KEXEC_IMAGE);
362---- linux.orig/kernel/module.c
363-+++ linux/kernel/module.c
362+--- linux-4.19-rc2.orig/kernel/module.c
363++++ linux-4.19-rc2/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.orig/kernel/ptrace.c
391-+++ linux/kernel/ptrace.c
390+--- linux-4.19-rc2.orig/kernel/ptrace.c
391++++ linux-4.19-rc2/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.orig/kernel/reboot.c
417-+++ linux/kernel/reboot.c
416+--- linux-4.19-rc2.orig/kernel/reboot.c
417++++ linux-4.19-rc2/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.orig/kernel/sched/core.c
436-+++ linux/kernel/sched/core.c
435+--- linux-4.19-rc2.orig/kernel/sched/core.c
436++++ linux-4.19-rc2/kernel/sched/core.c
437437 @@ -3944,6 +3944,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.orig/kernel/signal.c
447-+++ linux/kernel/signal.c
446+--- linux-4.19-rc2.orig/kernel/signal.c
447++++ linux-4.19-rc2/kernel/signal.c
448448 @@ -3210,6 +3210,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.orig/kernel/sys.c
494-+++ linux/kernel/sys.c
493+--- linux-4.19-rc2.orig/kernel/sys.c
494++++ linux-4.19-rc2/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 errno = -EFAULT;
523523 if (!copy_from_user(tmp, name, len)) {
524---- linux.orig/kernel/time/timekeeping.c
525-+++ linux/kernel/time/timekeeping.c
524+--- linux-4.19-rc2.orig/kernel/time/timekeeping.c
525++++ linux-4.19-rc2/kernel/time/timekeeping.c
526526 @@ -26,6 +26,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.orig/net/ipv4/raw.c
560-+++ linux/net/ipv4/raw.c
559+--- linux-4.19-rc2.orig/net/ipv4/raw.c
560++++ linux-4.19-rc2/net/ipv4/raw.c
561561 @@ -772,6 +772,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.orig/net/ipv4/udp.c
573-+++ linux/net/ipv4/udp.c
572+--- linux-4.19-rc2.orig/net/ipv4/udp.c
573++++ linux-4.19-rc2/net/ipv4/udp.c
574574 @@ -1655,6 +1655,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.orig/net/ipv6/raw.c
584-+++ linux/net/ipv6/raw.c
583+--- linux-4.19-rc2.orig/net/ipv6/raw.c
584++++ linux-4.19-rc2/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.orig/net/ipv6/udp.c
597-+++ linux/net/ipv6/udp.c
596+--- linux-4.19-rc2.orig/net/ipv6/udp.c
597++++ linux-4.19-rc2/net/ipv6/udp.c
598598 @@ -343,6 +343,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.orig/net/socket.c
608-+++ linux/net/socket.c
607+--- linux-4.19-rc2.orig/net/socket.c
608++++ linux-4.19-rc2/net/socket.c
609609 @@ -1589,6 +1589,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.orig/net/unix/af_unix.c
621-+++ linux/net/unix/af_unix.c
620+--- linux-4.19-rc2.orig/net/unix/af_unix.c
621++++ linux-4.19-rc2/net/unix/af_unix.c
622622 @@ -2127,6 +2127,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.orig/security/Kconfig
642-+++ linux/security/Kconfig
641+--- linux-4.19-rc2.orig/security/Kconfig
642++++ linux-4.19-rc2/security/Kconfig
643643 @@ -276,5 +276,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.orig/security/Makefile
652-+++ linux/security/Makefile
651+--- linux-4.19-rc2.orig/security/Makefile
652++++ linux-4.19-rc2/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.orig/security/security.c
661-+++ linux/security/security.c
660+--- linux-4.19-rc2.orig/security/security.c
661++++ linux-4.19-rc2/security/security.c
662662 @@ -988,12 +988,19 @@ int security_file_open(struct file *file
663663
664664 int security_task_alloc(struct task_struct *task, unsigned long clone_flags)
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.4.diff (revision 6663)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.4.diff (revision 6664)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 4.4.152.
1+This is TOMOYO Linux patch for kernel 4.4.153.
22
3-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.152.tar.xz
3+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.153.tar.xz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,8 +28,8 @@
2828 security/Makefile | 3 ++
2929 24 files changed, 150 insertions(+), 26 deletions(-)
3030
31---- linux-4.4.152.orig/fs/exec.c
32-+++ linux-4.4.152/fs/exec.c
31+--- linux-4.4.153.orig/fs/exec.c
32++++ linux-4.4.153/fs/exec.c
3333 @@ -1508,7 +1508,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.4.152.orig/fs/open.c
43-+++ linux-4.4.152/fs/open.c
42+--- linux-4.4.153.orig/fs/open.c
43++++ linux-4.4.153/fs/open.c
4444 @@ -1117,6 +1117,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.4.152.orig/fs/proc/version.c
54-+++ linux-4.4.152/fs/proc/version.c
53+--- linux-4.4.153.orig/fs/proc/version.c
54++++ linux-4.4.153/fs/proc/version.c
5555 @@ -32,3 +32,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.4.152 2018/08/25\n");
62++ printk(KERN_INFO "Hook version: 4.4.153 2018/09/04\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-4.4.152.orig/include/linux/init_task.h
67-+++ linux-4.4.152/include/linux/init_task.h
66+--- linux-4.4.153.orig/include/linux/init_task.h
67++++ linux-4.4.153/include/linux/init_task.h
6868 @@ -183,6 +183,14 @@ extern struct task_group root_task_group
6969 # define INIT_KASAN(tsk)
7070 #endif
@@ -88,8 +88,8 @@
8888 }
8989
9090
91---- linux-4.4.152.orig/include/linux/sched.h
92-+++ linux-4.4.152/include/linux/sched.h
91+--- linux-4.4.153.orig/include/linux/sched.h
92++++ linux-4.4.153/include/linux/sched.h
9393 @@ -6,6 +6,8 @@
9494 #include <linux/sched/prio.h>
9595
@@ -110,8 +110,8 @@
110110 /* CPU-specific state of this task */
111111 struct thread_struct thread;
112112 /*
113---- linux-4.4.152.orig/include/linux/security.h
114-+++ linux-4.4.152/include/linux/security.h
113+--- linux-4.4.153.orig/include/linux/security.h
114++++ linux-4.4.153/include/linux/security.h
115115 @@ -53,6 +53,7 @@ struct msg_queue;
116116 struct xattr;
117117 struct xfrm_sec_ctx;
@@ -318,8 +318,8 @@
318318 }
319319 #endif /* CONFIG_SECURITY_PATH */
320320
321---- linux-4.4.152.orig/include/net/ip.h
322-+++ linux-4.4.152/include/net/ip.h
321+--- linux-4.4.153.orig/include/net/ip.h
322++++ linux-4.4.153/include/net/ip.h
323323 @@ -225,6 +225,8 @@ void inet_get_local_port_range(struct ne
324324 #ifdef CONFIG_SYSCTL
325325 static inline int inet_is_local_reserved_port(struct net *net, int port)
@@ -338,8 +338,8 @@
338338 return 0;
339339 }
340340 #endif
341---- linux-4.4.152.orig/kernel/fork.c
342-+++ linux-4.4.152/kernel/fork.c
341+--- linux-4.4.153.orig/kernel/fork.c
342++++ linux-4.4.153/kernel/fork.c
343343 @@ -260,6 +260,7 @@ void __put_task_struct(struct task_struc
344344 delayacct_tsk_free(tsk);
345345 put_signal_struct(tsk->signal);
@@ -366,8 +366,8 @@
366366 bad_fork_cleanup_perf:
367367 perf_event_free_task(p);
368368 bad_fork_cleanup_policy:
369---- linux-4.4.152.orig/kernel/kexec.c
370-+++ linux-4.4.152/kernel/kexec.c
369+--- linux-4.4.153.orig/kernel/kexec.c
370++++ linux-4.4.153/kernel/kexec.c
371371 @@ -17,7 +17,7 @@
372372 #include <linux/syscalls.h>
373373 #include <linux/vmalloc.h>
@@ -386,8 +386,8 @@
386386
387387 /*
388388 * Verify we have a legal set of flags
389---- linux-4.4.152.orig/kernel/module.c
390-+++ linux-4.4.152/kernel/module.c
389+--- linux-4.4.153.orig/kernel/module.c
390++++ linux-4.4.153/kernel/module.c
391391 @@ -61,6 +61,7 @@
392392 #include <linux/bsearch.h>
393393 #include <uapi/linux/module.h>
@@ -414,8 +414,8 @@
414414
415415 return 0;
416416 }
417---- linux-4.4.152.orig/kernel/ptrace.c
418-+++ linux-4.4.152/kernel/ptrace.c
417+--- linux-4.4.153.orig/kernel/ptrace.c
418++++ linux-4.4.153/kernel/ptrace.c
419419 @@ -1085,6 +1085,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
420420 {
421421 struct task_struct *child;
@@ -440,8 +440,8 @@
440440
441441 if (request == PTRACE_TRACEME) {
442442 ret = ptrace_traceme();
443---- linux-4.4.152.orig/kernel/reboot.c
444-+++ linux-4.4.152/kernel/reboot.c
443+--- linux-4.4.153.orig/kernel/reboot.c
444++++ linux-4.4.153/kernel/reboot.c
445445 @@ -16,6 +16,7 @@
446446 #include <linux/syscalls.h>
447447 #include <linux/syscore_ops.h>
@@ -459,8 +459,8 @@
459459
460460 /*
461461 * If pid namespaces are enabled and the current task is in a child
462---- linux-4.4.152.orig/kernel/sched/core.c
463-+++ linux-4.4.152/kernel/sched/core.c
462+--- linux-4.4.153.orig/kernel/sched/core.c
463++++ linux-4.4.153/kernel/sched/core.c
464464 @@ -3549,6 +3549,8 @@ int can_nice(const struct task_struct *p
465465 SYSCALL_DEFINE1(nice, int, increment)
466466 {
@@ -470,8 +470,8 @@
470470
471471 /*
472472 * Setpriority might change our priority at the same moment.
473---- linux-4.4.152.orig/kernel/signal.c
474-+++ linux-4.4.152/kernel/signal.c
473+--- linux-4.4.153.orig/kernel/signal.c
474++++ linux-4.4.153/kernel/signal.c
475475 @@ -2868,6 +2868,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
476476 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
477477 {
@@ -517,8 +517,8 @@
517517
518518 return do_send_specific(tgid, pid, sig, info);
519519 }
520---- linux-4.4.152.orig/kernel/sys.c
521-+++ linux-4.4.152/kernel/sys.c
520+--- linux-4.4.153.orig/kernel/sys.c
521++++ linux-4.4.153/kernel/sys.c
522522 @@ -185,6 +185,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
523523
524524 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -548,8 +548,8 @@
548548
549549 down_write(&uts_sem);
550550 errno = -EFAULT;
551---- linux-4.4.152.orig/kernel/time/ntp.c
552-+++ linux-4.4.152/kernel/time/ntp.c
551+--- linux-4.4.153.orig/kernel/time/ntp.c
552++++ linux-4.4.153/kernel/time/ntp.c
553553 @@ -16,6 +16,7 @@
554554 #include <linux/mm.h>
555555 #include <linux/module.h>
@@ -583,8 +583,8 @@
583583
584584 if (txc->modes & ADJ_NANO) {
585585 struct timespec ts;
586---- linux-4.4.152.orig/net/ipv4/raw.c
587-+++ linux-4.4.152/net/ipv4/raw.c
586+--- linux-4.4.153.orig/net/ipv4/raw.c
587++++ linux-4.4.153/net/ipv4/raw.c
588588 @@ -747,6 +747,10 @@ static int raw_recvmsg(struct sock *sk,
589589 skb = skb_recv_datagram(sk, flags, noblock, &err);
590590 if (!skb)
@@ -596,8 +596,8 @@
596596
597597 copied = skb->len;
598598 if (len < copied) {
599---- linux-4.4.152.orig/net/ipv4/udp.c
600-+++ linux-4.4.152/net/ipv4/udp.c
599+--- linux-4.4.153.orig/net/ipv4/udp.c
600++++ linux-4.4.153/net/ipv4/udp.c
601601 @@ -1289,6 +1289,10 @@ try_again:
602602 &peeked, &off, &err);
603603 if (!skb)
@@ -609,8 +609,8 @@
609609
610610 ulen = skb->len - sizeof(struct udphdr);
611611 copied = len;
612---- linux-4.4.152.orig/net/ipv6/raw.c
613-+++ linux-4.4.152/net/ipv6/raw.c
612+--- linux-4.4.153.orig/net/ipv6/raw.c
613++++ linux-4.4.153/net/ipv6/raw.c
614614 @@ -478,6 +478,10 @@ static int rawv6_recvmsg(struct sock *sk
615615 skb = skb_recv_datagram(sk, flags, noblock, &err);
616616 if (!skb)
@@ -622,8 +622,8 @@
622622
623623 copied = skb->len;
624624 if (copied > len) {
625---- linux-4.4.152.orig/net/ipv6/udp.c
626-+++ linux-4.4.152/net/ipv6/udp.c
625+--- linux-4.4.153.orig/net/ipv6/udp.c
626++++ linux-4.4.153/net/ipv6/udp.c
627627 @@ -417,6 +417,10 @@ try_again:
628628 &peeked, &off, &err);
629629 if (!skb)
@@ -635,8 +635,8 @@
635635
636636 ulen = skb->len - sizeof(struct udphdr);
637637 copied = len;
638---- linux-4.4.152.orig/net/socket.c
639-+++ linux-4.4.152/net/socket.c
638+--- linux-4.4.153.orig/net/socket.c
639++++ linux-4.4.153/net/socket.c
640640 @@ -1477,6 +1477,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
641641 if (err < 0)
642642 goto out_fd;
@@ -648,8 +648,8 @@
648648 if (upeer_sockaddr) {
649649 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
650650 &len, 2) < 0) {
651---- linux-4.4.152.orig/net/unix/af_unix.c
652-+++ linux-4.4.152/net/unix/af_unix.c
651+--- linux-4.4.153.orig/net/unix/af_unix.c
652++++ linux-4.4.153/net/unix/af_unix.c
653653 @@ -2144,6 +2144,10 @@ static int unix_dgram_recvmsg(struct soc
654654 wake_up_interruptible_sync_poll(&u->peer_wait,
655655 POLLOUT | POLLWRNORM | POLLWRBAND);
@@ -661,8 +661,8 @@
661661 if (msg->msg_name)
662662 unix_copy_addr(msg, skb->sk);
663663
664---- linux-4.4.152.orig/security/Kconfig
665-+++ linux-4.4.152/security/Kconfig
664+--- linux-4.4.153.orig/security/Kconfig
665++++ linux-4.4.153/security/Kconfig
666666 @@ -173,5 +173,7 @@ config DEFAULT_SECURITY
667667 default "apparmor" if DEFAULT_SECURITY_APPARMOR
668668 default "" if DEFAULT_SECURITY_DAC
@@ -671,8 +671,8 @@
671671 +
672672 endmenu
673673
674---- linux-4.4.152.orig/security/Makefile
675-+++ linux-4.4.152/security/Makefile
674+--- linux-4.4.153.orig/security/Makefile
675++++ linux-4.4.153/security/Makefile
676676 @@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
677677 # Object integrity file lists
678678 subdir-$(CONFIG_INTEGRITY) += integrity
旧リポジトリブラウザで表示