(empty log message)
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 3.18.18. | |
1 | +This is TOMOYO Linux patch for kernel 3.18.19. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.18.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.19.tar.xz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 |
6 | 6 | fs/open.c | 2 |
@@ -29,8 +29,8 @@ | ||
29 | 29 | security/security.c | 111 +++++++++++++++++++++++++++++++++++++++++----- |
30 | 30 | 25 files changed, 252 insertions(+), 37 deletions(-) |
31 | 31 | |
32 | ---- linux-3.18.18.orig/fs/exec.c | |
33 | -+++ linux-3.18.18/fs/exec.c | |
32 | +--- linux-3.18.19.orig/fs/exec.c | |
33 | ++++ linux-3.18.19/fs/exec.c | |
34 | 34 | @@ -1436,7 +1436,7 @@ static int exec_binprm(struct linux_binp |
35 | 35 | old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent)); |
36 | 36 | rcu_read_unlock(); |
@@ -40,8 +40,8 @@ | ||
40 | 40 | if (ret >= 0) { |
41 | 41 | audit_bprm(bprm); |
42 | 42 | trace_sched_process_exec(current, old_pid, bprm); |
43 | ---- linux-3.18.18.orig/fs/open.c | |
44 | -+++ linux-3.18.18/fs/open.c | |
43 | +--- linux-3.18.19.orig/fs/open.c | |
44 | ++++ linux-3.18.19/fs/open.c | |
45 | 45 | @@ -1090,6 +1090,8 @@ EXPORT_SYMBOL(sys_close); |
46 | 46 | */ |
47 | 47 | SYSCALL_DEFINE0(vhangup) |
@@ -51,8 +51,8 @@ | ||
51 | 51 | if (capable(CAP_SYS_TTY_CONFIG)) { |
52 | 52 | tty_vhangup_self(); |
53 | 53 | return 0; |
54 | ---- linux-3.18.18.orig/fs/proc/version.c | |
55 | -+++ linux-3.18.18/fs/proc/version.c | |
54 | +--- linux-3.18.19.orig/fs/proc/version.c | |
55 | ++++ linux-3.18.19/fs/proc/version.c | |
56 | 56 | @@ -32,3 +32,10 @@ static int __init proc_version_init(void |
57 | 57 | return 0; |
58 | 58 | } |
@@ -60,12 +60,12 @@ | ||
60 | 60 | + |
61 | 61 | +static int __init ccs_show_version(void) |
62 | 62 | +{ |
63 | -+ printk(KERN_INFO "Hook version: 3.18.18 2015/07/11\n"); | |
63 | ++ printk(KERN_INFO "Hook version: 3.18.19 2015/07/28\n"); | |
64 | 64 | + return 0; |
65 | 65 | +} |
66 | 66 | +fs_initcall(ccs_show_version); |
67 | ---- linux-3.18.18.orig/include/linux/init_task.h | |
68 | -+++ linux-3.18.18/include/linux/init_task.h | |
67 | +--- linux-3.18.19.orig/include/linux/init_task.h | |
68 | ++++ linux-3.18.19/include/linux/init_task.h | |
69 | 69 | @@ -166,6 +166,14 @@ extern struct task_group root_task_group |
70 | 70 | # define INIT_RT_MUTEXES(tsk) |
71 | 71 | #endif |
@@ -89,8 +89,8 @@ | ||
89 | 89 | } |
90 | 90 | |
91 | 91 | |
92 | ---- linux-3.18.18.orig/include/linux/sched.h | |
93 | -+++ linux-3.18.18/include/linux/sched.h | |
92 | +--- linux-3.18.19.orig/include/linux/sched.h | |
93 | ++++ linux-3.18.19/include/linux/sched.h | |
94 | 94 | @@ -6,6 +6,8 @@ |
95 | 95 | #include <linux/sched/prio.h> |
96 | 96 |
@@ -111,8 +111,8 @@ | ||
111 | 111 | }; |
112 | 112 | |
113 | 113 | /* Future-safe accessor for struct task_struct's cpus_allowed. */ |
114 | ---- linux-3.18.18.orig/include/linux/security.h | |
115 | -+++ linux-3.18.18/include/linux/security.h | |
114 | +--- linux-3.18.19.orig/include/linux/security.h | |
115 | ++++ linux-3.18.19/include/linux/security.h | |
116 | 116 | @@ -53,6 +53,7 @@ struct msg_queue; |
117 | 117 | struct xattr; |
118 | 118 | struct xfrm_sec_ctx; |
@@ -324,8 +324,8 @@ | ||
324 | 324 | } |
325 | 325 | #endif /* CONFIG_SECURITY_PATH */ |
326 | 326 | |
327 | ---- linux-3.18.18.orig/include/net/ip.h | |
328 | -+++ linux-3.18.18/include/net/ip.h | |
327 | +--- linux-3.18.19.orig/include/net/ip.h | |
328 | ++++ linux-3.18.19/include/net/ip.h | |
329 | 329 | @@ -215,6 +215,8 @@ void inet_get_local_port_range(struct ne |
330 | 330 | #ifdef CONFIG_SYSCTL |
331 | 331 | static inline int inet_is_local_reserved_port(struct net *net, int port) |
@@ -344,8 +344,8 @@ | ||
344 | 344 | return 0; |
345 | 345 | } |
346 | 346 | #endif |
347 | ---- linux-3.18.18.orig/kernel/fork.c | |
348 | -+++ linux-3.18.18/kernel/fork.c | |
347 | +--- linux-3.18.19.orig/kernel/fork.c | |
348 | ++++ linux-3.18.19/kernel/fork.c | |
349 | 349 | @@ -246,6 +246,7 @@ void __put_task_struct(struct task_struc |
350 | 350 | delayacct_tsk_free(tsk); |
351 | 351 | put_signal_struct(tsk->signal); |
@@ -372,8 +372,8 @@ | ||
372 | 372 | bad_fork_cleanup_perf: |
373 | 373 | perf_event_free_task(p); |
374 | 374 | bad_fork_cleanup_policy: |
375 | ---- linux-3.18.18.orig/kernel/kexec.c | |
376 | -+++ linux-3.18.18/kernel/kexec.c | |
375 | +--- linux-3.18.19.orig/kernel/kexec.c | |
376 | ++++ linux-3.18.19/kernel/kexec.c | |
377 | 377 | @@ -41,6 +41,7 @@ |
378 | 378 | #include <asm/uaccess.h> |
379 | 379 | #include <asm/io.h> |
@@ -391,8 +391,8 @@ | ||
391 | 391 | |
392 | 392 | /* |
393 | 393 | * Verify we have a legal set of flags |
394 | ---- linux-3.18.18.orig/kernel/module.c | |
395 | -+++ linux-3.18.18/kernel/module.c | |
394 | +--- linux-3.18.19.orig/kernel/module.c | |
395 | ++++ linux-3.18.19/kernel/module.c | |
396 | 396 | @@ -62,6 +62,7 @@ |
397 | 397 | #include <linux/bsearch.h> |
398 | 398 | #include <uapi/linux/module.h> |
@@ -419,8 +419,8 @@ | ||
419 | 419 | |
420 | 420 | return 0; |
421 | 421 | } |
422 | ---- linux-3.18.18.orig/kernel/ptrace.c | |
423 | -+++ linux-3.18.18/kernel/ptrace.c | |
422 | +--- linux-3.18.19.orig/kernel/ptrace.c | |
423 | ++++ linux-3.18.19/kernel/ptrace.c | |
424 | 424 | @@ -1052,6 +1052,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l |
425 | 425 | { |
426 | 426 | struct task_struct *child; |
@@ -445,8 +445,8 @@ | ||
445 | 445 | |
446 | 446 | if (request == PTRACE_TRACEME) { |
447 | 447 | ret = ptrace_traceme(); |
448 | ---- linux-3.18.18.orig/kernel/reboot.c | |
449 | -+++ linux-3.18.18/kernel/reboot.c | |
448 | +--- linux-3.18.19.orig/kernel/reboot.c | |
449 | ++++ linux-3.18.19/kernel/reboot.c | |
450 | 450 | @@ -16,6 +16,7 @@ |
451 | 451 | #include <linux/syscalls.h> |
452 | 452 | #include <linux/syscore_ops.h> |
@@ -464,8 +464,8 @@ | ||
464 | 464 | |
465 | 465 | /* |
466 | 466 | * If pid namespaces are enabled and the current task is in a child |
467 | ---- linux-3.18.18.orig/kernel/sched/core.c | |
468 | -+++ linux-3.18.18/kernel/sched/core.c | |
467 | +--- linux-3.18.19.orig/kernel/sched/core.c | |
468 | ++++ linux-3.18.19/kernel/sched/core.c | |
469 | 469 | @@ -3188,6 +3188,8 @@ int can_nice(const struct task_struct *p |
470 | 470 | SYSCALL_DEFINE1(nice, int, increment) |
471 | 471 | { |
@@ -475,8 +475,8 @@ | ||
475 | 475 | |
476 | 476 | /* |
477 | 477 | * Setpriority might change our priority at the same moment. |
478 | ---- linux-3.18.18.orig/kernel/signal.c | |
479 | -+++ linux-3.18.18/kernel/signal.c | |
478 | +--- linux-3.18.19.orig/kernel/signal.c | |
479 | ++++ linux-3.18.19/kernel/signal.c | |
480 | 480 | @@ -2886,6 +2886,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s |
481 | 481 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
482 | 482 | { |
@@ -522,8 +522,8 @@ | ||
522 | 522 | |
523 | 523 | return do_send_specific(tgid, pid, sig, info); |
524 | 524 | } |
525 | ---- linux-3.18.18.orig/kernel/sys.c | |
526 | -+++ linux-3.18.18/kernel/sys.c | |
525 | +--- linux-3.18.19.orig/kernel/sys.c | |
526 | ++++ linux-3.18.19/kernel/sys.c | |
527 | 527 | @@ -171,6 +171,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
528 | 528 | |
529 | 529 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -553,8 +553,8 @@ | ||
553 | 553 | |
554 | 554 | down_write(&uts_sem); |
555 | 555 | errno = -EFAULT; |
556 | ---- linux-3.18.18.orig/kernel/time/ntp.c | |
557 | -+++ linux-3.18.18/kernel/time/ntp.c | |
556 | +--- linux-3.18.19.orig/kernel/time/ntp.c | |
557 | ++++ linux-3.18.19/kernel/time/ntp.c | |
558 | 558 | @@ -16,6 +16,7 @@ |
559 | 559 | #include <linux/mm.h> |
560 | 560 | #include <linux/module.h> |
@@ -588,8 +588,8 @@ | ||
588 | 588 | |
589 | 589 | /* |
590 | 590 | * Check for potential multiplication overflows that can |
591 | ---- linux-3.18.18.orig/net/ipv4/raw.c | |
592 | -+++ linux-3.18.18/net/ipv4/raw.c | |
591 | +--- linux-3.18.19.orig/net/ipv4/raw.c | |
592 | ++++ linux-3.18.19/net/ipv4/raw.c | |
593 | 593 | @@ -711,6 +711,10 @@ static int raw_recvmsg(struct kiocb *ioc |
594 | 594 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
595 | 595 | if (!skb) |
@@ -601,8 +601,8 @@ | ||
601 | 601 | |
602 | 602 | copied = skb->len; |
603 | 603 | if (len < copied) { |
604 | ---- linux-3.18.18.orig/net/ipv4/udp.c | |
605 | -+++ linux-3.18.18/net/ipv4/udp.c | |
604 | +--- linux-3.18.19.orig/net/ipv4/udp.c | |
605 | ++++ linux-3.18.19/net/ipv4/udp.c | |
606 | 606 | @@ -1262,6 +1262,10 @@ try_again: |
607 | 607 | &peeked, &off, &err); |
608 | 608 | if (!skb) |
@@ -614,8 +614,8 @@ | ||
614 | 614 | |
615 | 615 | ulen = skb->len - sizeof(struct udphdr); |
616 | 616 | copied = len; |
617 | ---- linux-3.18.18.orig/net/ipv6/raw.c | |
618 | -+++ linux-3.18.18/net/ipv6/raw.c | |
617 | +--- linux-3.18.19.orig/net/ipv6/raw.c | |
618 | ++++ linux-3.18.19/net/ipv6/raw.c | |
619 | 619 | @@ -478,6 +478,10 @@ static int rawv6_recvmsg(struct kiocb *i |
620 | 620 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
621 | 621 | if (!skb) |
@@ -627,8 +627,8 @@ | ||
627 | 627 | |
628 | 628 | copied = skb->len; |
629 | 629 | if (copied > len) { |
630 | ---- linux-3.18.18.orig/net/ipv6/udp.c | |
631 | -+++ linux-3.18.18/net/ipv6/udp.c | |
630 | +--- linux-3.18.19.orig/net/ipv6/udp.c | |
631 | ++++ linux-3.18.19/net/ipv6/udp.c | |
632 | 632 | @@ -402,6 +402,10 @@ try_again: |
633 | 633 | &peeked, &off, &err); |
634 | 634 | if (!skb) |
@@ -640,8 +640,8 @@ | ||
640 | 640 | |
641 | 641 | ulen = skb->len - sizeof(struct udphdr); |
642 | 642 | copied = len; |
643 | ---- linux-3.18.18.orig/net/socket.c | |
644 | -+++ linux-3.18.18/net/socket.c | |
643 | +--- linux-3.18.19.orig/net/socket.c | |
644 | ++++ linux-3.18.19/net/socket.c | |
645 | 645 | @@ -1637,6 +1637,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct |
646 | 646 | if (err < 0) |
647 | 647 | goto out_fd; |
@@ -653,8 +653,8 @@ | ||
653 | 653 | if (upeer_sockaddr) { |
654 | 654 | if (newsock->ops->getname(newsock, (struct sockaddr *)&address, |
655 | 655 | &len, 2) < 0) { |
656 | ---- linux-3.18.18.orig/net/unix/af_unix.c | |
657 | -+++ linux-3.18.18/net/unix/af_unix.c | |
656 | +--- linux-3.18.19.orig/net/unix/af_unix.c | |
657 | ++++ linux-3.18.19/net/unix/af_unix.c | |
658 | 658 | @@ -1817,6 +1817,10 @@ static int unix_dgram_recvmsg(struct kio |
659 | 659 | wake_up_interruptible_sync_poll(&u->peer_wait, |
660 | 660 | POLLOUT | POLLWRNORM | POLLWRBAND); |
@@ -666,8 +666,8 @@ | ||
666 | 666 | if (msg->msg_name) |
667 | 667 | unix_copy_addr(msg, skb->sk); |
668 | 668 | |
669 | ---- linux-3.18.18.orig/security/Kconfig | |
670 | -+++ linux-3.18.18/security/Kconfig | |
669 | +--- linux-3.18.19.orig/security/Kconfig | |
670 | ++++ linux-3.18.19/security/Kconfig | |
671 | 671 | @@ -167,5 +167,7 @@ config DEFAULT_SECURITY |
672 | 672 | default "yama" if DEFAULT_SECURITY_YAMA |
673 | 673 | default "" if DEFAULT_SECURITY_DAC |
@@ -676,8 +676,8 @@ | ||
676 | 676 | + |
677 | 677 | endmenu |
678 | 678 | |
679 | ---- linux-3.18.18.orig/security/Makefile | |
680 | -+++ linux-3.18.18/security/Makefile | |
679 | +--- linux-3.18.19.orig/security/Makefile | |
680 | ++++ linux-3.18.19/security/Makefile | |
681 | 681 | @@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c |
682 | 682 | # Object integrity file lists |
683 | 683 | subdir-$(CONFIG_INTEGRITY) += integrity |
@@ -685,8 +685,8 @@ | ||
685 | 685 | + |
686 | 686 | +subdir-$(CONFIG_CCSECURITY) += ccsecurity |
687 | 687 | +obj-$(CONFIG_CCSECURITY) += ccsecurity/ |
688 | ---- linux-3.18.18.orig/security/security.c | |
689 | -+++ linux-3.18.18/security/security.c | |
688 | +--- linux-3.18.19.orig/security/security.c | |
689 | ++++ linux-3.18.19/security/security.c | |
690 | 690 | @@ -203,7 +203,10 @@ int security_syslog(int type) |
691 | 691 | |
692 | 692 | int security_settime(const struct timespec *ts, const struct timezone *tz) |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 4.1. | |
1 | +This is TOMOYO Linux patch for kernel 4.1.3. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.2.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.3.tar.xz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 |
6 | 6 | fs/open.c | 2 |
@@ -29,8 +29,8 @@ | ||
29 | 29 | security/security.c | 110 ++++++++++++++++++++++++++++++++++++++++------ |
30 | 30 | 25 files changed, 248 insertions(+), 37 deletions(-) |
31 | 31 | |
32 | ---- linux-4.1.2.orig/fs/exec.c | |
33 | -+++ linux-4.1.2/fs/exec.c | |
32 | +--- linux-4.1.3.orig/fs/exec.c | |
33 | ++++ linux-4.1.3/fs/exec.c | |
34 | 34 | @@ -1461,7 +1461,7 @@ static int exec_binprm(struct linux_binp |
35 | 35 | old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent)); |
36 | 36 | rcu_read_unlock(); |
@@ -40,8 +40,8 @@ | ||
40 | 40 | if (ret >= 0) { |
41 | 41 | audit_bprm(bprm); |
42 | 42 | trace_sched_process_exec(current, old_pid, bprm); |
43 | ---- linux-4.1.2.orig/fs/open.c | |
44 | -+++ linux-4.1.2/fs/open.c | |
43 | +--- linux-4.1.3.orig/fs/open.c | |
44 | ++++ linux-4.1.3/fs/open.c | |
45 | 45 | @@ -1106,6 +1106,8 @@ EXPORT_SYMBOL(sys_close); |
46 | 46 | */ |
47 | 47 | SYSCALL_DEFINE0(vhangup) |
@@ -51,8 +51,8 @@ | ||
51 | 51 | if (capable(CAP_SYS_TTY_CONFIG)) { |
52 | 52 | tty_vhangup_self(); |
53 | 53 | return 0; |
54 | ---- linux-4.1.2.orig/fs/proc/version.c | |
55 | -+++ linux-4.1.2/fs/proc/version.c | |
54 | +--- linux-4.1.3.orig/fs/proc/version.c | |
55 | ++++ linux-4.1.3/fs/proc/version.c | |
56 | 56 | @@ -32,3 +32,10 @@ static int __init proc_version_init(void |
57 | 57 | return 0; |
58 | 58 | } |
@@ -60,12 +60,12 @@ | ||
60 | 60 | + |
61 | 61 | +static int __init ccs_show_version(void) |
62 | 62 | +{ |
63 | -+ printk(KERN_INFO "Hook version: 4.1.2 2015/07/11\n"); | |
63 | ++ printk(KERN_INFO "Hook version: 4.1.3 2015/07/28\n"); | |
64 | 64 | + return 0; |
65 | 65 | +} |
66 | 66 | +fs_initcall(ccs_show_version); |
67 | ---- linux-4.1.2.orig/include/linux/init_task.h | |
68 | -+++ linux-4.1.2/include/linux/init_task.h | |
67 | +--- linux-4.1.3.orig/include/linux/init_task.h | |
68 | ++++ linux-4.1.3/include/linux/init_task.h | |
69 | 69 | @@ -182,6 +182,14 @@ extern struct task_group root_task_group |
70 | 70 | # define INIT_KASAN(tsk) |
71 | 71 | #endif |
@@ -89,8 +89,8 @@ | ||
89 | 89 | } |
90 | 90 | |
91 | 91 | |
92 | ---- linux-4.1.2.orig/include/linux/sched.h | |
93 | -+++ linux-4.1.2/include/linux/sched.h | |
92 | +--- linux-4.1.3.orig/include/linux/sched.h | |
93 | ++++ linux-4.1.3/include/linux/sched.h | |
94 | 94 | @@ -6,6 +6,8 @@ |
95 | 95 | #include <linux/sched/prio.h> |
96 | 96 |
@@ -111,8 +111,8 @@ | ||
111 | 111 | }; |
112 | 112 | |
113 | 113 | /* Future-safe accessor for struct task_struct's cpus_allowed. */ |
114 | ---- linux-4.1.2.orig/include/linux/security.h | |
115 | -+++ linux-4.1.2/include/linux/security.h | |
114 | +--- linux-4.1.3.orig/include/linux/security.h | |
115 | ++++ linux-4.1.3/include/linux/security.h | |
116 | 116 | @@ -53,6 +53,7 @@ struct msg_queue; |
117 | 117 | struct xattr; |
118 | 118 | struct xfrm_sec_ctx; |
@@ -319,8 +319,8 @@ | ||
319 | 319 | } |
320 | 320 | #endif /* CONFIG_SECURITY_PATH */ |
321 | 321 | |
322 | ---- linux-4.1.2.orig/include/net/ip.h | |
323 | -+++ linux-4.1.2/include/net/ip.h | |
322 | +--- linux-4.1.3.orig/include/net/ip.h | |
323 | ++++ linux-4.1.3/include/net/ip.h | |
324 | 324 | @@ -216,6 +216,8 @@ void inet_get_local_port_range(struct ne |
325 | 325 | #ifdef CONFIG_SYSCTL |
326 | 326 | static inline int inet_is_local_reserved_port(struct net *net, int port) |
@@ -339,8 +339,8 @@ | ||
339 | 339 | return 0; |
340 | 340 | } |
341 | 341 | #endif |
342 | ---- linux-4.1.2.orig/kernel/fork.c | |
343 | -+++ linux-4.1.2/kernel/fork.c | |
342 | +--- linux-4.1.3.orig/kernel/fork.c | |
343 | ++++ linux-4.1.3/kernel/fork.c | |
344 | 344 | @@ -257,6 +257,7 @@ void __put_task_struct(struct task_struc |
345 | 345 | delayacct_tsk_free(tsk); |
346 | 346 | put_signal_struct(tsk->signal); |
@@ -367,8 +367,8 @@ | ||
367 | 367 | bad_fork_cleanup_perf: |
368 | 368 | perf_event_free_task(p); |
369 | 369 | bad_fork_cleanup_policy: |
370 | ---- linux-4.1.2.orig/kernel/kexec.c | |
371 | -+++ linux-4.1.2/kernel/kexec.c | |
370 | +--- linux-4.1.3.orig/kernel/kexec.c | |
371 | ++++ linux-4.1.3/kernel/kexec.c | |
372 | 372 | @@ -41,6 +41,7 @@ |
373 | 373 | #include <asm/uaccess.h> |
374 | 374 | #include <asm/io.h> |
@@ -386,8 +386,8 @@ | ||
386 | 386 | |
387 | 387 | /* |
388 | 388 | * Verify we have a legal set of flags |
389 | ---- linux-4.1.2.orig/kernel/module.c | |
390 | -+++ linux-4.1.2/kernel/module.c | |
389 | +--- linux-4.1.3.orig/kernel/module.c | |
390 | ++++ linux-4.1.3/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.1.2.orig/kernel/ptrace.c | |
418 | -+++ linux-4.1.2/kernel/ptrace.c | |
417 | +--- linux-4.1.3.orig/kernel/ptrace.c | |
418 | ++++ linux-4.1.3/kernel/ptrace.c | |
419 | 419 | @@ -1034,6 +1034,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.1.2.orig/kernel/reboot.c | |
444 | -+++ linux-4.1.2/kernel/reboot.c | |
443 | +--- linux-4.1.3.orig/kernel/reboot.c | |
444 | ++++ linux-4.1.3/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.1.2.orig/kernel/sched/core.c | |
463 | -+++ linux-4.1.2/kernel/sched/core.c | |
462 | +--- linux-4.1.3.orig/kernel/sched/core.c | |
463 | ++++ linux-4.1.3/kernel/sched/core.c | |
464 | 464 | @@ -3145,6 +3145,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.1.2.orig/kernel/signal.c | |
474 | -+++ linux-4.1.2/kernel/signal.c | |
473 | +--- linux-4.1.3.orig/kernel/signal.c | |
474 | ++++ linux-4.1.3/kernel/signal.c | |
475 | 475 | @@ -2898,6 +2898,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.1.2.orig/kernel/sys.c | |
521 | -+++ linux-4.1.2/kernel/sys.c | |
520 | +--- linux-4.1.3.orig/kernel/sys.c | |
521 | ++++ linux-4.1.3/kernel/sys.c | |
522 | 522 | @@ -183,6 +183,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 | down_write(&uts_sem); |
550 | 550 | errno = -EFAULT; |
551 | ---- linux-4.1.2.orig/kernel/time/ntp.c | |
552 | -+++ linux-4.1.2/kernel/time/ntp.c | |
551 | +--- linux-4.1.3.orig/kernel/time/ntp.c | |
552 | ++++ linux-4.1.3/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 | /* |
585 | 585 | * Check for potential multiplication overflows that can |
586 | ---- linux-4.1.2.orig/net/ipv4/raw.c | |
587 | -+++ linux-4.1.2/net/ipv4/raw.c | |
586 | +--- linux-4.1.3.orig/net/ipv4/raw.c | |
587 | ++++ linux-4.1.3/net/ipv4/raw.c | |
588 | 588 | @@ -727,6 +727,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.1.2.orig/net/ipv4/udp.c | |
600 | -+++ linux-4.1.2/net/ipv4/udp.c | |
599 | +--- linux-4.1.3.orig/net/ipv4/udp.c | |
600 | ++++ linux-4.1.3/net/ipv4/udp.c | |
601 | 601 | @@ -1272,6 +1272,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.1.2.orig/net/ipv6/raw.c | |
613 | -+++ linux-4.1.2/net/ipv6/raw.c | |
612 | +--- linux-4.1.3.orig/net/ipv6/raw.c | |
613 | ++++ linux-4.1.3/net/ipv6/raw.c | |
614 | 614 | @@ -477,6 +477,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.1.2.orig/net/ipv6/udp.c | |
626 | -+++ linux-4.1.2/net/ipv6/udp.c | |
625 | +--- linux-4.1.3.orig/net/ipv6/udp.c | |
626 | ++++ linux-4.1.3/net/ipv6/udp.c | |
627 | 627 | @@ -413,6 +413,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.1.2.orig/net/socket.c | |
639 | -+++ linux-4.1.2/net/socket.c | |
638 | +--- linux-4.1.3.orig/net/socket.c | |
639 | ++++ linux-4.1.3/net/socket.c | |
640 | 640 | @@ -1485,6 +1485,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.1.2.orig/net/unix/af_unix.c | |
652 | -+++ linux-4.1.2/net/unix/af_unix.c | |
651 | +--- linux-4.1.3.orig/net/unix/af_unix.c | |
652 | ++++ linux-4.1.3/net/unix/af_unix.c | |
653 | 653 | @@ -1800,6 +1800,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.1.2.orig/security/Kconfig | |
665 | -+++ linux-4.1.2/security/Kconfig | |
664 | +--- linux-4.1.3.orig/security/Kconfig | |
665 | ++++ linux-4.1.3/security/Kconfig | |
666 | 666 | @@ -168,5 +168,7 @@ config DEFAULT_SECURITY |
667 | 667 | default "yama" if DEFAULT_SECURITY_YAMA |
668 | 668 | default "" if DEFAULT_SECURITY_DAC |
@@ -671,8 +671,8 @@ | ||
671 | 671 | + |
672 | 672 | endmenu |
673 | 673 | |
674 | ---- linux-4.1.2.orig/security/Makefile | |
675 | -+++ linux-4.1.2/security/Makefile | |
674 | +--- linux-4.1.3.orig/security/Makefile | |
675 | ++++ linux-4.1.3/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 |
@@ -680,8 +680,8 @@ | ||
680 | 680 | + |
681 | 681 | +subdir-$(CONFIG_CCSECURITY) += ccsecurity |
682 | 682 | +obj-$(CONFIG_CCSECURITY) += ccsecurity/ |
683 | ---- linux-4.1.2.orig/security/security.c | |
684 | -+++ linux-4.1.2/security/security.c | |
683 | +--- linux-4.1.3.orig/security/security.c | |
684 | ++++ linux-4.1.3/security/security.c | |
685 | 685 | @@ -226,7 +226,10 @@ int security_syslog(int type) |
686 | 686 | |
687 | 687 | int security_settime(const struct timespec *ts, const struct timezone *tz) |
@@ -1,6 +1,6 @@ | ||
1 | 1 | This is TOMOYO Linux patch for CentOS 6. |
2 | 2 | |
3 | -Source code for this patch is http://vault.centos.org/6.6/updates/Source/SPackages/kernel-2.6.32-504.30.3.el6.src.rpm | |
3 | +Source code for this patch is http://vault.centos.org/6.7/updates/Source/SPackages/kernel-2.6.32-573.1.1.el6.src.rpm | |
4 | 4 | --- |
5 | 5 | fs/compat.c | 2 +- |
6 | 6 | fs/compat_ioctl.c | 3 +++ |
@@ -37,8 +37,8 @@ | ||
37 | 37 | security/Makefile | 3 +++ |
38 | 38 | 33 files changed, 201 insertions(+), 2 deletions(-) |
39 | 39 | |
40 | ---- linux-2.6.32-504.30.3.el6.orig/fs/compat.c | |
41 | -+++ linux-2.6.32-504.30.3.el6/fs/compat.c | |
40 | +--- linux-2.6.32-573.1.1.el6.orig/fs/compat.c | |
41 | ++++ linux-2.6.32-573.1.1.el6/fs/compat.c | |
42 | 42 | @@ -1523,7 +1523,7 @@ int compat_do_execve(const char * filena |
43 | 43 | if (retval < 0) |
44 | 44 | goto out; |
@@ -48,8 +48,8 @@ | ||
48 | 48 | if (retval < 0) |
49 | 49 | goto out; |
50 | 50 | |
51 | ---- linux-2.6.32-504.30.3.el6.orig/fs/compat_ioctl.c | |
52 | -+++ linux-2.6.32-504.30.3.el6/fs/compat_ioctl.c | |
51 | +--- linux-2.6.32-573.1.1.el6.orig/fs/compat_ioctl.c | |
52 | ++++ linux-2.6.32-573.1.1.el6/fs/compat_ioctl.c | |
53 | 53 | @@ -114,6 +114,7 @@ |
54 | 54 | #ifdef CONFIG_SPARC |
55 | 55 | #include <asm/fbio.h> |
@@ -67,9 +67,9 @@ | ||
67 | 67 | if (error) |
68 | 68 | goto out_fput; |
69 | 69 | |
70 | ---- linux-2.6.32-504.30.3.el6.orig/fs/exec.c | |
71 | -+++ linux-2.6.32-504.30.3.el6/fs/exec.c | |
72 | -@@ -1472,7 +1472,7 @@ int do_execve(const char * filename, | |
70 | +--- linux-2.6.32-573.1.1.el6.orig/fs/exec.c | |
71 | ++++ linux-2.6.32-573.1.1.el6/fs/exec.c | |
72 | +@@ -1489,7 +1489,7 @@ int do_execve(const char * filename, | |
73 | 73 | goto out; |
74 | 74 | |
75 | 75 | current->flags &= ~PF_KTHREAD; |
@@ -78,8 +78,8 @@ | ||
78 | 78 | if (retval < 0) |
79 | 79 | goto out; |
80 | 80 | |
81 | ---- linux-2.6.32-504.30.3.el6.orig/fs/fcntl.c | |
82 | -+++ linux-2.6.32-504.30.3.el6/fs/fcntl.c | |
81 | +--- linux-2.6.32-573.1.1.el6.orig/fs/fcntl.c | |
82 | ++++ linux-2.6.32-573.1.1.el6/fs/fcntl.c | |
83 | 83 | @@ -428,6 +428,8 @@ SYSCALL_DEFINE3(fcntl, unsigned int, fd, |
84 | 84 | goto out; |
85 | 85 |
@@ -98,8 +98,8 @@ | ||
98 | 98 | if (err) { |
99 | 99 | fput(filp); |
100 | 100 | return err; |
101 | ---- linux-2.6.32-504.30.3.el6.orig/fs/ioctl.c | |
102 | -+++ linux-2.6.32-504.30.3.el6/fs/ioctl.c | |
101 | +--- linux-2.6.32-573.1.1.el6.orig/fs/ioctl.c | |
102 | ++++ linux-2.6.32-573.1.1.el6/fs/ioctl.c | |
103 | 103 | @@ -639,6 +639,8 @@ SYSCALL_DEFINE3(ioctl, unsigned int, fd, |
104 | 104 | goto out; |
105 | 105 |
@@ -109,8 +109,8 @@ | ||
109 | 109 | if (error) |
110 | 110 | goto out_fput; |
111 | 111 | |
112 | ---- linux-2.6.32-504.30.3.el6.orig/fs/namei.c | |
113 | -+++ linux-2.6.32-504.30.3.el6/fs/namei.c | |
112 | +--- linux-2.6.32-573.1.1.el6.orig/fs/namei.c | |
113 | ++++ linux-2.6.32-573.1.1.el6/fs/namei.c | |
114 | 114 | @@ -2040,6 +2040,11 @@ int may_open(struct path *path, int acc_ |
115 | 115 | if (flag & O_NOATIME && !is_owner_or_cap(inode)) |
116 | 116 | return -EPERM; |
@@ -198,8 +198,8 @@ | ||
198 | 198 | if (error) |
199 | 199 | goto exit5; |
200 | 200 | error = vfs_rename(old_dir->d_inode, old_dentry, |
201 | ---- linux-2.6.32-504.30.3.el6.orig/fs/namespace.c | |
202 | -+++ linux-2.6.32-504.30.3.el6/fs/namespace.c | |
201 | +--- linux-2.6.32-573.1.1.el6.orig/fs/namespace.c | |
202 | ++++ linux-2.6.32-573.1.1.el6/fs/namespace.c | |
203 | 203 | @@ -1097,6 +1097,8 @@ static int do_umount(struct vfsmount *mn |
204 | 204 | LIST_HEAD(umount_list); |
205 | 205 |
@@ -209,7 +209,7 @@ | ||
209 | 209 | if (retval) |
210 | 210 | return retval; |
211 | 211 | |
212 | -@@ -2084,6 +2086,7 @@ int copy_mount_string(const void __user | |
212 | +@@ -2085,6 +2087,7 @@ int copy_mount_string(const void __user | |
213 | 213 | long do_mount(char *dev_name, const char *dir_name, char *type_page, |
214 | 214 | unsigned long flags, void *data_page) |
215 | 215 | { |
@@ -217,7 +217,7 @@ | ||
217 | 217 | struct path path; |
218 | 218 | int retval = 0; |
219 | 219 | int mnt_flags = 0; |
220 | -@@ -2131,6 +2134,9 @@ long do_mount(char *dev_name, const char | |
220 | +@@ -2132,6 +2135,9 @@ long do_mount(char *dev_name, const char | |
221 | 221 | |
222 | 222 | retval = security_sb_mount(dev_name, &path, |
223 | 223 | type_page, flags, data_page); |
@@ -227,7 +227,7 @@ | ||
227 | 227 | if (retval) |
228 | 228 | goto dput_out; |
229 | 229 | |
230 | -@@ -2371,6 +2377,8 @@ SYSCALL_DEFINE2(pivot_root, const char _ | |
230 | +@@ -2372,6 +2378,8 @@ SYSCALL_DEFINE2(pivot_root, const char _ | |
231 | 231 | goto out1; |
232 | 232 | |
233 | 233 | error = security_sb_pivotroot(&old, &new); |
@@ -236,8 +236,8 @@ | ||
236 | 236 | if (error) { |
237 | 237 | path_put(&old); |
238 | 238 | goto out1; |
239 | ---- linux-2.6.32-504.30.3.el6.orig/fs/open.c | |
240 | -+++ linux-2.6.32-504.30.3.el6/fs/open.c | |
239 | +--- linux-2.6.32-573.1.1.el6.orig/fs/open.c | |
240 | ++++ linux-2.6.32-573.1.1.el6/fs/open.c | |
241 | 241 | @@ -102,6 +102,8 @@ long vfs_truncate(struct path *path, lof |
242 | 242 | error = locks_verify_truncate(inode, NULL, length); |
243 | 243 | if (!error) |
@@ -319,7 +319,7 @@ | ||
319 | 319 | error = chown_common(dentry, user, group); |
320 | 320 | mnt_drop_write(file->f_path.mnt); |
321 | 321 | out_fput: |
322 | -@@ -1024,6 +1042,8 @@ EXPORT_SYMBOL(sys_close); | |
322 | +@@ -1028,6 +1046,8 @@ EXPORT_SYMBOL(sys_close); | |
323 | 323 | */ |
324 | 324 | SYSCALL_DEFINE0(vhangup) |
325 | 325 | { |
@@ -328,8 +328,8 @@ | ||
328 | 328 | if (capable(CAP_SYS_TTY_CONFIG)) { |
329 | 329 | tty_vhangup_self(); |
330 | 330 | return 0; |
331 | ---- linux-2.6.32-504.30.3.el6.orig/fs/proc/version.c | |
332 | -+++ linux-2.6.32-504.30.3.el6/fs/proc/version.c | |
331 | +--- linux-2.6.32-573.1.1.el6.orig/fs/proc/version.c | |
332 | ++++ linux-2.6.32-573.1.1.el6/fs/proc/version.c | |
333 | 333 | @@ -32,3 +32,10 @@ static int __init proc_version_init(void |
334 | 334 | return 0; |
335 | 335 | } |
@@ -337,12 +337,12 @@ | ||
337 | 337 | + |
338 | 338 | +static int __init ccs_show_version(void) |
339 | 339 | +{ |
340 | -+ printk(KERN_INFO "Hook version: 2.6.32-504.30.3.el6 2015/07/16\n"); | |
340 | ++ printk(KERN_INFO "Hook version: 2.6.32-573.1.1.el6 2015/07/28\n"); | |
341 | 341 | + return 0; |
342 | 342 | +} |
343 | 343 | +module_init(ccs_show_version); |
344 | ---- linux-2.6.32-504.30.3.el6.orig/fs/stat.c | |
345 | -+++ linux-2.6.32-504.30.3.el6/fs/stat.c | |
344 | +--- linux-2.6.32-573.1.1.el6.orig/fs/stat.c | |
345 | ++++ linux-2.6.32-573.1.1.el6/fs/stat.c | |
346 | 346 | @@ -43,6 +43,8 @@ int vfs_getattr(struct vfsmount *mnt, st |
347 | 347 | int retval; |
348 | 348 |
@@ -352,8 +352,8 @@ | ||
352 | 352 | if (retval) |
353 | 353 | return retval; |
354 | 354 | |
355 | ---- linux-2.6.32-504.30.3.el6.orig/include/linux/init_task.h | |
356 | -+++ linux-2.6.32-504.30.3.el6/include/linux/init_task.h | |
355 | +--- linux-2.6.32-573.1.1.el6.orig/include/linux/init_task.h | |
356 | ++++ linux-2.6.32-573.1.1.el6/include/linux/init_task.h | |
357 | 357 | @@ -123,6 +123,14 @@ extern struct cred init_cred; |
358 | 358 | # define INIT_PERF_EVENTS(tsk) |
359 | 359 | #endif |
@@ -377,8 +377,8 @@ | ||
377 | 377 | } |
378 | 378 | |
379 | 379 | |
380 | ---- linux-2.6.32-504.30.3.el6.orig/include/linux/sched.h | |
381 | -+++ linux-2.6.32-504.30.3.el6/include/linux/sched.h | |
380 | +--- linux-2.6.32-573.1.1.el6.orig/include/linux/sched.h | |
381 | ++++ linux-2.6.32-573.1.1.el6/include/linux/sched.h | |
382 | 382 | @@ -43,6 +43,8 @@ |
383 | 383 | |
384 | 384 | #ifdef __KERNEL__ |
@@ -388,7 +388,7 @@ | ||
388 | 388 | struct sched_param { |
389 | 389 | int sched_priority; |
390 | 390 | }; |
391 | -@@ -1699,6 +1701,10 @@ struct task_struct { | |
391 | +@@ -1708,6 +1710,10 @@ struct task_struct { | |
392 | 392 | } memcg_oom; |
393 | 393 | #endif |
394 | 394 | #endif /* __GENKYSMS__ */ |
@@ -399,8 +399,8 @@ | ||
399 | 399 | }; |
400 | 400 | |
401 | 401 | /* Future-safe accessor for struct task_struct's cpus_allowed. */ |
402 | ---- linux-2.6.32-504.30.3.el6.orig/include/linux/security.h | |
403 | -+++ linux-2.6.32-504.30.3.el6/include/linux/security.h | |
402 | +--- linux-2.6.32-573.1.1.el6.orig/include/linux/security.h | |
403 | ++++ linux-2.6.32-573.1.1.el6/include/linux/security.h | |
404 | 404 | @@ -35,6 +35,7 @@ |
405 | 405 | #include <linux/xfrm.h> |
406 | 406 | #include <linux/gfp.h> |
@@ -409,8 +409,8 @@ | ||
409 | 409 | |
410 | 410 | /* Maximum number of letters for an LSM name string */ |
411 | 411 | #define SECURITY_NAME_MAX 10 |
412 | ---- linux-2.6.32-504.30.3.el6.orig/include/net/ip.h | |
413 | -+++ linux-2.6.32-504.30.3.el6/include/net/ip.h | |
412 | +--- linux-2.6.32-573.1.1.el6.orig/include/net/ip.h | |
413 | ++++ linux-2.6.32-573.1.1.el6/include/net/ip.h | |
414 | 414 | @@ -33,6 +33,7 @@ |
415 | 415 | #endif |
416 | 416 | #include <net/snmp.h> |
@@ -419,7 +419,7 @@ | ||
419 | 419 | |
420 | 420 | struct sock; |
421 | 421 | |
422 | -@@ -230,6 +231,8 @@ extern void inet_get_local_port_range(in | |
422 | +@@ -223,6 +224,8 @@ extern void inet_get_local_port_range(in | |
423 | 423 | extern unsigned long *sysctl_local_reserved_ports; |
424 | 424 | static inline int inet_is_reserved_local_port(int port) |
425 | 425 | { |
@@ -428,8 +428,8 @@ | ||
428 | 428 | return test_bit(port, sysctl_local_reserved_ports); |
429 | 429 | } |
430 | 430 | |
431 | ---- linux-2.6.32-504.30.3.el6.orig/kernel/compat.c | |
432 | -+++ linux-2.6.32-504.30.3.el6/kernel/compat.c | |
431 | +--- linux-2.6.32-573.1.1.el6.orig/kernel/compat.c | |
432 | ++++ linux-2.6.32-573.1.1.el6/kernel/compat.c | |
433 | 433 | @@ -1005,6 +1005,8 @@ asmlinkage long compat_sys_stime(compat_ |
434 | 434 | err = security_settime(&tv, NULL); |
435 | 435 | if (err) |
@@ -439,8 +439,8 @@ | ||
439 | 439 | |
440 | 440 | do_settimeofday(&tv); |
441 | 441 | return 0; |
442 | ---- linux-2.6.32-504.30.3.el6.orig/kernel/fork.c | |
443 | -+++ linux-2.6.32-504.30.3.el6/kernel/fork.c | |
442 | +--- linux-2.6.32-573.1.1.el6.orig/kernel/fork.c | |
443 | ++++ linux-2.6.32-573.1.1.el6/kernel/fork.c | |
444 | 444 | @@ -176,6 +176,7 @@ void __put_task_struct(struct task_struc |
445 | 445 | exit_creds(tsk); |
446 | 446 | delayacct_tsk_free(tsk); |
@@ -449,7 +449,7 @@ | ||
449 | 449 | if (!profile_handoff_task(tsk)) |
450 | 450 | free_task(tsk); |
451 | 451 | } |
452 | -@@ -1210,6 +1211,9 @@ static struct task_struct *copy_process( | |
452 | +@@ -1238,6 +1239,9 @@ static struct task_struct *copy_process( | |
453 | 453 | |
454 | 454 | if ((retval = audit_alloc(p))) |
455 | 455 | goto bad_fork_cleanup_policy; |
@@ -459,7 +459,7 @@ | ||
459 | 459 | /* copy all the process information */ |
460 | 460 | if ((retval = copy_semundo(clone_flags, p))) |
461 | 461 | goto bad_fork_cleanup_audit; |
462 | -@@ -1395,6 +1399,7 @@ bad_fork_cleanup_semundo: | |
462 | +@@ -1423,6 +1427,7 @@ bad_fork_cleanup_semundo: | |
463 | 463 | exit_sem(p); |
464 | 464 | bad_fork_cleanup_audit: |
465 | 465 | audit_free(p); |
@@ -467,9 +467,9 @@ | ||
467 | 467 | bad_fork_cleanup_policy: |
468 | 468 | perf_event_free_task(p); |
469 | 469 | #ifdef CONFIG_NUMA |
470 | ---- linux-2.6.32-504.30.3.el6.orig/kernel/kexec.c | |
471 | -+++ linux-2.6.32-504.30.3.el6/kernel/kexec.c | |
472 | -@@ -40,6 +40,7 @@ | |
470 | +--- linux-2.6.32-573.1.1.el6.orig/kernel/kexec.c | |
471 | ++++ linux-2.6.32-573.1.1.el6/kernel/kexec.c | |
472 | +@@ -41,6 +41,7 @@ | |
473 | 473 | #include <asm/system.h> |
474 | 474 | #include <asm/sections.h> |
475 | 475 | #include <asm/setup.h> |
@@ -477,7 +477,7 @@ | ||
477 | 477 | |
478 | 478 | /* Per cpu memory for storing cpu states in case of system crash. */ |
479 | 479 | note_buf_t __percpu *crash_notes; |
480 | -@@ -947,6 +948,8 @@ SYSCALL_DEFINE4(kexec_load, unsigned lon | |
480 | +@@ -948,6 +949,8 @@ SYSCALL_DEFINE4(kexec_load, unsigned lon | |
481 | 481 | /* We only trust the superuser with rebooting the system. */ |
482 | 482 | if (!capable(CAP_SYS_BOOT)) |
483 | 483 | return -EPERM; |
@@ -486,8 +486,8 @@ | ||
486 | 486 | |
487 | 487 | if (kexec_load_disabled) |
488 | 488 | return -EPERM; |
489 | ---- linux-2.6.32-504.30.3.el6.orig/kernel/module.c | |
490 | -+++ linux-2.6.32-504.30.3.el6/kernel/module.c | |
489 | +--- linux-2.6.32-573.1.1.el6.orig/kernel/module.c | |
490 | ++++ linux-2.6.32-573.1.1.el6/kernel/module.c | |
491 | 491 | @@ -56,6 +56,7 @@ |
492 | 492 | #include <linux/percpu.h> |
493 | 493 | #include <linux/kmemleak.h> |
@@ -505,7 +505,7 @@ | ||
505 | 505 | |
506 | 506 | if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0) |
507 | 507 | return -EFAULT; |
508 | -@@ -2599,6 +2602,8 @@ SYSCALL_DEFINE3(init_module, void __user | |
508 | +@@ -2604,6 +2607,8 @@ SYSCALL_DEFINE3(init_module, void __user | |
509 | 509 | /* Must have permission */ |
510 | 510 | if (!capable(CAP_SYS_MODULE) || modules_disabled) |
511 | 511 | return -EPERM; |
@@ -514,8 +514,8 @@ | ||
514 | 514 | |
515 | 515 | /* Only one module load at a time, please */ |
516 | 516 | if (mutex_lock_interruptible(&module_mutex) != 0) |
517 | ---- linux-2.6.32-504.30.3.el6.orig/kernel/ptrace.c | |
518 | -+++ linux-2.6.32-504.30.3.el6/kernel/ptrace.c | |
517 | +--- linux-2.6.32-573.1.1.el6.orig/kernel/ptrace.c | |
518 | ++++ linux-2.6.32-573.1.1.el6/kernel/ptrace.c | |
519 | 519 | @@ -195,6 +195,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l |
520 | 520 | { |
521 | 521 | struct task_struct *child; |
@@ -540,9 +540,9 @@ | ||
540 | 540 | |
541 | 541 | if (request == PTRACE_TRACEME) { |
542 | 542 | ret = ptrace_traceme(); |
543 | ---- linux-2.6.32-504.30.3.el6.orig/kernel/sched.c | |
544 | -+++ linux-2.6.32-504.30.3.el6/kernel/sched.c | |
545 | -@@ -6826,6 +6826,8 @@ int can_nice(const struct task_struct *p | |
543 | +--- linux-2.6.32-573.1.1.el6.orig/kernel/sched.c | |
544 | ++++ linux-2.6.32-573.1.1.el6/kernel/sched.c | |
545 | +@@ -6838,6 +6838,8 @@ int can_nice(const struct task_struct *p | |
546 | 546 | SYSCALL_DEFINE1(nice, int, increment) |
547 | 547 | { |
548 | 548 | long nice, retval; |
@@ -551,8 +551,8 @@ | ||
551 | 551 | |
552 | 552 | /* |
553 | 553 | * Setpriority might change our priority at the same moment. |
554 | ---- linux-2.6.32-504.30.3.el6.orig/kernel/signal.c | |
555 | -+++ linux-2.6.32-504.30.3.el6/kernel/signal.c | |
554 | +--- linux-2.6.32-573.1.1.el6.orig/kernel/signal.c | |
555 | ++++ linux-2.6.32-573.1.1.el6/kernel/signal.c | |
556 | 556 | @@ -2312,6 +2312,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s |
557 | 557 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
558 | 558 | { |
@@ -571,7 +571,7 @@ | ||
571 | 571 | |
572 | 572 | return do_tkill(tgid, pid, sig); |
573 | 573 | } |
574 | -@@ -2392,6 +2396,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int, | |
574 | +@@ -2392,6 +2396,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int, | |
575 | 575 | /* This is only valid for single tasks */ |
576 | 576 | if (pid <= 0) |
577 | 577 | return -EINVAL; |
@@ -580,7 +580,7 @@ | ||
580 | 580 | |
581 | 581 | return do_tkill(0, pid, sig); |
582 | 582 | } |
583 | -@@ -2413,6 +2419,8 @@ SYSCALL_DEFINE3(rt_sigqueueinfo, pid_t, | |
583 | +@@ -2413,6 +2419,8 @@ SYSCALL_DEFINE3(rt_sigqueueinfo, pid_t, | |
584 | 584 | return -EPERM; |
585 | 585 | } |
586 | 586 | info.si_signo = sig; |
@@ -598,8 +598,8 @@ | ||
598 | 598 | |
599 | 599 | return do_send_specific(tgid, pid, sig, info); |
600 | 600 | } |
601 | ---- linux-2.6.32-504.30.3.el6.orig/kernel/sys.c | |
602 | -+++ linux-2.6.32-504.30.3.el6/kernel/sys.c | |
601 | +--- linux-2.6.32-573.1.1.el6.orig/kernel/sys.c | |
602 | ++++ linux-2.6.32-573.1.1.el6/kernel/sys.c | |
603 | 603 | @@ -157,6 +157,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
604 | 604 | |
605 | 605 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -638,9 +638,9 @@ | ||
638 | 638 | |
639 | 639 | down_write(&uts_sem); |
640 | 640 | errno = -EFAULT; |
641 | ---- linux-2.6.32-504.30.3.el6.orig/kernel/sysctl.c | |
642 | -+++ linux-2.6.32-504.30.3.el6/kernel/sysctl.c | |
643 | -@@ -2073,6 +2073,9 @@ int do_sysctl(int __user *name, int nlen | |
641 | +--- linux-2.6.32-573.1.1.el6.orig/kernel/sysctl.c | |
642 | ++++ linux-2.6.32-573.1.1.el6/kernel/sysctl.c | |
643 | +@@ -2110,6 +2110,9 @@ int do_sysctl(int __user *name, int nlen | |
644 | 644 | |
645 | 645 | for (head = sysctl_head_next(NULL); head; |
646 | 646 | head = sysctl_head_next(head)) { |
@@ -650,9 +650,9 @@ | ||
650 | 650 | error = parse_table(name, nlen, oldval, oldlenp, |
651 | 651 | newval, newlen, |
652 | 652 | head->root, head->ctl_table); |
653 | ---- linux-2.6.32-504.30.3.el6.orig/kernel/time.c | |
654 | -+++ linux-2.6.32-504.30.3.el6/kernel/time.c | |
655 | -@@ -92,6 +92,8 @@ SYSCALL_DEFINE1(stime, time_t __user *, | |
653 | +--- linux-2.6.32-573.1.1.el6.orig/kernel/time.c | |
654 | ++++ linux-2.6.32-573.1.1.el6/kernel/time.c | |
655 | +@@ -92,6 +92,8 @@ SYSCALL_DEFINE1(stime, time_t __user *, | |
656 | 656 | err = security_settime(&tv, NULL); |
657 | 657 | if (err) |
658 | 658 | return err; |
@@ -670,8 +670,8 @@ | ||
670 | 670 | |
671 | 671 | if (tz) { |
672 | 672 | /* SMP safe, global irq locking makes it work. */ |
673 | ---- linux-2.6.32-504.30.3.el6.orig/kernel/time/ntp.c | |
674 | -+++ linux-2.6.32-504.30.3.el6/kernel/time/ntp.c | |
673 | +--- linux-2.6.32-573.1.1.el6.orig/kernel/time/ntp.c | |
674 | ++++ linux-2.6.32-573.1.1.el6/kernel/time/ntp.c | |
675 | 675 | @@ -14,6 +14,7 @@ |
676 | 676 | #include <linux/timex.h> |
677 | 677 | #include <linux/time.h> |
@@ -696,8 +696,8 @@ | ||
696 | 696 | |
697 | 697 | /* |
698 | 698 | * if the quartz is off by more than 10% then |
699 | ---- linux-2.6.32-504.30.3.el6.orig/net/ipv4/raw.c | |
700 | -+++ linux-2.6.32-504.30.3.el6/net/ipv4/raw.c | |
699 | +--- linux-2.6.32-573.1.1.el6.orig/net/ipv4/raw.c | |
700 | ++++ linux-2.6.32-573.1.1.el6/net/ipv4/raw.c | |
701 | 701 | @@ -77,6 +77,7 @@ |
702 | 702 | #include <linux/seq_file.h> |
703 | 703 | #include <linux/netfilter.h> |
@@ -717,8 +717,8 @@ | ||
717 | 717 | |
718 | 718 | copied = skb->len; |
719 | 719 | if (len < copied) { |
720 | ---- linux-2.6.32-504.30.3.el6.orig/net/ipv4/udp.c | |
721 | -+++ linux-2.6.32-504.30.3.el6/net/ipv4/udp.c | |
720 | +--- linux-2.6.32-573.1.1.el6.orig/net/ipv4/udp.c | |
721 | ++++ linux-2.6.32-573.1.1.el6/net/ipv4/udp.c | |
722 | 722 | @@ -108,6 +108,7 @@ |
723 | 723 | #include <trace/events/udp.h> |
724 | 724 | #include <net/busy_poll.h> |
@@ -738,8 +738,8 @@ | ||
738 | 738 | |
739 | 739 | ulen = skb->len - sizeof(struct udphdr); |
740 | 740 | copied = len; |
741 | ---- linux-2.6.32-504.30.3.el6.orig/net/ipv6/raw.c | |
742 | -+++ linux-2.6.32-504.30.3.el6/net/ipv6/raw.c | |
741 | +--- linux-2.6.32-573.1.1.el6.orig/net/ipv6/raw.c | |
742 | ++++ linux-2.6.32-573.1.1.el6/net/ipv6/raw.c | |
743 | 743 | @@ -59,6 +59,7 @@ |
744 | 744 | |
745 | 745 | #include <linux/proc_fs.h> |
@@ -759,8 +759,8 @@ | ||
759 | 759 | |
760 | 760 | copied = skb->len; |
761 | 761 | if (copied > len) { |
762 | ---- linux-2.6.32-504.30.3.el6.orig/net/ipv6/udp.c | |
763 | -+++ linux-2.6.32-504.30.3.el6/net/ipv6/udp.c | |
762 | +--- linux-2.6.32-573.1.1.el6.orig/net/ipv6/udp.c | |
763 | ++++ linux-2.6.32-573.1.1.el6/net/ipv6/udp.c | |
764 | 764 | @@ -50,6 +50,7 @@ |
765 | 765 | #include <linux/proc_fs.h> |
766 | 766 | #include <linux/seq_file.h> |
@@ -780,9 +780,9 @@ | ||
780 | 780 | |
781 | 781 | ulen = skb->len - sizeof(struct udphdr); |
782 | 782 | copied = len; |
783 | ---- linux-2.6.32-504.30.3.el6.orig/net/socket.c | |
784 | -+++ linux-2.6.32-504.30.3.el6/net/socket.c | |
785 | -@@ -578,6 +578,8 @@ static inline int __sock_sendmsg(struct | |
783 | +--- linux-2.6.32-573.1.1.el6.orig/net/socket.c | |
784 | ++++ linux-2.6.32-573.1.1.el6/net/socket.c | |
785 | +@@ -578,6 +578,8 @@ static inline int __sock_sendmsg(struct | |
786 | 786 | struct msghdr *msg, size_t size) |
787 | 787 | { |
788 | 788 | int err = security_socket_sendmsg(sock, msg, size); |
@@ -842,8 +842,8 @@ | ||
842 | 842 | if (err) |
843 | 843 | goto out_put; |
844 | 844 | |
845 | ---- linux-2.6.32-504.30.3.el6.orig/net/unix/af_unix.c | |
846 | -+++ linux-2.6.32-504.30.3.el6/net/unix/af_unix.c | |
845 | +--- linux-2.6.32-573.1.1.el6.orig/net/unix/af_unix.c | |
846 | ++++ linux-2.6.32-573.1.1.el6/net/unix/af_unix.c | |
847 | 847 | @@ -866,6 +866,9 @@ static int unix_bind(struct socket *sock |
848 | 848 | mode = S_IFSOCK | |
849 | 849 | (SOCK_INODE(sock)->i_mode & ~current_umask()); |
@@ -865,8 +865,8 @@ | ||
865 | 865 | if (msg->msg_name) |
866 | 866 | unix_copy_addr(msg, skb->sk); |
867 | 867 | |
868 | ---- linux-2.6.32-504.30.3.el6.orig/security/Kconfig | |
869 | -+++ linux-2.6.32-504.30.3.el6/security/Kconfig | |
868 | +--- linux-2.6.32-573.1.1.el6.orig/security/Kconfig | |
869 | ++++ linux-2.6.32-573.1.1.el6/security/Kconfig | |
870 | 870 | @@ -177,5 +177,7 @@ source security/tomoyo/Kconfig |
871 | 871 | |
872 | 872 | source security/integrity/ima/Kconfig |
@@ -875,8 +875,8 @@ | ||
875 | 875 | + |
876 | 876 | endmenu |
877 | 877 | |
878 | ---- linux-2.6.32-504.30.3.el6.orig/security/Makefile | |
879 | -+++ linux-2.6.32-504.30.3.el6/security/Makefile | |
878 | +--- linux-2.6.32-573.1.1.el6.orig/security/Makefile | |
879 | ++++ linux-2.6.32-573.1.1.el6/security/Makefile | |
880 | 880 | @@ -25,3 +25,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c |
881 | 881 | # Object integrity file lists |
882 | 882 | subdir-$(CONFIG_IMA) += integrity/ima |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 4.0.8. | |
1 | +This is TOMOYO Linux patch for kernel 4.0.9. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.0.8.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.0.9.tar.xz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 |
6 | 6 | fs/open.c | 2 |
@@ -29,8 +29,8 @@ | ||
29 | 29 | security/security.c | 110 ++++++++++++++++++++++++++++++++++++++++------ |
30 | 30 | 25 files changed, 248 insertions(+), 37 deletions(-) |
31 | 31 | |
32 | ---- linux-4.0.8.orig/fs/exec.c | |
33 | -+++ linux-4.0.8/fs/exec.c | |
32 | +--- linux-4.0.9.orig/fs/exec.c | |
33 | ++++ linux-4.0.9/fs/exec.c | |
34 | 34 | @@ -1451,7 +1451,7 @@ static int exec_binprm(struct linux_binp |
35 | 35 | old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent)); |
36 | 36 | rcu_read_unlock(); |
@@ -40,8 +40,8 @@ | ||
40 | 40 | if (ret >= 0) { |
41 | 41 | audit_bprm(bprm); |
42 | 42 | trace_sched_process_exec(current, old_pid, bprm); |
43 | ---- linux-4.0.8.orig/fs/open.c | |
44 | -+++ linux-4.0.8/fs/open.c | |
43 | +--- linux-4.0.9.orig/fs/open.c | |
44 | ++++ linux-4.0.9/fs/open.c | |
45 | 45 | @@ -1105,6 +1105,8 @@ EXPORT_SYMBOL(sys_close); |
46 | 46 | */ |
47 | 47 | SYSCALL_DEFINE0(vhangup) |
@@ -51,8 +51,8 @@ | ||
51 | 51 | if (capable(CAP_SYS_TTY_CONFIG)) { |
52 | 52 | tty_vhangup_self(); |
53 | 53 | return 0; |
54 | ---- linux-4.0.8.orig/fs/proc/version.c | |
55 | -+++ linux-4.0.8/fs/proc/version.c | |
54 | +--- linux-4.0.9.orig/fs/proc/version.c | |
55 | ++++ linux-4.0.9/fs/proc/version.c | |
56 | 56 | @@ -32,3 +32,10 @@ static int __init proc_version_init(void |
57 | 57 | return 0; |
58 | 58 | } |
@@ -60,12 +60,12 @@ | ||
60 | 60 | + |
61 | 61 | +static int __init ccs_show_version(void) |
62 | 62 | +{ |
63 | -+ printk(KERN_INFO "Hook version: 4.0.8 2015/07/11\n"); | |
63 | ++ printk(KERN_INFO "Hook version: 4.0.9 2015/07/28\n"); | |
64 | 64 | + return 0; |
65 | 65 | +} |
66 | 66 | +fs_initcall(ccs_show_version); |
67 | ---- linux-4.0.8.orig/include/linux/init_task.h | |
68 | -+++ linux-4.0.8/include/linux/init_task.h | |
67 | +--- linux-4.0.9.orig/include/linux/init_task.h | |
68 | ++++ linux-4.0.9/include/linux/init_task.h | |
69 | 69 | @@ -182,6 +182,14 @@ extern struct task_group root_task_group |
70 | 70 | # define INIT_KASAN(tsk) |
71 | 71 | #endif |
@@ -89,8 +89,8 @@ | ||
89 | 89 | } |
90 | 90 | |
91 | 91 | |
92 | ---- linux-4.0.8.orig/include/linux/sched.h | |
93 | -+++ linux-4.0.8/include/linux/sched.h | |
92 | +--- linux-4.0.9.orig/include/linux/sched.h | |
93 | ++++ linux-4.0.9/include/linux/sched.h | |
94 | 94 | @@ -6,6 +6,8 @@ |
95 | 95 | #include <linux/sched/prio.h> |
96 | 96 |
@@ -111,8 +111,8 @@ | ||
111 | 111 | }; |
112 | 112 | |
113 | 113 | /* Future-safe accessor for struct task_struct's cpus_allowed. */ |
114 | ---- linux-4.0.8.orig/include/linux/security.h | |
115 | -+++ linux-4.0.8/include/linux/security.h | |
114 | +--- linux-4.0.9.orig/include/linux/security.h | |
115 | ++++ linux-4.0.9/include/linux/security.h | |
116 | 116 | @@ -53,6 +53,7 @@ struct msg_queue; |
117 | 117 | struct xattr; |
118 | 118 | struct xfrm_sec_ctx; |
@@ -319,8 +319,8 @@ | ||
319 | 319 | } |
320 | 320 | #endif /* CONFIG_SECURITY_PATH */ |
321 | 321 | |
322 | ---- linux-4.0.8.orig/include/net/ip.h | |
323 | -+++ linux-4.0.8/include/net/ip.h | |
322 | +--- linux-4.0.9.orig/include/net/ip.h | |
323 | ++++ linux-4.0.9/include/net/ip.h | |
324 | 324 | @@ -215,6 +215,8 @@ void inet_get_local_port_range(struct ne |
325 | 325 | #ifdef CONFIG_SYSCTL |
326 | 326 | static inline int inet_is_local_reserved_port(struct net *net, int port) |
@@ -339,8 +339,8 @@ | ||
339 | 339 | return 0; |
340 | 340 | } |
341 | 341 | #endif |
342 | ---- linux-4.0.8.orig/kernel/fork.c | |
343 | -+++ linux-4.0.8/kernel/fork.c | |
342 | +--- linux-4.0.9.orig/kernel/fork.c | |
343 | ++++ linux-4.0.9/kernel/fork.c | |
344 | 344 | @@ -246,6 +246,7 @@ void __put_task_struct(struct task_struc |
345 | 345 | delayacct_tsk_free(tsk); |
346 | 346 | put_signal_struct(tsk->signal); |
@@ -367,8 +367,8 @@ | ||
367 | 367 | bad_fork_cleanup_perf: |
368 | 368 | perf_event_free_task(p); |
369 | 369 | bad_fork_cleanup_policy: |
370 | ---- linux-4.0.8.orig/kernel/kexec.c | |
371 | -+++ linux-4.0.8/kernel/kexec.c | |
370 | +--- linux-4.0.9.orig/kernel/kexec.c | |
371 | ++++ linux-4.0.9/kernel/kexec.c | |
372 | 372 | @@ -41,6 +41,7 @@ |
373 | 373 | #include <asm/uaccess.h> |
374 | 374 | #include <asm/io.h> |
@@ -386,8 +386,8 @@ | ||
386 | 386 | |
387 | 387 | /* |
388 | 388 | * Verify we have a legal set of flags |
389 | ---- linux-4.0.8.orig/kernel/module.c | |
390 | -+++ linux-4.0.8/kernel/module.c | |
389 | +--- linux-4.0.9.orig/kernel/module.c | |
390 | ++++ linux-4.0.9/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.0.8.orig/kernel/ptrace.c | |
418 | -+++ linux-4.0.8/kernel/ptrace.c | |
417 | +--- linux-4.0.9.orig/kernel/ptrace.c | |
418 | ++++ linux-4.0.9/kernel/ptrace.c | |
419 | 419 | @@ -1035,6 +1035,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.0.8.orig/kernel/reboot.c | |
444 | -+++ linux-4.0.8/kernel/reboot.c | |
443 | +--- linux-4.0.9.orig/kernel/reboot.c | |
444 | ++++ linux-4.0.9/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.0.8.orig/kernel/sched/core.c | |
463 | -+++ linux-4.0.8/kernel/sched/core.c | |
462 | +--- linux-4.0.9.orig/kernel/sched/core.c | |
463 | ++++ linux-4.0.9/kernel/sched/core.c | |
464 | 464 | @@ -3140,6 +3140,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.0.8.orig/kernel/signal.c | |
474 | -+++ linux-4.0.8/kernel/signal.c | |
473 | +--- linux-4.0.9.orig/kernel/signal.c | |
474 | ++++ linux-4.0.9/kernel/signal.c | |
475 | 475 | @@ -2898,6 +2898,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.0.8.orig/kernel/sys.c | |
521 | -+++ linux-4.0.8/kernel/sys.c | |
520 | +--- linux-4.0.9.orig/kernel/sys.c | |
521 | ++++ linux-4.0.9/kernel/sys.c | |
522 | 522 | @@ -183,6 +183,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 | down_write(&uts_sem); |
550 | 550 | errno = -EFAULT; |
551 | ---- linux-4.0.8.orig/kernel/time/ntp.c | |
552 | -+++ linux-4.0.8/kernel/time/ntp.c | |
551 | +--- linux-4.0.9.orig/kernel/time/ntp.c | |
552 | ++++ linux-4.0.9/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 | /* |
585 | 585 | * Check for potential multiplication overflows that can |
586 | ---- linux-4.0.8.orig/net/ipv4/raw.c | |
587 | -+++ linux-4.0.8/net/ipv4/raw.c | |
586 | +--- linux-4.0.9.orig/net/ipv4/raw.c | |
587 | ++++ linux-4.0.9/net/ipv4/raw.c | |
588 | 588 | @@ -729,6 +729,10 @@ static int raw_recvmsg(struct kiocb *ioc |
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.0.8.orig/net/ipv4/udp.c | |
600 | -+++ linux-4.0.8/net/ipv4/udp.c | |
599 | +--- linux-4.0.9.orig/net/ipv4/udp.c | |
600 | ++++ linux-4.0.9/net/ipv4/udp.c | |
601 | 601 | @@ -1275,6 +1275,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.0.8.orig/net/ipv6/raw.c | |
613 | -+++ linux-4.0.8/net/ipv6/raw.c | |
612 | +--- linux-4.0.9.orig/net/ipv6/raw.c | |
613 | ++++ linux-4.0.9/net/ipv6/raw.c | |
614 | 614 | @@ -478,6 +478,10 @@ static int rawv6_recvmsg(struct kiocb *i |
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.0.8.orig/net/ipv6/udp.c | |
626 | -+++ linux-4.0.8/net/ipv6/udp.c | |
625 | +--- linux-4.0.9.orig/net/ipv6/udp.c | |
626 | ++++ linux-4.0.9/net/ipv6/udp.c | |
627 | 627 | @@ -416,6 +416,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.0.8.orig/net/socket.c | |
639 | -+++ linux-4.0.8/net/socket.c | |
638 | +--- linux-4.0.9.orig/net/socket.c | |
639 | ++++ linux-4.0.9/net/socket.c | |
640 | 640 | @@ -1549,6 +1549,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.0.8.orig/net/unix/af_unix.c | |
652 | -+++ linux-4.0.8/net/unix/af_unix.c | |
651 | +--- linux-4.0.9.orig/net/unix/af_unix.c | |
652 | ++++ linux-4.0.9/net/unix/af_unix.c | |
653 | 653 | @@ -1807,6 +1807,10 @@ static int unix_dgram_recvmsg(struct kio |
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.0.8.orig/security/Kconfig | |
665 | -+++ linux-4.0.8/security/Kconfig | |
664 | +--- linux-4.0.9.orig/security/Kconfig | |
665 | ++++ linux-4.0.9/security/Kconfig | |
666 | 666 | @@ -167,5 +167,7 @@ config DEFAULT_SECURITY |
667 | 667 | default "yama" if DEFAULT_SECURITY_YAMA |
668 | 668 | default "" if DEFAULT_SECURITY_DAC |
@@ -671,8 +671,8 @@ | ||
671 | 671 | + |
672 | 672 | endmenu |
673 | 673 | |
674 | ---- linux-4.0.8.orig/security/Makefile | |
675 | -+++ linux-4.0.8/security/Makefile | |
674 | +--- linux-4.0.9.orig/security/Makefile | |
675 | ++++ linux-4.0.9/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 |
@@ -680,8 +680,8 @@ | ||
680 | 680 | + |
681 | 681 | +subdir-$(CONFIG_CCSECURITY) += ccsecurity |
682 | 682 | +obj-$(CONFIG_CCSECURITY) += ccsecurity/ |
683 | ---- linux-4.0.8.orig/security/security.c | |
684 | -+++ linux-4.0.8/security/security.c | |
683 | +--- linux-4.0.9.orig/security/security.c | |
684 | ++++ linux-4.0.9/security/security.c | |
685 | 685 | @@ -226,7 +226,10 @@ int security_syslog(int type) |
686 | 686 | |
687 | 687 | int security_settime(const struct timespec *ts, const struct timezone *tz) |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 4.2-rc3. | |
1 | +This is TOMOYO Linux patch for kernel 4.2-rc4. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/testing/linux-4.2-rc3.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/testing/linux-4.2-rc4.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(+), 25 deletions(-) |
30 | 30 | |
31 | ---- linux-4.2-rc3.orig/fs/exec.c | |
32 | -+++ linux-4.2-rc3/fs/exec.c | |
31 | +--- linux-4.2-rc4.orig/fs/exec.c | |
32 | ++++ linux-4.2-rc4/fs/exec.c | |
33 | 33 | @@ -1461,7 +1461,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.2-rc3.orig/fs/open.c | |
43 | -+++ linux-4.2-rc3/fs/open.c | |
42 | +--- linux-4.2-rc4.orig/fs/open.c | |
43 | ++++ linux-4.2-rc4/fs/open.c | |
44 | 44 | @@ -1117,6 +1117,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.2-rc3.orig/fs/proc/version.c | |
54 | -+++ linux-4.2-rc3/fs/proc/version.c | |
53 | +--- linux-4.2-rc4.orig/fs/proc/version.c | |
54 | ++++ linux-4.2-rc4/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.2-rc3 2015/07/21\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.2-rc4 2015/07/28\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-4.2-rc3.orig/include/linux/init_task.h | |
67 | -+++ linux-4.2-rc3/include/linux/init_task.h | |
66 | +--- linux-4.2-rc4.orig/include/linux/init_task.h | |
67 | ++++ linux-4.2-rc4/include/linux/init_task.h | |
68 | 68 | @@ -173,6 +173,14 @@ extern struct task_group root_task_group |
69 | 69 | # define INIT_KASAN(tsk) |
70 | 70 | #endif |
@@ -88,8 +88,8 @@ | ||
88 | 88 | } |
89 | 89 | |
90 | 90 | |
91 | ---- linux-4.2-rc3.orig/include/linux/sched.h | |
92 | -+++ linux-4.2-rc3/include/linux/sched.h | |
91 | +--- linux-4.2-rc4.orig/include/linux/sched.h | |
92 | ++++ linux-4.2-rc4/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.2-rc3.orig/include/linux/security.h | |
114 | -+++ linux-4.2-rc3/include/linux/security.h | |
113 | +--- linux-4.2-rc4.orig/include/linux/security.h | |
114 | ++++ linux-4.2-rc4/include/linux/security.h | |
115 | 115 | @@ -53,6 +53,7 @@ struct msg_queue; |
116 | 116 | struct xattr; |
117 | 117 | struct xfrm_sec_ctx; |
@@ -318,9 +318,9 @@ | ||
318 | 318 | } |
319 | 319 | #endif /* CONFIG_SECURITY_PATH */ |
320 | 320 | |
321 | ---- linux-4.2-rc3.orig/include/net/ip.h | |
322 | -+++ linux-4.2-rc3/include/net/ip.h | |
323 | -@@ -216,6 +216,8 @@ void inet_get_local_port_range(struct ne | |
321 | +--- linux-4.2-rc4.orig/include/net/ip.h | |
322 | ++++ linux-4.2-rc4/include/net/ip.h | |
323 | +@@ -217,6 +217,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) |
326 | 326 | { |
@@ -329,7 +329,7 @@ | ||
329 | 329 | if (!net->ipv4.sysctl_local_reserved_ports) |
330 | 330 | return 0; |
331 | 331 | return test_bit(port, net->ipv4.sysctl_local_reserved_ports); |
332 | -@@ -229,6 +231,8 @@ static inline bool sysctl_dev_name_is_al | |
332 | +@@ -230,6 +232,8 @@ static inline bool sysctl_dev_name_is_al | |
333 | 333 | #else |
334 | 334 | static inline int inet_is_local_reserved_port(struct net *net, int port) |
335 | 335 | { |
@@ -338,8 +338,8 @@ | ||
338 | 338 | return 0; |
339 | 339 | } |
340 | 340 | #endif |
341 | ---- linux-4.2-rc3.orig/kernel/fork.c | |
342 | -+++ linux-4.2-rc3/kernel/fork.c | |
341 | +--- linux-4.2-rc4.orig/kernel/fork.c | |
342 | ++++ linux-4.2-rc4/kernel/fork.c | |
343 | 343 | @@ -257,6 +257,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.2-rc3.orig/kernel/kexec.c | |
370 | -+++ linux-4.2-rc3/kernel/kexec.c | |
369 | +--- linux-4.2-rc4.orig/kernel/kexec.c | |
370 | ++++ linux-4.2-rc4/kernel/kexec.c | |
371 | 371 | @@ -41,6 +41,7 @@ |
372 | 372 | #include <asm/uaccess.h> |
373 | 373 | #include <asm/io.h> |
@@ -385,8 +385,8 @@ | ||
385 | 385 | |
386 | 386 | /* |
387 | 387 | * Verify we have a legal set of flags |
388 | ---- linux-4.2-rc3.orig/kernel/module.c | |
389 | -+++ linux-4.2-rc3/kernel/module.c | |
388 | +--- linux-4.2-rc4.orig/kernel/module.c | |
389 | ++++ linux-4.2-rc4/kernel/module.c | |
390 | 390 | @@ -61,6 +61,7 @@ |
391 | 391 | #include <linux/bsearch.h> |
392 | 392 | #include <uapi/linux/module.h> |
@@ -413,8 +413,8 @@ | ||
413 | 413 | |
414 | 414 | return 0; |
415 | 415 | } |
416 | ---- linux-4.2-rc3.orig/kernel/ptrace.c | |
417 | -+++ linux-4.2-rc3/kernel/ptrace.c | |
416 | +--- linux-4.2-rc4.orig/kernel/ptrace.c | |
417 | ++++ linux-4.2-rc4/kernel/ptrace.c | |
418 | 418 | @@ -1034,6 +1034,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l |
419 | 419 | { |
420 | 420 | struct task_struct *child; |
@@ -439,8 +439,8 @@ | ||
439 | 439 | |
440 | 440 | if (request == PTRACE_TRACEME) { |
441 | 441 | ret = ptrace_traceme(); |
442 | ---- linux-4.2-rc3.orig/kernel/reboot.c | |
443 | -+++ linux-4.2-rc3/kernel/reboot.c | |
442 | +--- linux-4.2-rc4.orig/kernel/reboot.c | |
443 | ++++ linux-4.2-rc4/kernel/reboot.c | |
444 | 444 | @@ -16,6 +16,7 @@ |
445 | 445 | #include <linux/syscalls.h> |
446 | 446 | #include <linux/syscore_ops.h> |
@@ -458,8 +458,8 @@ | ||
458 | 458 | |
459 | 459 | /* |
460 | 460 | * If pid namespaces are enabled and the current task is in a child |
461 | ---- linux-4.2-rc3.orig/kernel/sched/core.c | |
462 | -+++ linux-4.2-rc3/kernel/sched/core.c | |
461 | +--- linux-4.2-rc4.orig/kernel/sched/core.c | |
462 | ++++ linux-4.2-rc4/kernel/sched/core.c | |
463 | 463 | @@ -3402,6 +3402,8 @@ int can_nice(const struct task_struct *p |
464 | 464 | SYSCALL_DEFINE1(nice, int, increment) |
465 | 465 | { |
@@ -469,8 +469,8 @@ | ||
469 | 469 | |
470 | 470 | /* |
471 | 471 | * Setpriority might change our priority at the same moment. |
472 | ---- linux-4.2-rc3.orig/kernel/signal.c | |
473 | -+++ linux-4.2-rc3/kernel/signal.c | |
472 | +--- linux-4.2-rc4.orig/kernel/signal.c | |
473 | ++++ linux-4.2-rc4/kernel/signal.c | |
474 | 474 | @@ -2893,6 +2893,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s |
475 | 475 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
476 | 476 | { |
@@ -516,8 +516,8 @@ | ||
516 | 516 | |
517 | 517 | return do_send_specific(tgid, pid, sig, info); |
518 | 518 | } |
519 | ---- linux-4.2-rc3.orig/kernel/sys.c | |
520 | -+++ linux-4.2-rc3/kernel/sys.c | |
519 | +--- linux-4.2-rc4.orig/kernel/sys.c | |
520 | ++++ linux-4.2-rc4/kernel/sys.c | |
521 | 521 | @@ -183,6 +183,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
522 | 522 | |
523 | 523 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -547,8 +547,8 @@ | ||
547 | 547 | |
548 | 548 | down_write(&uts_sem); |
549 | 549 | errno = -EFAULT; |
550 | ---- linux-4.2-rc3.orig/kernel/time/ntp.c | |
551 | -+++ linux-4.2-rc3/kernel/time/ntp.c | |
550 | +--- linux-4.2-rc4.orig/kernel/time/ntp.c | |
551 | ++++ linux-4.2-rc4/kernel/time/ntp.c | |
552 | 552 | @@ -16,6 +16,7 @@ |
553 | 553 | #include <linux/mm.h> |
554 | 554 | #include <linux/module.h> |
@@ -582,8 +582,8 @@ | ||
582 | 582 | |
583 | 583 | /* |
584 | 584 | * Check for potential multiplication overflows that can |
585 | ---- linux-4.2-rc3.orig/net/ipv4/raw.c | |
586 | -+++ linux-4.2-rc3/net/ipv4/raw.c | |
585 | +--- linux-4.2-rc4.orig/net/ipv4/raw.c | |
586 | ++++ linux-4.2-rc4/net/ipv4/raw.c | |
587 | 587 | @@ -727,6 +727,10 @@ static int raw_recvmsg(struct sock *sk, |
588 | 588 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
589 | 589 | if (!skb) |
@@ -595,8 +595,8 @@ | ||
595 | 595 | |
596 | 596 | copied = skb->len; |
597 | 597 | if (len < copied) { |
598 | ---- linux-4.2-rc3.orig/net/ipv4/udp.c | |
599 | -+++ linux-4.2-rc3/net/ipv4/udp.c | |
598 | +--- linux-4.2-rc4.orig/net/ipv4/udp.c | |
599 | ++++ linux-4.2-rc4/net/ipv4/udp.c | |
600 | 600 | @@ -1272,6 +1272,10 @@ try_again: |
601 | 601 | &peeked, &off, &err); |
602 | 602 | if (!skb) |
@@ -608,8 +608,8 @@ | ||
608 | 608 | |
609 | 609 | ulen = skb->len - sizeof(struct udphdr); |
610 | 610 | copied = len; |
611 | ---- linux-4.2-rc3.orig/net/ipv6/raw.c | |
612 | -+++ linux-4.2-rc3/net/ipv6/raw.c | |
611 | +--- linux-4.2-rc4.orig/net/ipv6/raw.c | |
612 | ++++ linux-4.2-rc4/net/ipv6/raw.c | |
613 | 613 | @@ -477,6 +477,10 @@ static int rawv6_recvmsg(struct sock *sk |
614 | 614 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
615 | 615 | if (!skb) |
@@ -621,8 +621,8 @@ | ||
621 | 621 | |
622 | 622 | copied = skb->len; |
623 | 623 | if (copied > len) { |
624 | ---- linux-4.2-rc3.orig/net/ipv6/udp.c | |
625 | -+++ linux-4.2-rc3/net/ipv6/udp.c | |
624 | +--- linux-4.2-rc4.orig/net/ipv6/udp.c | |
625 | ++++ linux-4.2-rc4/net/ipv6/udp.c | |
626 | 626 | @@ -413,6 +413,10 @@ try_again: |
627 | 627 | &peeked, &off, &err); |
628 | 628 | if (!skb) |
@@ -634,8 +634,8 @@ | ||
634 | 634 | |
635 | 635 | ulen = skb->len - sizeof(struct udphdr); |
636 | 636 | copied = len; |
637 | ---- linux-4.2-rc3.orig/net/socket.c | |
638 | -+++ linux-4.2-rc3/net/socket.c | |
637 | +--- linux-4.2-rc4.orig/net/socket.c | |
638 | ++++ linux-4.2-rc4/net/socket.c | |
639 | 639 | @@ -1482,6 +1482,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct |
640 | 640 | if (err < 0) |
641 | 641 | goto out_fd; |
@@ -647,8 +647,8 @@ | ||
647 | 647 | if (upeer_sockaddr) { |
648 | 648 | if (newsock->ops->getname(newsock, (struct sockaddr *)&address, |
649 | 649 | &len, 2) < 0) { |
650 | ---- linux-4.2-rc3.orig/net/unix/af_unix.c | |
651 | -+++ linux-4.2-rc3/net/unix/af_unix.c | |
650 | +--- linux-4.2-rc4.orig/net/unix/af_unix.c | |
651 | ++++ linux-4.2-rc4/net/unix/af_unix.c | |
652 | 652 | @@ -1911,6 +1911,10 @@ static int unix_dgram_recvmsg(struct soc |
653 | 653 | wake_up_interruptible_sync_poll(&u->peer_wait, |
654 | 654 | POLLOUT | POLLWRNORM | POLLWRBAND); |
@@ -660,8 +660,8 @@ | ||
660 | 660 | if (msg->msg_name) |
661 | 661 | unix_copy_addr(msg, skb->sk); |
662 | 662 | |
663 | ---- linux-4.2-rc3.orig/security/Kconfig | |
664 | -+++ linux-4.2-rc3/security/Kconfig | |
663 | +--- linux-4.2-rc4.orig/security/Kconfig | |
664 | ++++ linux-4.2-rc4/security/Kconfig | |
665 | 665 | @@ -168,5 +168,7 @@ config DEFAULT_SECURITY |
666 | 666 | default "yama" if DEFAULT_SECURITY_YAMA |
667 | 667 | default "" if DEFAULT_SECURITY_DAC |
@@ -670,8 +670,8 @@ | ||
670 | 670 | + |
671 | 671 | endmenu |
672 | 672 | |
673 | ---- linux-4.2-rc3.orig/security/Makefile | |
674 | -+++ linux-4.2-rc3/security/Makefile | |
673 | +--- linux-4.2-rc4.orig/security/Makefile | |
674 | ++++ linux-4.2-rc4/security/Makefile | |
675 | 675 | @@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c |
676 | 676 | # Object integrity file lists |
677 | 677 | subdir-$(CONFIG_INTEGRITY) += integrity |
@@ -10,12 +10,12 @@ | ||
10 | 10 | |
11 | 11 | cd /tmp/ || die "Can't chdir to /tmp/ ." |
12 | 12 | |
13 | -if [ ! -r kernel-2.6.32-504.30.3.el6.src.rpm ] | |
13 | +if [ ! -r kernel-2.6.32-573.1.1.el6.src.rpm ] | |
14 | 14 | then |
15 | - wget http://vault.centos.org/6.6/updates/Source/SPackages/kernel-2.6.32-504.30.3.el6.src.rpm || die "Can't download source package." | |
15 | + wget http://vault.centos.org/6.7/updates/Source/SPackages/kernel-2.6.32-573.1.1.el6.src.rpm || die "Can't download source package." | |
16 | 16 | fi |
17 | -LANG=C rpm --checksig kernel-2.6.32-504.30.3.el6.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature." | |
18 | -rpm -ivh kernel-2.6.32-504.30.3.el6.src.rpm || die "Can't install source package." | |
17 | +LANG=C rpm --checksig kernel-2.6.32-573.1.1.el6.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature." | |
18 | +rpm -ivh kernel-2.6.32-573.1.1.el6.src.rpm || die "Can't install source package." | |
19 | 19 | |
20 | 20 | cd /root/rpmbuild/SOURCES/ || die "Can't chdir to /root/rpmbuild/SOURCES/ ." |
21 | 21 | if [ ! -r caitsith-patch-0.1-20150721.tar.gz ] |
@@ -35,7 +35,7 @@ | ||
35 | 35 | -# % define buildid .local |
36 | 36 | +%define buildid _caitsith_0.1 |
37 | 37 | |
38 | - %define distro_build 504.30.3 | |
38 | + %define distro_build 573.1.1 | |
39 | 39 | %define signmodules 1 |
40 | 40 | @@ -437,7 +437,7 @@ |
41 | 41 | # Packages that need to be installed before the kernel is, because the %post |
@@ -44,7 +44,7 @@ | ||
44 | 44 | -%define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, grubby >= 7.0.4-1 |
45 | 45 | +%define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, grubby >= 7.0.4-1 |
46 | 46 | %if %{with_dracut} |
47 | - %define initrd_prereq dracut-kernel >= 004-356.el6_6.3 | |
47 | + %define initrd_prereq dracut-kernel >= 004-388.el6 | |
48 | 48 | %else |
49 | 49 | @@ -473,7 +473,7 @@ |
50 | 50 | AutoProv: yes\ |
@@ -55,7 +55,7 @@ | ||
55 | 55 | Group: System Environment/Kernel |
56 | 56 | License: GPLv2 |
57 | 57 | URL: http://www.kernel.org/ |
58 | -@@ -768,7 +768,7 @@ | |
58 | +@@ -767,7 +767,7 @@ | |
59 | 59 | Provides: kernel-devel-uname-r = %{KVERREL}%{?1:.%{1}}\ |
60 | 60 | AutoReqProv: no\ |
61 | 61 | Requires(pre): /usr/bin/find\ |
@@ -64,7 +64,7 @@ | ||
64 | 64 | This package provides kernel headers and makefiles sufficient to build modules\ |
65 | 65 | against the %{?2:%{2} }kernel package.\ |
66 | 66 | %{nil} |
67 | -@@ -934,6 +934,10 @@ | |
67 | +@@ -933,6 +933,10 @@ | |
68 | 68 | |
69 | 69 | ApplyOptionalPatch linux-kernel-test.patch |
70 | 70 |
@@ -75,7 +75,7 @@ | ||
75 | 75 | # Any further pre-build tree manipulations happen here. |
76 | 76 | |
77 | 77 | chmod +x scripts/checkpatch.pl |
78 | -@@ -958,6 +962,8 @@ | |
78 | +@@ -957,6 +961,8 @@ | |
79 | 79 | for i in *.config |
80 | 80 | do |
81 | 81 | mv $i .config |