(メッセージはありません)
@@ -829,8 +829,12 @@ | ||
829 | 829 | } |
830 | 830 | /* Same with put_arg_page(page) in fs/exec.c */ |
831 | 831 | #ifdef CONFIG_MMU |
832 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0) | |
833 | + put_user_page(page); | |
834 | +#else | |
832 | 835 | put_page(page); |
833 | 836 | #endif |
837 | +#endif | |
834 | 838 | return true; |
835 | 839 | } |
836 | 840 |
@@ -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.10/updates/Source/SPackages/kernel-2.6.32-754.15.3.el6.src.rpm | |
3 | +Source code for this patch is http://vault.centos.org/6.10/updates/Source/SPackages/kernel-2.6.32-754.17.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-754.15.3.el6.orig/fs/compat.c | |
41 | -+++ linux-2.6.32-754.15.3.el6/fs/compat.c | |
40 | +--- linux-2.6.32-754.17.1.el6.orig/fs/compat.c | |
41 | ++++ linux-2.6.32-754.17.1.el6/fs/compat.c | |
42 | 42 | @@ -1524,7 +1524,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-754.15.3.el6.orig/fs/compat_ioctl.c | |
52 | -+++ linux-2.6.32-754.15.3.el6/fs/compat_ioctl.c | |
51 | +--- linux-2.6.32-754.17.1.el6.orig/fs/compat_ioctl.c | |
52 | ++++ linux-2.6.32-754.17.1.el6/fs/compat_ioctl.c | |
53 | 53 | @@ -114,6 +114,7 @@ |
54 | 54 | #ifdef CONFIG_SPARC |
55 | 55 | #include <asm/fbio.h> |
@@ -67,8 +67,8 @@ | ||
67 | 67 | if (error) |
68 | 68 | goto out_fput; |
69 | 69 | |
70 | ---- linux-2.6.32-754.15.3.el6.orig/fs/exec.c | |
71 | -+++ linux-2.6.32-754.15.3.el6/fs/exec.c | |
70 | +--- linux-2.6.32-754.17.1.el6.orig/fs/exec.c | |
71 | ++++ linux-2.6.32-754.17.1.el6/fs/exec.c | |
72 | 72 | @@ -1511,7 +1511,7 @@ int do_execve(const char * filename, |
73 | 73 | goto out; |
74 | 74 |
@@ -78,8 +78,8 @@ | ||
78 | 78 | if (retval < 0) |
79 | 79 | goto out; |
80 | 80 | |
81 | ---- linux-2.6.32-754.15.3.el6.orig/fs/fcntl.c | |
82 | -+++ linux-2.6.32-754.15.3.el6/fs/fcntl.c | |
81 | +--- linux-2.6.32-754.17.1.el6.orig/fs/fcntl.c | |
82 | ++++ linux-2.6.32-754.17.1.el6/fs/fcntl.c | |
83 | 83 | @@ -431,6 +431,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-754.15.3.el6.orig/fs/ioctl.c | |
102 | -+++ linux-2.6.32-754.15.3.el6/fs/ioctl.c | |
101 | +--- linux-2.6.32-754.17.1.el6.orig/fs/ioctl.c | |
102 | ++++ linux-2.6.32-754.17.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-754.15.3.el6.orig/fs/namei.c | |
113 | -+++ linux-2.6.32-754.15.3.el6/fs/namei.c | |
112 | +--- linux-2.6.32-754.17.1.el6.orig/fs/namei.c | |
113 | ++++ linux-2.6.32-754.17.1.el6/fs/namei.c | |
114 | 114 | @@ -2070,6 +2070,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-754.15.3.el6.orig/fs/namespace.c | |
202 | -+++ linux-2.6.32-754.15.3.el6/fs/namespace.c | |
201 | +--- linux-2.6.32-754.17.1.el6.orig/fs/namespace.c | |
202 | ++++ linux-2.6.32-754.17.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 |
@@ -236,8 +236,8 @@ | ||
236 | 236 | if (error) { |
237 | 237 | path_put(&old); |
238 | 238 | goto out1; |
239 | ---- linux-2.6.32-754.15.3.el6.orig/fs/open.c | |
240 | -+++ linux-2.6.32-754.15.3.el6/fs/open.c | |
239 | +--- linux-2.6.32-754.17.1.el6.orig/fs/open.c | |
240 | ++++ linux-2.6.32-754.17.1.el6/fs/open.c | |
241 | 241 | @@ -103,6 +103,8 @@ long vfs_truncate(struct path *path, lof |
242 | 242 | error = locks_verify_truncate(inode, NULL, length); |
243 | 243 | if (!error) |
@@ -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-754.15.3.el6.orig/fs/proc/version.c | |
332 | -+++ linux-2.6.32-754.15.3.el6/fs/proc/version.c | |
331 | +--- linux-2.6.32-754.17.1.el6.orig/fs/proc/version.c | |
332 | ++++ linux-2.6.32-754.17.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-754.15.3.el6 2019/06/19\n"); | |
340 | ++ printk(KERN_INFO "Hook version: 2.6.32-754.17.1.el6 2019/08/04\n"); | |
341 | 341 | + return 0; |
342 | 342 | +} |
343 | 343 | +module_init(ccs_show_version); |
344 | ---- linux-2.6.32-754.15.3.el6.orig/fs/stat.c | |
345 | -+++ linux-2.6.32-754.15.3.el6/fs/stat.c | |
344 | +--- linux-2.6.32-754.17.1.el6.orig/fs/stat.c | |
345 | ++++ linux-2.6.32-754.17.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-754.15.3.el6.orig/include/linux/init_task.h | |
356 | -+++ linux-2.6.32-754.15.3.el6/include/linux/init_task.h | |
355 | +--- linux-2.6.32-754.17.1.el6.orig/include/linux/init_task.h | |
356 | ++++ linux-2.6.32-754.17.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-754.15.3.el6.orig/include/linux/sched.h | |
381 | -+++ linux-2.6.32-754.15.3.el6/include/linux/sched.h | |
380 | +--- linux-2.6.32-754.17.1.el6.orig/include/linux/sched.h | |
381 | ++++ linux-2.6.32-754.17.1.el6/include/linux/sched.h | |
382 | 382 | @@ -43,6 +43,8 @@ |
383 | 383 | |
384 | 384 | #ifdef __KERNEL__ |
@@ -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-754.15.3.el6.orig/include/linux/security.h | |
403 | -+++ linux-2.6.32-754.15.3.el6/include/linux/security.h | |
402 | +--- linux-2.6.32-754.17.1.el6.orig/include/linux/security.h | |
403 | ++++ linux-2.6.32-754.17.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-754.15.3.el6.orig/include/net/ip.h | |
413 | -+++ linux-2.6.32-754.15.3.el6/include/net/ip.h | |
412 | +--- linux-2.6.32-754.17.1.el6.orig/include/net/ip.h | |
413 | ++++ linux-2.6.32-754.17.1.el6/include/net/ip.h | |
414 | 414 | @@ -33,6 +33,7 @@ |
415 | 415 | #endif |
416 | 416 | #include <net/snmp.h> |
@@ -428,8 +428,8 @@ | ||
428 | 428 | return test_bit(port, sysctl_local_reserved_ports); |
429 | 429 | } |
430 | 430 | |
431 | ---- linux-2.6.32-754.15.3.el6.orig/kernel/compat.c | |
432 | -+++ linux-2.6.32-754.15.3.el6/kernel/compat.c | |
431 | +--- linux-2.6.32-754.17.1.el6.orig/kernel/compat.c | |
432 | ++++ linux-2.6.32-754.17.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-754.15.3.el6.orig/kernel/fork.c | |
443 | -+++ linux-2.6.32-754.15.3.el6/kernel/fork.c | |
442 | +--- linux-2.6.32-754.17.1.el6.orig/kernel/fork.c | |
443 | ++++ linux-2.6.32-754.17.1.el6/kernel/fork.c | |
444 | 444 | @@ -206,6 +206,7 @@ void __put_task_struct(struct task_struc |
445 | 445 | exit_creds(tsk); |
446 | 446 | delayacct_tsk_free(tsk); |
@@ -467,8 +467,8 @@ | ||
467 | 467 | bad_fork_cleanup_perf: |
468 | 468 | perf_event_free_task(p); |
469 | 469 | bad_fork_cleanup_policy: |
470 | ---- linux-2.6.32-754.15.3.el6.orig/kernel/kexec.c | |
471 | -+++ linux-2.6.32-754.15.3.el6/kernel/kexec.c | |
470 | +--- linux-2.6.32-754.17.1.el6.orig/kernel/kexec.c | |
471 | ++++ linux-2.6.32-754.17.1.el6/kernel/kexec.c | |
472 | 472 | @@ -41,6 +41,7 @@ |
473 | 473 | #include <asm/system.h> |
474 | 474 | #include <asm/sections.h> |
@@ -486,8 +486,8 @@ | ||
486 | 486 | |
487 | 487 | if (kexec_load_disabled) |
488 | 488 | return -EPERM; |
489 | ---- linux-2.6.32-754.15.3.el6.orig/kernel/module.c | |
490 | -+++ linux-2.6.32-754.15.3.el6/kernel/module.c | |
489 | +--- linux-2.6.32-754.17.1.el6.orig/kernel/module.c | |
490 | ++++ linux-2.6.32-754.17.1.el6/kernel/module.c | |
491 | 491 | @@ -57,6 +57,7 @@ |
492 | 492 | #include <linux/percpu.h> |
493 | 493 | #include <linux/kmemleak.h> |
@@ -514,8 +514,8 @@ | ||
514 | 514 | |
515 | 515 | /* |
516 | 516 | * Make sure we don't speculate past the CAP_SYS_MODULE check. The |
517 | ---- linux-2.6.32-754.15.3.el6.orig/kernel/ptrace.c | |
518 | -+++ linux-2.6.32-754.15.3.el6/kernel/ptrace.c | |
517 | +--- linux-2.6.32-754.17.1.el6.orig/kernel/ptrace.c | |
518 | ++++ linux-2.6.32-754.17.1.el6/kernel/ptrace.c | |
519 | 519 | @@ -199,6 +199,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l |
520 | 520 | { |
521 | 521 | struct task_struct *child; |
@@ -540,8 +540,8 @@ | ||
540 | 540 | |
541 | 541 | if (request == PTRACE_TRACEME) { |
542 | 542 | ret = ptrace_traceme(); |
543 | ---- linux-2.6.32-754.15.3.el6.orig/kernel/sched.c | |
544 | -+++ linux-2.6.32-754.15.3.el6/kernel/sched.c | |
543 | +--- linux-2.6.32-754.17.1.el6.orig/kernel/sched.c | |
544 | ++++ linux-2.6.32-754.17.1.el6/kernel/sched.c | |
545 | 545 | @@ -6869,6 +6869,8 @@ int can_nice(const struct task_struct *p |
546 | 546 | SYSCALL_DEFINE1(nice, int, increment) |
547 | 547 | { |
@@ -551,8 +551,8 @@ | ||
551 | 551 | |
552 | 552 | /* |
553 | 553 | * Setpriority might change our priority at the same moment. |
554 | ---- linux-2.6.32-754.15.3.el6.orig/kernel/signal.c | |
555 | -+++ linux-2.6.32-754.15.3.el6/kernel/signal.c | |
554 | +--- linux-2.6.32-754.17.1.el6.orig/kernel/signal.c | |
555 | ++++ linux-2.6.32-754.17.1.el6/kernel/signal.c | |
556 | 556 | @@ -2316,6 +2316,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s |
557 | 557 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
558 | 558 | { |
@@ -598,8 +598,8 @@ | ||
598 | 598 | |
599 | 599 | return do_send_specific(tgid, pid, sig, info); |
600 | 600 | } |
601 | ---- linux-2.6.32-754.15.3.el6.orig/kernel/sys.c | |
602 | -+++ linux-2.6.32-754.15.3.el6/kernel/sys.c | |
601 | +--- linux-2.6.32-754.17.1.el6.orig/kernel/sys.c | |
602 | ++++ linux-2.6.32-754.17.1.el6/kernel/sys.c | |
603 | 603 | @@ -163,6 +163,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
604 | 604 | |
605 | 605 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -638,8 +638,8 @@ | ||
638 | 638 | |
639 | 639 | down_write(&uts_sem); |
640 | 640 | errno = -EFAULT; |
641 | ---- linux-2.6.32-754.15.3.el6.orig/kernel/sysctl.c | |
642 | -+++ linux-2.6.32-754.15.3.el6/kernel/sysctl.c | |
641 | +--- linux-2.6.32-754.17.1.el6.orig/kernel/sysctl.c | |
642 | ++++ linux-2.6.32-754.17.1.el6/kernel/sysctl.c | |
643 | 643 | @@ -2131,6 +2131,9 @@ int do_sysctl(int __user *name, int nlen |
644 | 644 | |
645 | 645 | for (head = sysctl_head_next(NULL); head; |
@@ -650,8 +650,8 @@ | ||
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-754.15.3.el6.orig/kernel/time.c | |
654 | -+++ linux-2.6.32-754.15.3.el6/kernel/time.c | |
653 | +--- linux-2.6.32-754.17.1.el6.orig/kernel/time.c | |
654 | ++++ linux-2.6.32-754.17.1.el6/kernel/time.c | |
655 | 655 | @@ -92,6 +92,8 @@ SYSCALL_DEFINE1(stime, time_t __user *, |
656 | 656 | err = security_settime(&tv, NULL); |
657 | 657 | if (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-754.15.3.el6.orig/kernel/time/ntp.c | |
674 | -+++ linux-2.6.32-754.15.3.el6/kernel/time/ntp.c | |
673 | +--- linux-2.6.32-754.17.1.el6.orig/kernel/time/ntp.c | |
674 | ++++ linux-2.6.32-754.17.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-754.15.3.el6.orig/net/ipv4/raw.c | |
700 | -+++ linux-2.6.32-754.15.3.el6/net/ipv4/raw.c | |
699 | +--- linux-2.6.32-754.17.1.el6.orig/net/ipv4/raw.c | |
700 | ++++ linux-2.6.32-754.17.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-754.15.3.el6.orig/net/ipv4/udp.c | |
721 | -+++ linux-2.6.32-754.15.3.el6/net/ipv4/udp.c | |
720 | +--- linux-2.6.32-754.17.1.el6.orig/net/ipv4/udp.c | |
721 | ++++ linux-2.6.32-754.17.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-754.15.3.el6.orig/net/ipv6/raw.c | |
742 | -+++ linux-2.6.32-754.15.3.el6/net/ipv6/raw.c | |
741 | +--- linux-2.6.32-754.17.1.el6.orig/net/ipv6/raw.c | |
742 | ++++ linux-2.6.32-754.17.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-754.15.3.el6.orig/net/ipv6/udp.c | |
763 | -+++ linux-2.6.32-754.15.3.el6/net/ipv6/udp.c | |
762 | +--- linux-2.6.32-754.17.1.el6.orig/net/ipv6/udp.c | |
763 | ++++ linux-2.6.32-754.17.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,8 +780,8 @@ | ||
780 | 780 | |
781 | 781 | ulen = skb->len - sizeof(struct udphdr); |
782 | 782 | copied = len; |
783 | ---- linux-2.6.32-754.15.3.el6.orig/net/socket.c | |
784 | -+++ linux-2.6.32-754.15.3.el6/net/socket.c | |
783 | +--- linux-2.6.32-754.17.1.el6.orig/net/socket.c | |
784 | ++++ linux-2.6.32-754.17.1.el6/net/socket.c | |
785 | 785 | @@ -579,6 +579,8 @@ static inline int __sock_sendmsg(struct |
786 | 786 | struct msghdr *msg, size_t size) |
787 | 787 | { |
@@ -842,8 +842,8 @@ | ||
842 | 842 | if (err) |
843 | 843 | goto out_put; |
844 | 844 | |
845 | ---- linux-2.6.32-754.15.3.el6.orig/net/unix/af_unix.c | |
846 | -+++ linux-2.6.32-754.15.3.el6/net/unix/af_unix.c | |
845 | +--- linux-2.6.32-754.17.1.el6.orig/net/unix/af_unix.c | |
846 | ++++ linux-2.6.32-754.17.1.el6/net/unix/af_unix.c | |
847 | 847 | @@ -984,6 +984,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-754.15.3.el6.orig/security/Kconfig | |
869 | -+++ linux-2.6.32-754.15.3.el6/security/Kconfig | |
868 | +--- linux-2.6.32-754.17.1.el6.orig/security/Kconfig | |
869 | ++++ linux-2.6.32-754.17.1.el6/security/Kconfig | |
870 | 870 | @@ -188,5 +188,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-754.15.3.el6.orig/security/Makefile | |
879 | -+++ linux-2.6.32-754.15.3.el6/security/Makefile | |
878 | +--- linux-2.6.32-754.17.1.el6.orig/security/Makefile | |
879 | ++++ linux-2.6.32-754.17.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 | 1 | This is TOMOYO Linux patch for CentOS 7. |
2 | 2 | |
3 | -Source code for this patch is http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-957.21.3.el7.src.rpm | |
3 | +Source code for this patch is http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-957.27.2.el7.src.rpm | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 |
6 | 6 | fs/open.c | 2 |
@@ -28,8 +28,8 @@ | ||
28 | 28 | security/security.c | 111 +++++++++++++++++++++++++++++++++++++++++----- |
29 | 29 | 24 files changed, 248 insertions(+), 37 deletions(-) |
30 | 30 | |
31 | ---- linux-3.10.0-957.21.3.el7.orig/fs/exec.c | |
32 | -+++ linux-3.10.0-957.21.3.el7/fs/exec.c | |
31 | +--- linux-3.10.0-957.27.2.el7.orig/fs/exec.c | |
32 | ++++ linux-3.10.0-957.27.2.el7/fs/exec.c | |
33 | 33 | @@ -1507,7 +1507,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-3.10.0-957.21.3.el7.orig/fs/open.c | |
43 | -+++ linux-3.10.0-957.21.3.el7/fs/open.c | |
42 | +--- linux-3.10.0-957.27.2.el7.orig/fs/open.c | |
43 | ++++ linux-3.10.0-957.27.2.el7/fs/open.c | |
44 | 44 | @@ -1142,6 +1142,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-3.10.0-957.21.3.el7.orig/fs/proc/version.c | |
54 | -+++ linux-3.10.0-957.21.3.el7/fs/proc/version.c | |
53 | +--- linux-3.10.0-957.27.2.el7.orig/fs/proc/version.c | |
54 | ++++ linux-3.10.0-957.27.2.el7/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: 3.10.0-957.21.3.el7 2019/06/19\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 3.10.0-957.27.2.el7 2019/08/04\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +module_init(ccs_show_version); |
66 | ---- linux-3.10.0-957.21.3.el7.orig/include/linux/init_task.h | |
67 | -+++ linux-3.10.0-957.21.3.el7/include/linux/init_task.h | |
66 | +--- linux-3.10.0-957.27.2.el7.orig/include/linux/init_task.h | |
67 | ++++ linux-3.10.0-957.27.2.el7/include/linux/init_task.h | |
68 | 68 | @@ -173,6 +173,14 @@ extern struct task_group root_task_group |
69 | 69 | # define INIT_RT_MUTEXES(tsk) |
70 | 70 | #endif |
@@ -88,8 +88,8 @@ | ||
88 | 88 | } |
89 | 89 | |
90 | 90 | |
91 | ---- linux-3.10.0-957.21.3.el7.orig/include/linux/sched.h | |
92 | -+++ linux-3.10.0-957.21.3.el7/include/linux/sched.h | |
91 | +--- linux-3.10.0-957.27.2.el7.orig/include/linux/sched.h | |
92 | ++++ linux-3.10.0-957.27.2.el7/include/linux/sched.h | |
93 | 93 | @@ -4,6 +4,8 @@ |
94 | 94 | #include <uapi/linux/sched.h> |
95 | 95 | #include <linux/rh_kabi.h> |
@@ -110,8 +110,8 @@ | ||
110 | 110 | }; |
111 | 111 | |
112 | 112 | /* Future-safe accessor for struct task_struct's cpus_allowed. */ |
113 | ---- linux-3.10.0-957.21.3.el7.orig/include/linux/security.h | |
114 | -+++ linux-3.10.0-957.21.3.el7/include/linux/security.h | |
113 | +--- linux-3.10.0-957.27.2.el7.orig/include/linux/security.h | |
114 | ++++ linux-3.10.0-957.27.2.el7/include/linux/security.h | |
115 | 115 | @@ -56,6 +56,7 @@ struct msg_queue; |
116 | 116 | struct xattr; |
117 | 117 | struct xfrm_sec_ctx; |
@@ -323,8 +323,8 @@ | ||
323 | 323 | } |
324 | 324 | #endif /* CONFIG_SECURITY_PATH */ |
325 | 325 | |
326 | ---- linux-3.10.0-957.21.3.el7.orig/include/net/ip.h | |
327 | -+++ linux-3.10.0-957.21.3.el7/include/net/ip.h | |
326 | +--- linux-3.10.0-957.27.2.el7.orig/include/net/ip.h | |
327 | ++++ linux-3.10.0-957.27.2.el7/include/net/ip.h | |
328 | 328 | @@ -232,6 +232,8 @@ void inet_get_local_port_range(struct ne |
329 | 329 | extern unsigned long *sysctl_local_reserved_ports; |
330 | 330 | static inline int inet_is_reserved_local_port(int port) |
@@ -334,8 +334,8 @@ | ||
334 | 334 | return test_bit(port, sysctl_local_reserved_ports); |
335 | 335 | } |
336 | 336 | |
337 | ---- linux-3.10.0-957.21.3.el7.orig/kernel/fork.c | |
338 | -+++ linux-3.10.0-957.21.3.el7/kernel/fork.c | |
337 | +--- linux-3.10.0-957.27.2.el7.orig/kernel/fork.c | |
338 | ++++ linux-3.10.0-957.27.2.el7/kernel/fork.c | |
339 | 339 | @@ -278,6 +278,7 @@ void __put_task_struct(struct task_struc |
340 | 340 | delayacct_tsk_free(tsk); |
341 | 341 | put_signal_struct(tsk->signal); |
@@ -362,8 +362,8 @@ | ||
362 | 362 | bad_fork_cleanup_perf: |
363 | 363 | perf_event_free_task(p); |
364 | 364 | bad_fork_cleanup_policy: |
365 | ---- linux-3.10.0-957.21.3.el7.orig/kernel/kexec.c | |
366 | -+++ linux-3.10.0-957.21.3.el7/kernel/kexec.c | |
365 | +--- linux-3.10.0-957.27.2.el7.orig/kernel/kexec.c | |
366 | ++++ linux-3.10.0-957.27.2.el7/kernel/kexec.c | |
367 | 367 | @@ -190,6 +190,8 @@ SYSCALL_DEFINE4(kexec_load, unsigned lon |
368 | 368 | /* We only trust the superuser with rebooting the system. */ |
369 | 369 | if (!capable(CAP_SYS_BOOT) || kexec_load_disabled) |
@@ -373,8 +373,8 @@ | ||
373 | 373 | |
374 | 374 | if (get_securelevel() > 0) |
375 | 375 | return -EPERM; |
376 | ---- linux-3.10.0-957.21.3.el7.orig/kernel/module.c | |
377 | -+++ linux-3.10.0-957.21.3.el7/kernel/module.c | |
376 | +--- linux-3.10.0-957.27.2.el7.orig/kernel/module.c | |
377 | ++++ linux-3.10.0-957.27.2.el7/kernel/module.c | |
378 | 378 | @@ -66,6 +66,7 @@ |
379 | 379 | #endif /* __GENKSYMS__ */ |
380 | 380 | #include <uapi/linux/module.h> |
@@ -401,8 +401,8 @@ | ||
401 | 401 | |
402 | 402 | return 0; |
403 | 403 | } |
404 | ---- linux-3.10.0-957.21.3.el7.orig/kernel/ptrace.c | |
405 | -+++ linux-3.10.0-957.21.3.el7/kernel/ptrace.c | |
404 | +--- linux-3.10.0-957.27.2.el7.orig/kernel/ptrace.c | |
405 | ++++ linux-3.10.0-957.27.2.el7/kernel/ptrace.c | |
406 | 406 | @@ -1082,6 +1082,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l |
407 | 407 | { |
408 | 408 | struct task_struct *child; |
@@ -427,8 +427,8 @@ | ||
427 | 427 | |
428 | 428 | if (request == PTRACE_TRACEME) { |
429 | 429 | ret = ptrace_traceme(); |
430 | ---- linux-3.10.0-957.21.3.el7.orig/kernel/sched/core.c | |
431 | -+++ linux-3.10.0-957.21.3.el7/kernel/sched/core.c | |
430 | +--- linux-3.10.0-957.27.2.el7.orig/kernel/sched/core.c | |
431 | ++++ linux-3.10.0-957.27.2.el7/kernel/sched/core.c | |
432 | 432 | @@ -4355,6 +4355,8 @@ int can_nice(const struct task_struct *p |
433 | 433 | SYSCALL_DEFINE1(nice, int, increment) |
434 | 434 | { |
@@ -438,8 +438,8 @@ | ||
438 | 438 | |
439 | 439 | /* |
440 | 440 | * Setpriority might change our priority at the same moment. |
441 | ---- linux-3.10.0-957.21.3.el7.orig/kernel/signal.c | |
442 | -+++ linux-3.10.0-957.21.3.el7/kernel/signal.c | |
441 | +--- linux-3.10.0-957.27.2.el7.orig/kernel/signal.c | |
442 | ++++ linux-3.10.0-957.27.2.el7/kernel/signal.c | |
443 | 443 | @@ -2942,6 +2942,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s |
444 | 444 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
445 | 445 | { |
@@ -485,8 +485,8 @@ | ||
485 | 485 | |
486 | 486 | return do_send_specific(tgid, pid, sig, info); |
487 | 487 | } |
488 | ---- linux-3.10.0-957.21.3.el7.orig/kernel/sys.c | |
489 | -+++ linux-3.10.0-957.21.3.el7/kernel/sys.c | |
488 | +--- linux-3.10.0-957.27.2.el7.orig/kernel/sys.c | |
489 | ++++ linux-3.10.0-957.27.2.el7/kernel/sys.c | |
490 | 490 | @@ -197,6 +197,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
491 | 491 | |
492 | 492 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -525,8 +525,8 @@ | ||
525 | 525 | |
526 | 526 | down_write(&uts_sem); |
527 | 527 | errno = -EFAULT; |
528 | ---- linux-3.10.0-957.21.3.el7.orig/kernel/time/ntp.c | |
529 | -+++ linux-3.10.0-957.21.3.el7/kernel/time/ntp.c | |
528 | +--- linux-3.10.0-957.27.2.el7.orig/kernel/time/ntp.c | |
529 | ++++ linux-3.10.0-957.27.2.el7/kernel/time/ntp.c | |
530 | 530 | @@ -16,6 +16,7 @@ |
531 | 531 | #include <linux/mm.h> |
532 | 532 | #include <linux/module.h> |
@@ -560,8 +560,8 @@ | ||
560 | 560 | |
561 | 561 | return 0; |
562 | 562 | } |
563 | ---- linux-3.10.0-957.21.3.el7.orig/net/ipv4/raw.c | |
564 | -+++ linux-3.10.0-957.21.3.el7/net/ipv4/raw.c | |
563 | +--- linux-3.10.0-957.27.2.el7.orig/net/ipv4/raw.c | |
564 | ++++ linux-3.10.0-957.27.2.el7/net/ipv4/raw.c | |
565 | 565 | @@ -706,6 +706,10 @@ static int raw_recvmsg(struct kiocb *ioc |
566 | 566 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
567 | 567 | if (!skb) |
@@ -573,8 +573,8 @@ | ||
573 | 573 | |
574 | 574 | copied = skb->len; |
575 | 575 | if (len < copied) { |
576 | ---- linux-3.10.0-957.21.3.el7.orig/net/ipv4/udp.c | |
577 | -+++ linux-3.10.0-957.21.3.el7/net/ipv4/udp.c | |
576 | +--- linux-3.10.0-957.27.2.el7.orig/net/ipv4/udp.c | |
577 | ++++ linux-3.10.0-957.27.2.el7/net/ipv4/udp.c | |
578 | 578 | @@ -1393,6 +1393,10 @@ try_again: |
579 | 579 | skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err); |
580 | 580 | if (!skb) |
@@ -586,8 +586,8 @@ | ||
586 | 586 | |
587 | 587 | ulen = skb->len - sizeof(struct udphdr); |
588 | 588 | copied = len; |
589 | ---- linux-3.10.0-957.21.3.el7.orig/net/ipv6/raw.c | |
590 | -+++ linux-3.10.0-957.21.3.el7/net/ipv6/raw.c | |
589 | +--- linux-3.10.0-957.27.2.el7.orig/net/ipv6/raw.c | |
590 | ++++ linux-3.10.0-957.27.2.el7/net/ipv6/raw.c | |
591 | 591 | @@ -468,6 +468,10 @@ static int rawv6_recvmsg(struct kiocb *i |
592 | 592 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
593 | 593 | if (!skb) |
@@ -599,8 +599,8 @@ | ||
599 | 599 | |
600 | 600 | copied = skb->len; |
601 | 601 | if (copied > len) { |
602 | ---- linux-3.10.0-957.21.3.el7.orig/net/ipv6/udp.c | |
603 | -+++ linux-3.10.0-957.21.3.el7/net/ipv6/udp.c | |
602 | +--- linux-3.10.0-957.27.2.el7.orig/net/ipv6/udp.c | |
603 | ++++ linux-3.10.0-957.27.2.el7/net/ipv6/udp.c | |
604 | 604 | @@ -384,6 +384,10 @@ try_again: |
605 | 605 | skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err); |
606 | 606 | if (!skb) |
@@ -612,8 +612,8 @@ | ||
612 | 612 | |
613 | 613 | ulen = skb->len - sizeof(struct udphdr); |
614 | 614 | copied = len; |
615 | ---- linux-3.10.0-957.21.3.el7.orig/net/socket.c | |
616 | -+++ linux-3.10.0-957.21.3.el7/net/socket.c | |
615 | +--- linux-3.10.0-957.27.2.el7.orig/net/socket.c | |
616 | ++++ linux-3.10.0-957.27.2.el7/net/socket.c | |
617 | 617 | @@ -1660,6 +1660,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct |
618 | 618 | if (err < 0) |
619 | 619 | goto out_fd; |
@@ -625,8 +625,8 @@ | ||
625 | 625 | if (upeer_sockaddr) { |
626 | 626 | if (newsock->ops->getname(newsock, (struct sockaddr *)&address, |
627 | 627 | &len, 2) < 0) { |
628 | ---- linux-3.10.0-957.21.3.el7.orig/net/unix/af_unix.c | |
629 | -+++ linux-3.10.0-957.21.3.el7/net/unix/af_unix.c | |
628 | +--- linux-3.10.0-957.27.2.el7.orig/net/unix/af_unix.c | |
629 | ++++ linux-3.10.0-957.27.2.el7/net/unix/af_unix.c | |
630 | 630 | @@ -2137,6 +2137,10 @@ static int unix_dgram_recvmsg(struct kio |
631 | 631 | wake_up_interruptible_sync_poll(&u->peer_wait, |
632 | 632 | POLLOUT | POLLWRNORM | POLLWRBAND); |
@@ -638,8 +638,8 @@ | ||
638 | 638 | if (msg->msg_name) |
639 | 639 | unix_copy_addr(msg, skb->sk); |
640 | 640 | |
641 | ---- linux-3.10.0-957.21.3.el7.orig/security/Kconfig | |
642 | -+++ linux-3.10.0-957.21.3.el7/security/Kconfig | |
641 | +--- linux-3.10.0-957.27.2.el7.orig/security/Kconfig | |
642 | ++++ linux-3.10.0-957.27.2.el7/security/Kconfig | |
643 | 643 | @@ -226,5 +226,7 @@ config DEFAULT_SECURITY |
644 | 644 | default "yama" if DEFAULT_SECURITY_YAMA |
645 | 645 | default "" if DEFAULT_SECURITY_DAC |
@@ -648,8 +648,8 @@ | ||
648 | 648 | + |
649 | 649 | endmenu |
650 | 650 | |
651 | ---- linux-3.10.0-957.21.3.el7.orig/security/Makefile | |
652 | -+++ linux-3.10.0-957.21.3.el7/security/Makefile | |
651 | +--- linux-3.10.0-957.27.2.el7.orig/security/Makefile | |
652 | ++++ linux-3.10.0-957.27.2.el7/security/Makefile | |
653 | 653 | @@ -29,3 +29,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c |
654 | 654 | # Object integrity file lists |
655 | 655 | subdir-$(CONFIG_INTEGRITY) += integrity |
@@ -657,8 +657,8 @@ | ||
657 | 657 | + |
658 | 658 | +subdir-$(CONFIG_CCSECURITY) += ccsecurity |
659 | 659 | +obj-$(CONFIG_CCSECURITY) += ccsecurity/built-in.o |
660 | ---- linux-3.10.0-957.21.3.el7.orig/security/security.c | |
661 | -+++ linux-3.10.0-957.21.3.el7/security/security.c | |
660 | +--- linux-3.10.0-957.27.2.el7.orig/security/security.c | |
661 | ++++ linux-3.10.0-957.27.2.el7/security/security.c | |
662 | 662 | @@ -229,7 +229,10 @@ int security_syslog(int type) |
663 | 663 | |
664 | 664 | int security_settime(const struct timespec *ts, const struct timezone *tz) |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 4.14.134. | |
1 | +This is TOMOYO Linux patch for kernel 4.14.136. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.134.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.136.tar.xz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 - |
6 | 6 | fs/open.c | 2 + |
@@ -28,8 +28,8 @@ | ||
28 | 28 | security/security.c | 9 +++++- |
29 | 29 | 24 files changed, 153 insertions(+), 29 deletions(-) |
30 | 30 | |
31 | ---- linux-4.14.134.orig/fs/exec.c | |
32 | -+++ linux-4.14.134/fs/exec.c | |
31 | +--- linux-4.14.136.orig/fs/exec.c | |
32 | ++++ linux-4.14.136/fs/exec.c | |
33 | 33 | @@ -1677,7 +1677,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,9 +39,9 @@ | ||
39 | 39 | if (ret >= 0) { |
40 | 40 | audit_bprm(bprm); |
41 | 41 | trace_sched_process_exec(current, old_pid, bprm); |
42 | ---- linux-4.14.134.orig/fs/open.c | |
43 | -+++ linux-4.14.134/fs/open.c | |
44 | -@@ -1177,6 +1177,8 @@ EXPORT_SYMBOL(sys_close); | |
42 | +--- linux-4.14.136.orig/fs/open.c | |
43 | ++++ linux-4.14.136/fs/open.c | |
44 | +@@ -1196,6 +1196,8 @@ EXPORT_SYMBOL(sys_close); | |
45 | 45 | */ |
46 | 46 | SYSCALL_DEFINE0(vhangup) |
47 | 47 | { |
@@ -50,8 +50,8 @@ | ||
50 | 50 | if (capable(CAP_SYS_TTY_CONFIG)) { |
51 | 51 | tty_vhangup_self(); |
52 | 52 | return 0; |
53 | ---- linux-4.14.134.orig/fs/proc/version.c | |
54 | -+++ linux-4.14.134/fs/proc/version.c | |
53 | +--- linux-4.14.136.orig/fs/proc/version.c | |
54 | ++++ linux-4.14.136/fs/proc/version.c | |
55 | 55 | @@ -33,3 +33,10 @@ static int __init proc_version_init(void |
56 | 56 | return 0; |
57 | 57 | } |
@@ -59,12 +59,12 @@ | ||
59 | 59 | + |
60 | 60 | +static int __init ccs_show_version(void) |
61 | 61 | +{ |
62 | -+ printk(KERN_INFO "Hook version: 4.14.134 2019/07/22\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.14.136 2019/08/06\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-4.14.134.orig/include/linux/init_task.h | |
67 | -+++ linux-4.14.134/include/linux/init_task.h | |
66 | +--- linux-4.14.136.orig/include/linux/init_task.h | |
67 | ++++ linux-4.14.136/include/linux/init_task.h | |
68 | 68 | @@ -219,6 +219,14 @@ extern struct cred init_cred; |
69 | 69 | #define INIT_TASK_SECURITY |
70 | 70 | #endif |
@@ -88,8 +88,8 @@ | ||
88 | 88 | } |
89 | 89 | |
90 | 90 | |
91 | ---- linux-4.14.134.orig/include/linux/sched.h | |
92 | -+++ linux-4.14.134/include/linux/sched.h | |
91 | +--- linux-4.14.136.orig/include/linux/sched.h | |
92 | ++++ linux-4.14.136/include/linux/sched.h | |
93 | 93 | @@ -33,6 +33,7 @@ struct audit_context; |
94 | 94 | struct backing_dev_info; |
95 | 95 | struct bio_list; |
@@ -109,8 +109,8 @@ | ||
109 | 109 | |
110 | 110 | /* |
111 | 111 | * New fields for task_struct should be added above here, so that |
112 | ---- linux-4.14.134.orig/include/linux/security.h | |
113 | -+++ linux-4.14.134/include/linux/security.h | |
112 | +--- linux-4.14.136.orig/include/linux/security.h | |
113 | ++++ linux-4.14.136/include/linux/security.h | |
114 | 114 | @@ -56,6 +56,7 @@ struct msg_queue; |
115 | 115 | struct xattr; |
116 | 116 | struct xfrm_sec_ctx; |
@@ -331,8 +331,8 @@ | ||
331 | 331 | } |
332 | 332 | #endif /* CONFIG_SECURITY_PATH */ |
333 | 333 | |
334 | ---- linux-4.14.134.orig/include/net/ip.h | |
335 | -+++ linux-4.14.134/include/net/ip.h | |
334 | +--- linux-4.14.136.orig/include/net/ip.h | |
335 | ++++ linux-4.14.136/include/net/ip.h | |
336 | 336 | @@ -266,6 +266,8 @@ void inet_get_local_port_range(struct ne |
337 | 337 | #ifdef CONFIG_SYSCTL |
338 | 338 | static inline int inet_is_local_reserved_port(struct net *net, int port) |
@@ -351,8 +351,8 @@ | ||
351 | 351 | return 0; |
352 | 352 | } |
353 | 353 | |
354 | ---- linux-4.14.134.orig/kernel/kexec.c | |
355 | -+++ linux-4.14.134/kernel/kexec.c | |
354 | +--- linux-4.14.136.orig/kernel/kexec.c | |
355 | ++++ linux-4.14.136/kernel/kexec.c | |
356 | 356 | @@ -17,7 +17,7 @@ |
357 | 357 | #include <linux/syscalls.h> |
358 | 358 | #include <linux/vmalloc.h> |
@@ -371,8 +371,8 @@ | ||
371 | 371 | |
372 | 372 | /* |
373 | 373 | * Verify we have a legal set of flags |
374 | ---- linux-4.14.134.orig/kernel/module.c | |
375 | -+++ linux-4.14.134/kernel/module.c | |
374 | +--- linux-4.14.136.orig/kernel/module.c | |
375 | ++++ linux-4.14.136/kernel/module.c | |
376 | 376 | @@ -66,6 +66,7 @@ |
377 | 377 | #include <linux/audit.h> |
378 | 378 | #include <uapi/linux/module.h> |
@@ -399,8 +399,8 @@ | ||
399 | 399 | |
400 | 400 | return 0; |
401 | 401 | } |
402 | ---- linux-4.14.134.orig/kernel/ptrace.c | |
403 | -+++ linux-4.14.134/kernel/ptrace.c | |
402 | +--- linux-4.14.136.orig/kernel/ptrace.c | |
403 | ++++ linux-4.14.136/kernel/ptrace.c | |
404 | 404 | @@ -1148,6 +1148,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l |
405 | 405 | { |
406 | 406 | struct task_struct *child; |
@@ -425,8 +425,8 @@ | ||
425 | 425 | |
426 | 426 | if (request == PTRACE_TRACEME) { |
427 | 427 | ret = ptrace_traceme(); |
428 | ---- linux-4.14.134.orig/kernel/reboot.c | |
429 | -+++ linux-4.14.134/kernel/reboot.c | |
428 | +--- linux-4.14.136.orig/kernel/reboot.c | |
429 | ++++ linux-4.14.136/kernel/reboot.c | |
430 | 430 | @@ -16,6 +16,7 @@ |
431 | 431 | #include <linux/syscalls.h> |
432 | 432 | #include <linux/syscore_ops.h> |
@@ -444,8 +444,8 @@ | ||
444 | 444 | |
445 | 445 | /* |
446 | 446 | * If pid namespaces are enabled and the current task is in a child |
447 | ---- linux-4.14.134.orig/kernel/sched/core.c | |
448 | -+++ linux-4.14.134/kernel/sched/core.c | |
447 | +--- linux-4.14.136.orig/kernel/sched/core.c | |
448 | ++++ linux-4.14.136/kernel/sched/core.c | |
449 | 449 | @@ -3854,6 +3854,8 @@ int can_nice(const struct task_struct *p |
450 | 450 | SYSCALL_DEFINE1(nice, int, increment) |
451 | 451 | { |
@@ -455,8 +455,8 @@ | ||
455 | 455 | |
456 | 456 | /* |
457 | 457 | * Setpriority might change our priority at the same moment. |
458 | ---- linux-4.14.134.orig/kernel/signal.c | |
459 | -+++ linux-4.14.134/kernel/signal.c | |
458 | +--- linux-4.14.136.orig/kernel/signal.c | |
459 | ++++ linux-4.14.136/kernel/signal.c | |
460 | 460 | @@ -3028,6 +3028,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait, |
461 | 461 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
462 | 462 | { |
@@ -502,8 +502,8 @@ | ||
502 | 502 | |
503 | 503 | return do_send_specific(tgid, pid, sig, info); |
504 | 504 | } |
505 | ---- linux-4.14.134.orig/kernel/sys.c | |
506 | -+++ linux-4.14.134/kernel/sys.c | |
505 | +--- linux-4.14.136.orig/kernel/sys.c | |
506 | ++++ linux-4.14.136/kernel/sys.c | |
507 | 507 | @@ -193,6 +193,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
508 | 508 | |
509 | 509 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -533,8 +533,8 @@ | ||
533 | 533 | |
534 | 534 | errno = -EFAULT; |
535 | 535 | if (!copy_from_user(tmp, name, len)) { |
536 | ---- linux-4.14.134.orig/kernel/time/ntp.c | |
537 | -+++ linux-4.14.134/kernel/time/ntp.c | |
536 | +--- linux-4.14.136.orig/kernel/time/ntp.c | |
537 | ++++ linux-4.14.136/kernel/time/ntp.c | |
538 | 538 | @@ -18,6 +18,7 @@ |
539 | 539 | #include <linux/module.h> |
540 | 540 | #include <linux/rtc.h> |
@@ -543,7 +543,7 @@ | ||
543 | 543 | |
544 | 544 | #include "ntp_internal.h" |
545 | 545 | #include "timekeeping_internal.h" |
546 | -@@ -667,10 +668,15 @@ int ntp_validate_timex(struct timex *txc | |
546 | +@@ -669,10 +670,15 @@ int ntp_validate_timex(struct timex *txc | |
547 | 547 | if (!(txc->modes & ADJ_OFFSET_READONLY) && |
548 | 548 | !capable(CAP_SYS_TIME)) |
549 | 549 | return -EPERM; |
@@ -559,7 +559,7 @@ | ||
559 | 559 | /* |
560 | 560 | * if the quartz is off by more than 10% then |
561 | 561 | * something is VERY wrong! |
562 | -@@ -685,6 +691,8 @@ int ntp_validate_timex(struct timex *txc | |
562 | +@@ -687,6 +693,8 @@ int ntp_validate_timex(struct timex *txc | |
563 | 563 | /* In order to inject time, you gotta be super-user! */ |
564 | 564 | if (!capable(CAP_SYS_TIME)) |
565 | 565 | return -EPERM; |
@@ -568,8 +568,8 @@ | ||
568 | 568 | |
569 | 569 | if (txc->modes & ADJ_NANO) { |
570 | 570 | struct timespec ts; |
571 | ---- linux-4.14.134.orig/net/ipv4/raw.c | |
572 | -+++ linux-4.14.134/net/ipv4/raw.c | |
571 | +--- linux-4.14.136.orig/net/ipv4/raw.c | |
572 | ++++ linux-4.14.136/net/ipv4/raw.c | |
573 | 573 | @@ -766,6 +766,10 @@ static int raw_recvmsg(struct sock *sk, |
574 | 574 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
575 | 575 | if (!skb) |
@@ -581,8 +581,8 @@ | ||
581 | 581 | |
582 | 582 | copied = skb->len; |
583 | 583 | if (len < copied) { |
584 | ---- linux-4.14.134.orig/net/ipv4/udp.c | |
585 | -+++ linux-4.14.134/net/ipv4/udp.c | |
584 | +--- linux-4.14.136.orig/net/ipv4/udp.c | |
585 | ++++ linux-4.14.136/net/ipv4/udp.c | |
586 | 586 | @@ -1597,6 +1597,8 @@ try_again: |
587 | 587 | skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err); |
588 | 588 | if (!skb) |
@@ -592,8 +592,8 @@ | ||
592 | 592 | |
593 | 593 | ulen = udp_skb_len(skb); |
594 | 594 | copied = len; |
595 | ---- linux-4.14.134.orig/net/ipv6/raw.c | |
596 | -+++ linux-4.14.134/net/ipv6/raw.c | |
595 | +--- linux-4.14.136.orig/net/ipv6/raw.c | |
596 | ++++ linux-4.14.136/net/ipv6/raw.c | |
597 | 597 | @@ -485,6 +485,10 @@ static int rawv6_recvmsg(struct sock *sk |
598 | 598 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
599 | 599 | if (!skb) |
@@ -605,8 +605,8 @@ | ||
605 | 605 | |
606 | 606 | copied = skb->len; |
607 | 607 | if (copied > len) { |
608 | ---- linux-4.14.134.orig/net/ipv6/udp.c | |
609 | -+++ linux-4.14.134/net/ipv6/udp.c | |
608 | +--- linux-4.14.136.orig/net/ipv6/udp.c | |
609 | ++++ linux-4.14.136/net/ipv6/udp.c | |
610 | 610 | @@ -371,6 +371,8 @@ try_again: |
611 | 611 | skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err); |
612 | 612 | if (!skb) |
@@ -616,8 +616,8 @@ | ||
616 | 616 | |
617 | 617 | ulen = udp6_skb_len(skb); |
618 | 618 | copied = len; |
619 | ---- linux-4.14.134.orig/net/socket.c | |
620 | -+++ linux-4.14.134/net/socket.c | |
619 | +--- linux-4.14.136.orig/net/socket.c | |
620 | ++++ linux-4.14.136/net/socket.c | |
621 | 621 | @@ -1588,6 +1588,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct |
622 | 622 | if (err < 0) |
623 | 623 | goto out_fd; |
@@ -629,8 +629,8 @@ | ||
629 | 629 | if (upeer_sockaddr) { |
630 | 630 | if (newsock->ops->getname(newsock, (struct sockaddr *)&address, |
631 | 631 | &len, 2) < 0) { |
632 | ---- linux-4.14.134.orig/net/unix/af_unix.c | |
633 | -+++ linux-4.14.134/net/unix/af_unix.c | |
632 | +--- linux-4.14.136.orig/net/unix/af_unix.c | |
633 | ++++ linux-4.14.136/net/unix/af_unix.c | |
634 | 634 | @@ -2141,6 +2141,10 @@ static int unix_dgram_recvmsg(struct soc |
635 | 635 | POLLOUT | POLLWRNORM | |
636 | 636 | POLLWRBAND); |
@@ -650,8 +650,8 @@ | ||
650 | 650 | mutex_unlock(&u->iolock); |
651 | 651 | out: |
652 | 652 | return err; |
653 | ---- linux-4.14.134.orig/security/Kconfig | |
654 | -+++ linux-4.14.134/security/Kconfig | |
653 | +--- linux-4.14.136.orig/security/Kconfig | |
654 | ++++ linux-4.14.136/security/Kconfig | |
655 | 655 | @@ -263,5 +263,7 @@ config DEFAULT_SECURITY |
656 | 656 | default "apparmor" if DEFAULT_SECURITY_APPARMOR |
657 | 657 | default "" if DEFAULT_SECURITY_DAC |
@@ -660,8 +660,8 @@ | ||
660 | 660 | + |
661 | 661 | endmenu |
662 | 662 | |
663 | ---- linux-4.14.134.orig/security/Makefile | |
664 | -+++ linux-4.14.134/security/Makefile | |
663 | +--- linux-4.14.136.orig/security/Makefile | |
664 | ++++ linux-4.14.136/security/Makefile | |
665 | 665 | @@ -30,3 +30,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c |
666 | 666 | # Object integrity file lists |
667 | 667 | subdir-$(CONFIG_INTEGRITY) += integrity |
@@ -669,8 +669,8 @@ | ||
669 | 669 | + |
670 | 670 | +subdir-$(CONFIG_CCSECURITY) += ccsecurity |
671 | 671 | +obj-$(CONFIG_CCSECURITY) += ccsecurity/ |
672 | ---- linux-4.14.134.orig/security/security.c | |
673 | -+++ linux-4.14.134/security/security.c | |
672 | +--- linux-4.14.136.orig/security/security.c | |
673 | ++++ linux-4.14.136/security/security.c | |
674 | 674 | @@ -978,12 +978,19 @@ int security_file_open(struct file *file |
675 | 675 | |
676 | 676 | int security_task_alloc(struct task_struct *task, unsigned long clone_flags) |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 4.19.61. | |
1 | +This is TOMOYO Linux patch for kernel 4.19.64. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.61.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.64.tar.xz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 - |
6 | 6 | fs/open.c | 2 + |
@@ -28,8 +28,8 @@ | ||
28 | 28 | security/security.c | 9 +++++- |
29 | 29 | 24 files changed, 148 insertions(+), 29 deletions(-) |
30 | 30 | |
31 | ---- linux-4.19.61.orig/fs/exec.c | |
32 | -+++ linux-4.19.61/fs/exec.c | |
31 | +--- linux-4.19.64.orig/fs/exec.c | |
32 | ++++ linux-4.19.64/fs/exec.c | |
33 | 33 | @@ -1692,7 +1692,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,9 +39,9 @@ | ||
39 | 39 | if (ret >= 0) { |
40 | 40 | audit_bprm(bprm); |
41 | 41 | trace_sched_process_exec(current, old_pid, bprm); |
42 | ---- linux-4.19.61.orig/fs/open.c | |
43 | -+++ linux-4.19.61/fs/open.c | |
44 | -@@ -1180,6 +1180,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd) | |
42 | +--- linux-4.19.64.orig/fs/open.c | |
43 | ++++ linux-4.19.64/fs/open.c | |
44 | +@@ -1199,6 +1199,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd) | |
45 | 45 | */ |
46 | 46 | SYSCALL_DEFINE0(vhangup) |
47 | 47 | { |
@@ -50,8 +50,8 @@ | ||
50 | 50 | if (capable(CAP_SYS_TTY_CONFIG)) { |
51 | 51 | tty_vhangup_self(); |
52 | 52 | return 0; |
53 | ---- linux-4.19.61.orig/fs/proc/version.c | |
54 | -+++ linux-4.19.61/fs/proc/version.c | |
53 | +--- linux-4.19.64.orig/fs/proc/version.c | |
54 | ++++ linux-4.19.64/fs/proc/version.c | |
55 | 55 | @@ -21,3 +21,10 @@ static int __init proc_version_init(void |
56 | 56 | return 0; |
57 | 57 | } |
@@ -59,12 +59,12 @@ | ||
59 | 59 | + |
60 | 60 | +static int __init ccs_show_version(void) |
61 | 61 | +{ |
62 | -+ printk(KERN_INFO "Hook version: 4.19.61 2019/07/27\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.19.64 2019/08/06\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-4.19.61.orig/include/linux/sched.h | |
67 | -+++ linux-4.19.61/include/linux/sched.h | |
66 | +--- linux-4.19.64.orig/include/linux/sched.h | |
67 | ++++ linux-4.19.64/include/linux/sched.h | |
68 | 68 | @@ -34,6 +34,7 @@ struct audit_context; |
69 | 69 | struct backing_dev_info; |
70 | 70 | struct bio_list; |
@@ -73,7 +73,7 @@ | ||
73 | 73 | struct cfs_rq; |
74 | 74 | struct fs_struct; |
75 | 75 | struct futex_pi_state; |
76 | -@@ -1192,6 +1193,10 @@ struct task_struct { | |
76 | +@@ -1200,6 +1201,10 @@ struct task_struct { | |
77 | 77 | /* Used by LSM modules for access restriction: */ |
78 | 78 | void *security; |
79 | 79 | #endif |
@@ -84,8 +84,8 @@ | ||
84 | 84 | |
85 | 85 | /* |
86 | 86 | * New fields for task_struct should be added above here, so that |
87 | ---- linux-4.19.61.orig/include/linux/security.h | |
88 | -+++ linux-4.19.61/include/linux/security.h | |
87 | +--- linux-4.19.64.orig/include/linux/security.h | |
88 | ++++ linux-4.19.64/include/linux/security.h | |
89 | 89 | @@ -53,6 +53,7 @@ struct msg_msg; |
90 | 90 | struct xattr; |
91 | 91 | struct xfrm_sec_ctx; |
@@ -306,8 +306,8 @@ | ||
306 | 306 | } |
307 | 307 | #endif /* CONFIG_SECURITY_PATH */ |
308 | 308 | |
309 | ---- linux-4.19.61.orig/include/net/ip.h | |
310 | -+++ linux-4.19.61/include/net/ip.h | |
309 | +--- linux-4.19.64.orig/include/net/ip.h | |
310 | ++++ linux-4.19.64/include/net/ip.h | |
311 | 311 | @@ -301,6 +301,8 @@ void inet_get_local_port_range(struct ne |
312 | 312 | #ifdef CONFIG_SYSCTL |
313 | 313 | static inline int inet_is_local_reserved_port(struct net *net, int port) |
@@ -326,8 +326,8 @@ | ||
326 | 326 | return 0; |
327 | 327 | } |
328 | 328 | |
329 | ---- linux-4.19.61.orig/init/init_task.c | |
330 | -+++ linux-4.19.61/init/init_task.c | |
329 | +--- linux-4.19.64.orig/init/init_task.c | |
330 | ++++ linux-4.19.64/init/init_task.c | |
331 | 331 | @@ -179,6 +179,10 @@ struct task_struct init_task |
332 | 332 | #ifdef CONFIG_SECURITY |
333 | 333 | .security = NULL, |
@@ -339,8 +339,8 @@ | ||
339 | 339 | }; |
340 | 340 | EXPORT_SYMBOL(init_task); |
341 | 341 | |
342 | ---- linux-4.19.61.orig/kernel/kexec.c | |
343 | -+++ linux-4.19.61/kernel/kexec.c | |
342 | +--- linux-4.19.64.orig/kernel/kexec.c | |
343 | ++++ linux-4.19.64/kernel/kexec.c | |
344 | 344 | @@ -18,7 +18,7 @@ |
345 | 345 | #include <linux/syscalls.h> |
346 | 346 | #include <linux/vmalloc.h> |
@@ -359,8 +359,8 @@ | ||
359 | 359 | |
360 | 360 | /* Permit LSMs and IMA to fail the kexec */ |
361 | 361 | result = security_kernel_load_data(LOADING_KEXEC_IMAGE); |
362 | ---- linux-4.19.61.orig/kernel/module.c | |
363 | -+++ linux-4.19.61/kernel/module.c | |
362 | +--- linux-4.19.64.orig/kernel/module.c | |
363 | ++++ linux-4.19.64/kernel/module.c | |
364 | 364 | @@ -66,6 +66,7 @@ |
365 | 365 | #include <linux/audit.h> |
366 | 366 | #include <uapi/linux/module.h> |
@@ -387,8 +387,8 @@ | ||
387 | 387 | |
388 | 388 | return 0; |
389 | 389 | } |
390 | ---- linux-4.19.61.orig/kernel/ptrace.c | |
391 | -+++ linux-4.19.61/kernel/ptrace.c | |
390 | +--- linux-4.19.64.orig/kernel/ptrace.c | |
391 | ++++ linux-4.19.64/kernel/ptrace.c | |
392 | 392 | @@ -1137,6 +1137,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l |
393 | 393 | { |
394 | 394 | struct task_struct *child; |
@@ -413,8 +413,8 @@ | ||
413 | 413 | |
414 | 414 | if (request == PTRACE_TRACEME) { |
415 | 415 | ret = ptrace_traceme(); |
416 | ---- linux-4.19.61.orig/kernel/reboot.c | |
417 | -+++ linux-4.19.61/kernel/reboot.c | |
416 | +--- linux-4.19.64.orig/kernel/reboot.c | |
417 | ++++ linux-4.19.64/kernel/reboot.c | |
418 | 418 | @@ -16,6 +16,7 @@ |
419 | 419 | #include <linux/syscalls.h> |
420 | 420 | #include <linux/syscore_ops.h> |
@@ -432,8 +432,8 @@ | ||
432 | 432 | |
433 | 433 | /* |
434 | 434 | * If pid namespaces are enabled and the current task is in a child |
435 | ---- linux-4.19.61.orig/kernel/sched/core.c | |
436 | -+++ linux-4.19.61/kernel/sched/core.c | |
435 | +--- linux-4.19.64.orig/kernel/sched/core.c | |
436 | ++++ linux-4.19.64/kernel/sched/core.c | |
437 | 437 | @@ -3945,6 +3945,8 @@ int can_nice(const struct task_struct *p |
438 | 438 | SYSCALL_DEFINE1(nice, int, increment) |
439 | 439 | { |
@@ -443,8 +443,8 @@ | ||
443 | 443 | |
444 | 444 | /* |
445 | 445 | * Setpriority might change our priority at the same moment. |
446 | ---- linux-4.19.61.orig/kernel/signal.c | |
447 | -+++ linux-4.19.61/kernel/signal.c | |
446 | +--- linux-4.19.64.orig/kernel/signal.c | |
447 | ++++ linux-4.19.64/kernel/signal.c | |
448 | 448 | @@ -3271,6 +3271,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait, |
449 | 449 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
450 | 450 | { |
@@ -490,8 +490,8 @@ | ||
490 | 490 | |
491 | 491 | return do_send_specific(tgid, pid, sig, info); |
492 | 492 | } |
493 | ---- linux-4.19.61.orig/kernel/sys.c | |
494 | -+++ linux-4.19.61/kernel/sys.c | |
493 | +--- linux-4.19.64.orig/kernel/sys.c | |
494 | ++++ linux-4.19.64/kernel/sys.c | |
495 | 495 | @@ -201,6 +201,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
496 | 496 | |
497 | 497 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -521,8 +521,8 @@ | ||
521 | 521 | |
522 | 522 | errno = -EFAULT; |
523 | 523 | if (!copy_from_user(tmp, name, len)) { |
524 | ---- linux-4.19.61.orig/kernel/time/timekeeping.c | |
525 | -+++ linux-4.19.61/kernel/time/timekeeping.c | |
524 | +--- linux-4.19.64.orig/kernel/time/timekeeping.c | |
525 | ++++ linux-4.19.64/kernel/time/timekeeping.c | |
526 | 526 | @@ -26,6 +26,7 @@ |
527 | 527 | #include <linux/stop_machine.h> |
528 | 528 | #include <linux/pvclock_gtod.h> |
@@ -556,8 +556,8 @@ | ||
556 | 556 | |
557 | 557 | /* |
558 | 558 | * Validate if a timespec/timeval used to inject a time |
559 | ---- linux-4.19.61.orig/net/ipv4/raw.c | |
560 | -+++ linux-4.19.61/net/ipv4/raw.c | |
559 | +--- linux-4.19.64.orig/net/ipv4/raw.c | |
560 | ++++ linux-4.19.64/net/ipv4/raw.c | |
561 | 561 | @@ -772,6 +772,10 @@ static int raw_recvmsg(struct sock *sk, |
562 | 562 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
563 | 563 | if (!skb) |
@@ -569,8 +569,8 @@ | ||
569 | 569 | |
570 | 570 | copied = skb->len; |
571 | 571 | if (len < copied) { |
572 | ---- linux-4.19.61.orig/net/ipv4/udp.c | |
573 | -+++ linux-4.19.61/net/ipv4/udp.c | |
572 | +--- linux-4.19.64.orig/net/ipv4/udp.c | |
573 | ++++ linux-4.19.64/net/ipv4/udp.c | |
574 | 574 | @@ -1667,6 +1667,8 @@ try_again: |
575 | 575 | skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err); |
576 | 576 | if (!skb) |
@@ -580,8 +580,8 @@ | ||
580 | 580 | |
581 | 581 | ulen = udp_skb_len(skb); |
582 | 582 | copied = len; |
583 | ---- linux-4.19.61.orig/net/ipv6/raw.c | |
584 | -+++ linux-4.19.61/net/ipv6/raw.c | |
583 | +--- linux-4.19.64.orig/net/ipv6/raw.c | |
584 | ++++ linux-4.19.64/net/ipv6/raw.c | |
585 | 585 | @@ -485,6 +485,10 @@ static int rawv6_recvmsg(struct sock *sk |
586 | 586 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
587 | 587 | if (!skb) |
@@ -593,8 +593,8 @@ | ||
593 | 593 | |
594 | 594 | copied = skb->len; |
595 | 595 | if (copied > len) { |
596 | ---- linux-4.19.61.orig/net/ipv6/udp.c | |
597 | -+++ linux-4.19.61/net/ipv6/udp.c | |
596 | +--- linux-4.19.64.orig/net/ipv6/udp.c | |
597 | ++++ linux-4.19.64/net/ipv6/udp.c | |
598 | 598 | @@ -343,6 +343,8 @@ try_again: |
599 | 599 | skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err); |
600 | 600 | if (!skb) |
@@ -604,8 +604,8 @@ | ||
604 | 604 | |
605 | 605 | ulen = udp6_skb_len(skb); |
606 | 606 | copied = len; |
607 | ---- linux-4.19.61.orig/net/socket.c | |
608 | -+++ linux-4.19.61/net/socket.c | |
607 | +--- linux-4.19.64.orig/net/socket.c | |
608 | ++++ linux-4.19.64/net/socket.c | |
609 | 609 | @@ -1590,6 +1590,10 @@ int __sys_accept4(int fd, struct sockadd |
610 | 610 | if (err < 0) |
611 | 611 | goto out_fd; |
@@ -617,8 +617,8 @@ | ||
617 | 617 | if (upeer_sockaddr) { |
618 | 618 | len = newsock->ops->getname(newsock, |
619 | 619 | (struct sockaddr *)&address, 2); |
620 | ---- linux-4.19.61.orig/net/unix/af_unix.c | |
621 | -+++ linux-4.19.61/net/unix/af_unix.c | |
620 | +--- linux-4.19.64.orig/net/unix/af_unix.c | |
621 | ++++ linux-4.19.64/net/unix/af_unix.c | |
622 | 622 | @@ -2137,6 +2137,10 @@ static int unix_dgram_recvmsg(struct soc |
623 | 623 | EPOLLOUT | EPOLLWRNORM | |
624 | 624 | EPOLLWRBAND); |
@@ -638,8 +638,8 @@ | ||
638 | 638 | mutex_unlock(&u->iolock); |
639 | 639 | out: |
640 | 640 | return err; |
641 | ---- linux-4.19.61.orig/security/Kconfig | |
642 | -+++ linux-4.19.61/security/Kconfig | |
641 | +--- linux-4.19.64.orig/security/Kconfig | |
642 | ++++ linux-4.19.64/security/Kconfig | |
643 | 643 | @@ -276,5 +276,7 @@ config DEFAULT_SECURITY |
644 | 644 | default "apparmor" if DEFAULT_SECURITY_APPARMOR |
645 | 645 | default "" if DEFAULT_SECURITY_DAC |
@@ -648,8 +648,8 @@ | ||
648 | 648 | + |
649 | 649 | endmenu |
650 | 650 | |
651 | ---- linux-4.19.61.orig/security/Makefile | |
652 | -+++ linux-4.19.61/security/Makefile | |
651 | +--- linux-4.19.64.orig/security/Makefile | |
652 | ++++ linux-4.19.64/security/Makefile | |
653 | 653 | @@ -30,3 +30,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c |
654 | 654 | # Object integrity file lists |
655 | 655 | subdir-$(CONFIG_INTEGRITY) += integrity |
@@ -657,8 +657,8 @@ | ||
657 | 657 | + |
658 | 658 | +subdir-$(CONFIG_CCSECURITY) += ccsecurity |
659 | 659 | +obj-$(CONFIG_CCSECURITY) += ccsecurity/ |
660 | ---- linux-4.19.61.orig/security/security.c | |
661 | -+++ linux-4.19.61/security/security.c | |
660 | +--- linux-4.19.64.orig/security/security.c | |
661 | ++++ linux-4.19.64/security/security.c | |
662 | 662 | @@ -988,12 +988,19 @@ int security_file_open(struct file *file |
663 | 663 | |
664 | 664 | int security_task_alloc(struct task_struct *task, unsigned long clone_flags) |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 4.4.186. | |
1 | +This is TOMOYO Linux patch for kernel 4.4.187. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.186.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.187.tar.xz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 - |
6 | 6 | fs/open.c | 2 + |
@@ -28,8 +28,8 @@ | ||
28 | 28 | security/Makefile | 3 ++ |
29 | 29 | 24 files changed, 150 insertions(+), 26 deletions(-) |
30 | 30 | |
31 | ---- linux-4.4.186.orig/fs/exec.c | |
32 | -+++ linux-4.4.186/fs/exec.c | |
31 | +--- linux-4.4.187.orig/fs/exec.c | |
32 | ++++ linux-4.4.187/fs/exec.c | |
33 | 33 | @@ -1512,7 +1512,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,9 +39,9 @@ | ||
39 | 39 | if (ret >= 0) { |
40 | 40 | audit_bprm(bprm); |
41 | 41 | trace_sched_process_exec(current, old_pid, bprm); |
42 | ---- linux-4.4.186.orig/fs/open.c | |
43 | -+++ linux-4.4.186/fs/open.c | |
44 | -@@ -1117,6 +1117,8 @@ EXPORT_SYMBOL(sys_close); | |
42 | +--- linux-4.4.187.orig/fs/open.c | |
43 | ++++ linux-4.4.187/fs/open.c | |
44 | +@@ -1136,6 +1136,8 @@ EXPORT_SYMBOL(sys_close); | |
45 | 45 | */ |
46 | 46 | SYSCALL_DEFINE0(vhangup) |
47 | 47 | { |
@@ -50,8 +50,8 @@ | ||
50 | 50 | if (capable(CAP_SYS_TTY_CONFIG)) { |
51 | 51 | tty_vhangup_self(); |
52 | 52 | return 0; |
53 | ---- linux-4.4.186.orig/fs/proc/version.c | |
54 | -+++ linux-4.4.186/fs/proc/version.c | |
53 | +--- linux-4.4.187.orig/fs/proc/version.c | |
54 | ++++ linux-4.4.187/fs/proc/version.c | |
55 | 55 | @@ -32,3 +32,10 @@ static int __init proc_version_init(void |
56 | 56 | return 0; |
57 | 57 | } |
@@ -59,12 +59,12 @@ | ||
59 | 59 | + |
60 | 60 | +static int __init ccs_show_version(void) |
61 | 61 | +{ |
62 | -+ printk(KERN_INFO "Hook version: 4.4.186 2019/07/22\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.4.187 2019/08/06\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-4.4.186.orig/include/linux/init_task.h | |
67 | -+++ linux-4.4.186/include/linux/init_task.h | |
66 | +--- linux-4.4.187.orig/include/linux/init_task.h | |
67 | ++++ linux-4.4.187/include/linux/init_task.h | |
68 | 68 | @@ -183,6 +183,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.4.186.orig/include/linux/sched.h | |
92 | -+++ linux-4.4.186/include/linux/sched.h | |
91 | +--- linux-4.4.187.orig/include/linux/sched.h | |
92 | ++++ linux-4.4.187/include/linux/sched.h | |
93 | 93 | @@ -6,6 +6,8 @@ |
94 | 94 | #include <linux/sched/prio.h> |
95 | 95 |
@@ -110,8 +110,8 @@ | ||
110 | 110 | /* CPU-specific state of this task */ |
111 | 111 | struct thread_struct thread; |
112 | 112 | /* |
113 | ---- linux-4.4.186.orig/include/linux/security.h | |
114 | -+++ linux-4.4.186/include/linux/security.h | |
113 | +--- linux-4.4.187.orig/include/linux/security.h | |
114 | ++++ linux-4.4.187/include/linux/security.h | |
115 | 115 | @@ -53,6 +53,7 @@ struct msg_queue; |
116 | 116 | struct xattr; |
117 | 117 | struct xfrm_sec_ctx; |
@@ -318,8 +318,8 @@ | ||
318 | 318 | } |
319 | 319 | #endif /* CONFIG_SECURITY_PATH */ |
320 | 320 | |
321 | ---- linux-4.4.186.orig/include/net/ip.h | |
322 | -+++ linux-4.4.186/include/net/ip.h | |
321 | +--- linux-4.4.187.orig/include/net/ip.h | |
322 | ++++ linux-4.4.187/include/net/ip.h | |
323 | 323 | @@ -225,6 +225,8 @@ void inet_get_local_port_range(struct ne |
324 | 324 | #ifdef CONFIG_SYSCTL |
325 | 325 | static inline int inet_is_local_reserved_port(struct net *net, int port) |
@@ -338,8 +338,8 @@ | ||
338 | 338 | return 0; |
339 | 339 | } |
340 | 340 | #endif |
341 | ---- linux-4.4.186.orig/kernel/fork.c | |
342 | -+++ linux-4.4.186/kernel/fork.c | |
341 | +--- linux-4.4.187.orig/kernel/fork.c | |
342 | ++++ linux-4.4.187/kernel/fork.c | |
343 | 343 | @@ -260,6 +260,7 @@ void __put_task_struct(struct task_struc |
344 | 344 | delayacct_tsk_free(tsk); |
345 | 345 | put_signal_struct(tsk->signal); |
@@ -366,8 +366,8 @@ | ||
366 | 366 | bad_fork_cleanup_perf: |
367 | 367 | perf_event_free_task(p); |
368 | 368 | bad_fork_cleanup_policy: |
369 | ---- linux-4.4.186.orig/kernel/kexec.c | |
370 | -+++ linux-4.4.186/kernel/kexec.c | |
369 | +--- linux-4.4.187.orig/kernel/kexec.c | |
370 | ++++ linux-4.4.187/kernel/kexec.c | |
371 | 371 | @@ -17,7 +17,7 @@ |
372 | 372 | #include <linux/syscalls.h> |
373 | 373 | #include <linux/vmalloc.h> |
@@ -386,8 +386,8 @@ | ||
386 | 386 | |
387 | 387 | /* |
388 | 388 | * Verify we have a legal set of flags |
389 | ---- linux-4.4.186.orig/kernel/module.c | |
390 | -+++ linux-4.4.186/kernel/module.c | |
389 | +--- linux-4.4.187.orig/kernel/module.c | |
390 | ++++ linux-4.4.187/kernel/module.c | |
391 | 391 | @@ -61,6 +61,7 @@ |
392 | 392 | #include <linux/bsearch.h> |
393 | 393 | #include <uapi/linux/module.h> |
@@ -414,8 +414,8 @@ | ||
414 | 414 | |
415 | 415 | return 0; |
416 | 416 | } |
417 | ---- linux-4.4.186.orig/kernel/ptrace.c | |
418 | -+++ linux-4.4.186/kernel/ptrace.c | |
417 | +--- linux-4.4.187.orig/kernel/ptrace.c | |
418 | ++++ linux-4.4.187/kernel/ptrace.c | |
419 | 419 | @@ -1109,6 +1109,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l |
420 | 420 | { |
421 | 421 | struct task_struct *child; |
@@ -440,8 +440,8 @@ | ||
440 | 440 | |
441 | 441 | if (request == PTRACE_TRACEME) { |
442 | 442 | ret = ptrace_traceme(); |
443 | ---- linux-4.4.186.orig/kernel/reboot.c | |
444 | -+++ linux-4.4.186/kernel/reboot.c | |
443 | +--- linux-4.4.187.orig/kernel/reboot.c | |
444 | ++++ linux-4.4.187/kernel/reboot.c | |
445 | 445 | @@ -16,6 +16,7 @@ |
446 | 446 | #include <linux/syscalls.h> |
447 | 447 | #include <linux/syscore_ops.h> |
@@ -459,8 +459,8 @@ | ||
459 | 459 | |
460 | 460 | /* |
461 | 461 | * If pid namespaces are enabled and the current task is in a child |
462 | ---- linux-4.4.186.orig/kernel/sched/core.c | |
463 | -+++ linux-4.4.186/kernel/sched/core.c | |
462 | +--- linux-4.4.187.orig/kernel/sched/core.c | |
463 | ++++ linux-4.4.187/kernel/sched/core.c | |
464 | 464 | @@ -3549,6 +3549,8 @@ int can_nice(const struct task_struct *p |
465 | 465 | SYSCALL_DEFINE1(nice, int, increment) |
466 | 466 | { |
@@ -470,8 +470,8 @@ | ||
470 | 470 | |
471 | 471 | /* |
472 | 472 | * Setpriority might change our priority at the same moment. |
473 | ---- linux-4.4.186.orig/kernel/signal.c | |
474 | -+++ linux-4.4.186/kernel/signal.c | |
473 | +--- linux-4.4.187.orig/kernel/signal.c | |
474 | ++++ linux-4.4.187/kernel/signal.c | |
475 | 475 | @@ -2929,6 +2929,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s |
476 | 476 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
477 | 477 | { |
@@ -517,8 +517,8 @@ | ||
517 | 517 | |
518 | 518 | return do_send_specific(tgid, pid, sig, info); |
519 | 519 | } |
520 | ---- linux-4.4.186.orig/kernel/sys.c | |
521 | -+++ linux-4.4.186/kernel/sys.c | |
520 | +--- linux-4.4.187.orig/kernel/sys.c | |
521 | ++++ linux-4.4.187/kernel/sys.c | |
522 | 522 | @@ -185,6 +185,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
523 | 523 | |
524 | 524 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -548,8 +548,8 @@ | ||
548 | 548 | |
549 | 549 | errno = -EFAULT; |
550 | 550 | if (!copy_from_user(tmp, name, len)) { |
551 | ---- linux-4.4.186.orig/kernel/time/ntp.c | |
552 | -+++ linux-4.4.186/kernel/time/ntp.c | |
551 | +--- linux-4.4.187.orig/kernel/time/ntp.c | |
552 | ++++ linux-4.4.187/kernel/time/ntp.c | |
553 | 553 | @@ -16,6 +16,7 @@ |
554 | 554 | #include <linux/mm.h> |
555 | 555 | #include <linux/module.h> |
@@ -558,7 +558,7 @@ | ||
558 | 558 | |
559 | 559 | #include "ntp_internal.h" |
560 | 560 | |
561 | -@@ -660,10 +661,15 @@ int ntp_validate_timex(struct timex *txc | |
561 | +@@ -662,10 +663,15 @@ int ntp_validate_timex(struct timex *txc | |
562 | 562 | if (!(txc->modes & ADJ_OFFSET_READONLY) && |
563 | 563 | !capable(CAP_SYS_TIME)) |
564 | 564 | return -EPERM; |
@@ -574,7 +574,7 @@ | ||
574 | 574 | /* |
575 | 575 | * if the quartz is off by more than 10% then |
576 | 576 | * something is VERY wrong! |
577 | -@@ -678,6 +684,8 @@ int ntp_validate_timex(struct timex *txc | |
577 | +@@ -680,6 +686,8 @@ int ntp_validate_timex(struct timex *txc | |
578 | 578 | /* In order to inject time, you gotta be super-user! */ |
579 | 579 | if (!capable(CAP_SYS_TIME)) |
580 | 580 | return -EPERM; |
@@ -583,8 +583,8 @@ | ||
583 | 583 | |
584 | 584 | if (txc->modes & ADJ_NANO) { |
585 | 585 | struct timespec ts; |
586 | ---- linux-4.4.186.orig/net/ipv4/raw.c | |
587 | -+++ linux-4.4.186/net/ipv4/raw.c | |
586 | +--- linux-4.4.187.orig/net/ipv4/raw.c | |
587 | ++++ linux-4.4.187/net/ipv4/raw.c | |
588 | 588 | @@ -747,6 +747,10 @@ static int raw_recvmsg(struct sock *sk, |
589 | 589 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
590 | 590 | if (!skb) |
@@ -596,8 +596,8 @@ | ||
596 | 596 | |
597 | 597 | copied = skb->len; |
598 | 598 | if (len < copied) { |
599 | ---- linux-4.4.186.orig/net/ipv4/udp.c | |
600 | -+++ linux-4.4.186/net/ipv4/udp.c | |
599 | +--- linux-4.4.187.orig/net/ipv4/udp.c | |
600 | ++++ linux-4.4.187/net/ipv4/udp.c | |
601 | 601 | @@ -1289,6 +1289,10 @@ try_again: |
602 | 602 | &peeked, &off, &err); |
603 | 603 | if (!skb) |
@@ -609,8 +609,8 @@ | ||
609 | 609 | |
610 | 610 | ulen = skb->len - sizeof(struct udphdr); |
611 | 611 | copied = len; |
612 | ---- linux-4.4.186.orig/net/ipv6/raw.c | |
613 | -+++ linux-4.4.186/net/ipv6/raw.c | |
612 | +--- linux-4.4.187.orig/net/ipv6/raw.c | |
613 | ++++ linux-4.4.187/net/ipv6/raw.c | |
614 | 614 | @@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk |
615 | 615 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
616 | 616 | if (!skb) |
@@ -622,8 +622,8 @@ | ||
622 | 622 | |
623 | 623 | copied = skb->len; |
624 | 624 | if (copied > len) { |
625 | ---- linux-4.4.186.orig/net/ipv6/udp.c | |
626 | -+++ linux-4.4.186/net/ipv6/udp.c | |
625 | +--- linux-4.4.187.orig/net/ipv6/udp.c | |
626 | ++++ linux-4.4.187/net/ipv6/udp.c | |
627 | 627 | @@ -417,6 +417,10 @@ try_again: |
628 | 628 | &peeked, &off, &err); |
629 | 629 | if (!skb) |
@@ -635,8 +635,8 @@ | ||
635 | 635 | |
636 | 636 | ulen = skb->len - sizeof(struct udphdr); |
637 | 637 | copied = len; |
638 | ---- linux-4.4.186.orig/net/socket.c | |
639 | -+++ linux-4.4.186/net/socket.c | |
638 | +--- linux-4.4.187.orig/net/socket.c | |
639 | ++++ linux-4.4.187/net/socket.c | |
640 | 640 | @@ -1465,6 +1465,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct |
641 | 641 | if (err < 0) |
642 | 642 | goto out_fd; |
@@ -648,8 +648,8 @@ | ||
648 | 648 | if (upeer_sockaddr) { |
649 | 649 | if (newsock->ops->getname(newsock, (struct sockaddr *)&address, |
650 | 650 | &len, 2) < 0) { |
651 | ---- linux-4.4.186.orig/net/unix/af_unix.c | |
652 | -+++ linux-4.4.186/net/unix/af_unix.c | |
651 | +--- linux-4.4.187.orig/net/unix/af_unix.c | |
652 | ++++ linux-4.4.187/net/unix/af_unix.c | |
653 | 653 | @@ -2151,6 +2151,10 @@ static int unix_dgram_recvmsg(struct soc |
654 | 654 | wake_up_interruptible_sync_poll(&u->peer_wait, |
655 | 655 | POLLOUT | POLLWRNORM | POLLWRBAND); |
@@ -661,8 +661,8 @@ | ||
661 | 661 | if (msg->msg_name) |
662 | 662 | unix_copy_addr(msg, skb->sk); |
663 | 663 | |
664 | ---- linux-4.4.186.orig/security/Kconfig | |
665 | -+++ linux-4.4.186/security/Kconfig | |
664 | +--- linux-4.4.187.orig/security/Kconfig | |
665 | ++++ linux-4.4.187/security/Kconfig | |
666 | 666 | @@ -173,5 +173,7 @@ config DEFAULT_SECURITY |
667 | 667 | default "apparmor" if DEFAULT_SECURITY_APPARMOR |
668 | 668 | default "" if DEFAULT_SECURITY_DAC |
@@ -671,8 +671,8 @@ | ||
671 | 671 | + |
672 | 672 | endmenu |
673 | 673 | |
674 | ---- linux-4.4.186.orig/security/Makefile | |
675 | -+++ linux-4.4.186/security/Makefile | |
674 | +--- linux-4.4.187.orig/security/Makefile | |
675 | ++++ linux-4.4.187/security/Makefile | |
676 | 676 | @@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c |
677 | 677 | # Object integrity file lists |
678 | 678 | subdir-$(CONFIG_INTEGRITY) += integrity |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 4.9.186. | |
1 | +This is TOMOYO Linux patch for kernel 4.9.187. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.186.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.187.tar.xz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 - |
6 | 6 | fs/open.c | 2 + |
@@ -28,8 +28,8 @@ | ||
28 | 28 | security/Makefile | 3 ++ |
29 | 29 | 24 files changed, 147 insertions(+), 26 deletions(-) |
30 | 30 | |
31 | ---- linux-4.9.186.orig/fs/exec.c | |
32 | -+++ linux-4.9.186/fs/exec.c | |
31 | +--- linux-4.9.187.orig/fs/exec.c | |
32 | ++++ linux-4.9.187/fs/exec.c | |
33 | 33 | @@ -1660,7 +1660,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,9 +39,9 @@ | ||
39 | 39 | if (ret >= 0) { |
40 | 40 | audit_bprm(bprm); |
41 | 41 | trace_sched_process_exec(current, old_pid, bprm); |
42 | ---- linux-4.9.186.orig/fs/open.c | |
43 | -+++ linux-4.9.186/fs/open.c | |
44 | -@@ -1157,6 +1157,8 @@ EXPORT_SYMBOL(sys_close); | |
42 | +--- linux-4.9.187.orig/fs/open.c | |
43 | ++++ linux-4.9.187/fs/open.c | |
44 | +@@ -1176,6 +1176,8 @@ EXPORT_SYMBOL(sys_close); | |
45 | 45 | */ |
46 | 46 | SYSCALL_DEFINE0(vhangup) |
47 | 47 | { |
@@ -50,8 +50,8 @@ | ||
50 | 50 | if (capable(CAP_SYS_TTY_CONFIG)) { |
51 | 51 | tty_vhangup_self(); |
52 | 52 | return 0; |
53 | ---- linux-4.9.186.orig/fs/proc/version.c | |
54 | -+++ linux-4.9.186/fs/proc/version.c | |
53 | +--- linux-4.9.187.orig/fs/proc/version.c | |
54 | ++++ linux-4.9.187/fs/proc/version.c | |
55 | 55 | @@ -32,3 +32,10 @@ static int __init proc_version_init(void |
56 | 56 | return 0; |
57 | 57 | } |
@@ -59,12 +59,12 @@ | ||
59 | 59 | + |
60 | 60 | +static int __init ccs_show_version(void) |
61 | 61 | +{ |
62 | -+ printk(KERN_INFO "Hook version: 4.9.186 2019/07/22\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.9.187 2019/08/06\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-4.9.186.orig/include/linux/init_task.h | |
67 | -+++ linux-4.9.186/include/linux/init_task.h | |
66 | +--- linux-4.9.187.orig/include/linux/init_task.h | |
67 | ++++ linux-4.9.187/include/linux/init_task.h | |
68 | 68 | @@ -193,6 +193,14 @@ extern struct task_group root_task_group |
69 | 69 | # define INIT_TASK_TI(tsk) |
70 | 70 | #endif |
@@ -88,8 +88,8 @@ | ||
88 | 88 | } |
89 | 89 | |
90 | 90 | |
91 | ---- linux-4.9.186.orig/include/linux/sched.h | |
92 | -+++ linux-4.9.186/include/linux/sched.h | |
91 | +--- linux-4.9.187.orig/include/linux/sched.h | |
92 | ++++ linux-4.9.187/include/linux/sched.h | |
93 | 93 | @@ -6,6 +6,8 @@ |
94 | 94 | #include <linux/sched/prio.h> |
95 | 95 |
@@ -110,8 +110,8 @@ | ||
110 | 110 | /* CPU-specific state of this task */ |
111 | 111 | struct thread_struct thread; |
112 | 112 | /* |
113 | ---- linux-4.9.186.orig/include/linux/security.h | |
114 | -+++ linux-4.9.186/include/linux/security.h | |
113 | +--- linux-4.9.187.orig/include/linux/security.h | |
114 | ++++ linux-4.9.187/include/linux/security.h | |
115 | 115 | @@ -55,6 +55,7 @@ struct msg_queue; |
116 | 116 | struct xattr; |
117 | 117 | struct xfrm_sec_ctx; |
@@ -318,8 +318,8 @@ | ||
318 | 318 | } |
319 | 319 | #endif /* CONFIG_SECURITY_PATH */ |
320 | 320 | |
321 | ---- linux-4.9.186.orig/include/net/ip.h | |
322 | -+++ linux-4.9.186/include/net/ip.h | |
321 | +--- linux-4.9.187.orig/include/net/ip.h | |
322 | ++++ linux-4.9.187/include/net/ip.h | |
323 | 323 | @@ -254,6 +254,8 @@ void inet_get_local_port_range(struct ne |
324 | 324 | #ifdef CONFIG_SYSCTL |
325 | 325 | static inline int inet_is_local_reserved_port(struct net *net, int port) |
@@ -338,8 +338,8 @@ | ||
338 | 338 | return 0; |
339 | 339 | } |
340 | 340 | #endif |
341 | ---- linux-4.9.186.orig/kernel/fork.c | |
342 | -+++ linux-4.9.186/kernel/fork.c | |
341 | +--- linux-4.9.187.orig/kernel/fork.c | |
342 | ++++ linux-4.9.187/kernel/fork.c | |
343 | 343 | @@ -395,6 +395,7 @@ void __put_task_struct(struct task_struc |
344 | 344 | delayacct_tsk_free(tsk); |
345 | 345 | put_signal_struct(tsk->signal); |
@@ -366,8 +366,8 @@ | ||
366 | 366 | bad_fork_cleanup_perf: |
367 | 367 | perf_event_free_task(p); |
368 | 368 | bad_fork_cleanup_policy: |
369 | ---- linux-4.9.186.orig/kernel/kexec.c | |
370 | -+++ linux-4.9.186/kernel/kexec.c | |
369 | +--- linux-4.9.187.orig/kernel/kexec.c | |
370 | ++++ linux-4.9.187/kernel/kexec.c | |
371 | 371 | @@ -17,7 +17,7 @@ |
372 | 372 | #include <linux/syscalls.h> |
373 | 373 | #include <linux/vmalloc.h> |
@@ -386,8 +386,8 @@ | ||
386 | 386 | |
387 | 387 | /* |
388 | 388 | * Verify we have a legal set of flags |
389 | ---- linux-4.9.186.orig/kernel/module.c | |
390 | -+++ linux-4.9.186/kernel/module.c | |
389 | +--- linux-4.9.187.orig/kernel/module.c | |
390 | ++++ linux-4.9.187/kernel/module.c | |
391 | 391 | @@ -63,6 +63,7 @@ |
392 | 392 | #include <linux/dynamic_debug.h> |
393 | 393 | #include <uapi/linux/module.h> |
@@ -414,8 +414,8 @@ | ||
414 | 414 | |
415 | 415 | return 0; |
416 | 416 | } |
417 | ---- linux-4.9.186.orig/kernel/ptrace.c | |
418 | -+++ linux-4.9.186/kernel/ptrace.c | |
417 | +--- linux-4.9.187.orig/kernel/ptrace.c | |
418 | ++++ linux-4.9.187/kernel/ptrace.c | |
419 | 419 | @@ -1146,6 +1146,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l |
420 | 420 | { |
421 | 421 | struct task_struct *child; |
@@ -440,8 +440,8 @@ | ||
440 | 440 | |
441 | 441 | if (request == PTRACE_TRACEME) { |
442 | 442 | ret = ptrace_traceme(); |
443 | ---- linux-4.9.186.orig/kernel/reboot.c | |
444 | -+++ linux-4.9.186/kernel/reboot.c | |
443 | +--- linux-4.9.187.orig/kernel/reboot.c | |
444 | ++++ linux-4.9.187/kernel/reboot.c | |
445 | 445 | @@ -16,6 +16,7 @@ |
446 | 446 | #include <linux/syscalls.h> |
447 | 447 | #include <linux/syscore_ops.h> |
@@ -459,8 +459,8 @@ | ||
459 | 459 | |
460 | 460 | /* |
461 | 461 | * If pid namespaces are enabled and the current task is in a child |
462 | ---- linux-4.9.186.orig/kernel/sched/core.c | |
463 | -+++ linux-4.9.186/kernel/sched/core.c | |
462 | +--- linux-4.9.187.orig/kernel/sched/core.c | |
463 | ++++ linux-4.9.187/kernel/sched/core.c | |
464 | 464 | @@ -3813,6 +3813,8 @@ int can_nice(const struct task_struct *p |
465 | 465 | SYSCALL_DEFINE1(nice, int, increment) |
466 | 466 | { |
@@ -470,8 +470,8 @@ | ||
470 | 470 | |
471 | 471 | /* |
472 | 472 | * Setpriority might change our priority at the same moment. |
473 | ---- linux-4.9.186.orig/kernel/signal.c | |
474 | -+++ linux-4.9.186/kernel/signal.c | |
473 | +--- linux-4.9.187.orig/kernel/signal.c | |
474 | ++++ linux-4.9.187/kernel/signal.c | |
475 | 475 | @@ -2929,6 +2929,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s |
476 | 476 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
477 | 477 | { |
@@ -517,8 +517,8 @@ | ||
517 | 517 | |
518 | 518 | return do_send_specific(tgid, pid, sig, info); |
519 | 519 | } |
520 | ---- linux-4.9.186.orig/kernel/sys.c | |
521 | -+++ linux-4.9.186/kernel/sys.c | |
520 | +--- linux-4.9.187.orig/kernel/sys.c | |
521 | ++++ linux-4.9.187/kernel/sys.c | |
522 | 522 | @@ -185,6 +185,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
523 | 523 | |
524 | 524 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -548,8 +548,8 @@ | ||
548 | 548 | |
549 | 549 | errno = -EFAULT; |
550 | 550 | if (!copy_from_user(tmp, name, len)) { |
551 | ---- linux-4.9.186.orig/kernel/time/ntp.c | |
552 | -+++ linux-4.9.186/kernel/time/ntp.c | |
551 | +--- linux-4.9.187.orig/kernel/time/ntp.c | |
552 | ++++ linux-4.9.187/kernel/time/ntp.c | |
553 | 553 | @@ -17,6 +17,7 @@ |
554 | 554 | #include <linux/module.h> |
555 | 555 | #include <linux/rtc.h> |
@@ -558,7 +558,7 @@ | ||
558 | 558 | |
559 | 559 | #include "ntp_internal.h" |
560 | 560 | #include "timekeeping_internal.h" |
561 | -@@ -666,10 +667,15 @@ int ntp_validate_timex(struct timex *txc | |
561 | +@@ -668,10 +669,15 @@ int ntp_validate_timex(struct timex *txc | |
562 | 562 | if (!(txc->modes & ADJ_OFFSET_READONLY) && |
563 | 563 | !capable(CAP_SYS_TIME)) |
564 | 564 | return -EPERM; |
@@ -574,7 +574,7 @@ | ||
574 | 574 | /* |
575 | 575 | * if the quartz is off by more than 10% then |
576 | 576 | * something is VERY wrong! |
577 | -@@ -684,6 +690,8 @@ int ntp_validate_timex(struct timex *txc | |
577 | +@@ -686,6 +692,8 @@ int ntp_validate_timex(struct timex *txc | |
578 | 578 | /* In order to inject time, you gotta be super-user! */ |
579 | 579 | if (!capable(CAP_SYS_TIME)) |
580 | 580 | return -EPERM; |
@@ -583,8 +583,8 @@ | ||
583 | 583 | |
584 | 584 | if (txc->modes & ADJ_NANO) { |
585 | 585 | struct timespec ts; |
586 | ---- linux-4.9.186.orig/net/ipv4/raw.c | |
587 | -+++ linux-4.9.186/net/ipv4/raw.c | |
586 | +--- linux-4.9.187.orig/net/ipv4/raw.c | |
587 | ++++ linux-4.9.187/net/ipv4/raw.c | |
588 | 588 | @@ -744,6 +744,10 @@ static int raw_recvmsg(struct sock *sk, |
589 | 589 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
590 | 590 | if (!skb) |
@@ -596,8 +596,8 @@ | ||
596 | 596 | |
597 | 597 | copied = skb->len; |
598 | 598 | if (len < copied) { |
599 | ---- linux-4.9.186.orig/net/ipv4/udp.c | |
600 | -+++ linux-4.9.186/net/ipv4/udp.c | |
599 | +--- linux-4.9.187.orig/net/ipv4/udp.c | |
600 | ++++ linux-4.9.187/net/ipv4/udp.c | |
601 | 601 | @@ -1271,6 +1271,8 @@ try_again: |
602 | 602 | &peeked, &off, &err); |
603 | 603 | if (!skb) |
@@ -607,8 +607,8 @@ | ||
607 | 607 | |
608 | 608 | ulen = skb->len; |
609 | 609 | copied = len; |
610 | ---- linux-4.9.186.orig/net/ipv6/raw.c | |
611 | -+++ linux-4.9.186/net/ipv6/raw.c | |
610 | +--- linux-4.9.187.orig/net/ipv6/raw.c | |
611 | ++++ linux-4.9.187/net/ipv6/raw.c | |
612 | 612 | @@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk |
613 | 613 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
614 | 614 | if (!skb) |
@@ -620,8 +620,8 @@ | ||
620 | 620 | |
621 | 621 | copied = skb->len; |
622 | 622 | if (copied > len) { |
623 | ---- linux-4.9.186.orig/net/ipv6/udp.c | |
624 | -+++ linux-4.9.186/net/ipv6/udp.c | |
623 | +--- linux-4.9.187.orig/net/ipv6/udp.c | |
624 | ++++ linux-4.9.187/net/ipv6/udp.c | |
625 | 625 | @@ -348,6 +348,8 @@ try_again: |
626 | 626 | &peeked, &off, &err); |
627 | 627 | if (!skb) |
@@ -631,8 +631,8 @@ | ||
631 | 631 | |
632 | 632 | ulen = skb->len; |
633 | 633 | copied = len; |
634 | ---- linux-4.9.186.orig/net/socket.c | |
635 | -+++ linux-4.9.186/net/socket.c | |
634 | +--- linux-4.9.187.orig/net/socket.c | |
635 | ++++ linux-4.9.187/net/socket.c | |
636 | 636 | @@ -1482,6 +1482,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct |
637 | 637 | if (err < 0) |
638 | 638 | goto out_fd; |
@@ -644,8 +644,8 @@ | ||
644 | 644 | if (upeer_sockaddr) { |
645 | 645 | if (newsock->ops->getname(newsock, (struct sockaddr *)&address, |
646 | 646 | &len, 2) < 0) { |
647 | ---- linux-4.9.186.orig/net/unix/af_unix.c | |
648 | -+++ linux-4.9.186/net/unix/af_unix.c | |
647 | +--- linux-4.9.187.orig/net/unix/af_unix.c | |
648 | ++++ linux-4.9.187/net/unix/af_unix.c | |
649 | 649 | @@ -2160,6 +2160,10 @@ static int unix_dgram_recvmsg(struct soc |
650 | 650 | POLLOUT | POLLWRNORM | |
651 | 651 | POLLWRBAND); |
@@ -665,8 +665,8 @@ | ||
665 | 665 | mutex_unlock(&u->iolock); |
666 | 666 | out: |
667 | 667 | return err; |
668 | ---- linux-4.9.186.orig/security/Kconfig | |
669 | -+++ linux-4.9.186/security/Kconfig | |
668 | +--- linux-4.9.187.orig/security/Kconfig | |
669 | ++++ linux-4.9.187/security/Kconfig | |
670 | 670 | @@ -214,5 +214,7 @@ config DEFAULT_SECURITY |
671 | 671 | default "apparmor" if DEFAULT_SECURITY_APPARMOR |
672 | 672 | default "" if DEFAULT_SECURITY_DAC |
@@ -675,8 +675,8 @@ | ||
675 | 675 | + |
676 | 676 | endmenu |
677 | 677 | |
678 | ---- linux-4.9.186.orig/security/Makefile | |
679 | -+++ linux-4.9.186/security/Makefile | |
678 | +--- linux-4.9.187.orig/security/Makefile | |
679 | ++++ linux-4.9.187/security/Makefile | |
680 | 680 | @@ -29,3 +29,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c |
681 | 681 | # Object integrity file lists |
682 | 682 | subdir-$(CONFIG_INTEGRITY) += integrity |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 5.1.20. | |
1 | +This is TOMOYO Linux patch for kernel 5.1.21. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.1.20.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.1.21.tar.xz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 - |
6 | 6 | fs/open.c | 2 + |
@@ -28,8 +28,8 @@ | ||
28 | 28 | security/security.c | 5 ++- |
29 | 29 | 24 files changed, 159 insertions(+), 29 deletions(-) |
30 | 30 | |
31 | ---- linux-5.1.20.orig/fs/exec.c | |
32 | -+++ linux-5.1.20/fs/exec.c | |
31 | +--- linux-5.1.21.orig/fs/exec.c | |
32 | ++++ linux-5.1.21/fs/exec.c | |
33 | 33 | @@ -1695,7 +1695,7 @@ static int exec_binprm(struct linux_binp |
34 | 34 | old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent)); |
35 | 35 | rcu_read_unlock(); |
@@ -39,8 +39,8 @@ | ||
39 | 39 | if (ret >= 0) { |
40 | 40 | audit_bprm(bprm); |
41 | 41 | trace_sched_process_exec(current, old_pid, bprm); |
42 | ---- linux-5.1.20.orig/fs/open.c | |
43 | -+++ linux-5.1.20/fs/open.c | |
42 | +--- linux-5.1.21.orig/fs/open.c | |
43 | ++++ linux-5.1.21/fs/open.c | |
44 | 44 | @@ -1180,6 +1180,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd) |
45 | 45 | */ |
46 | 46 | SYSCALL_DEFINE0(vhangup) |
@@ -50,8 +50,8 @@ | ||
50 | 50 | if (capable(CAP_SYS_TTY_CONFIG)) { |
51 | 51 | tty_vhangup_self(); |
52 | 52 | return 0; |
53 | ---- linux-5.1.20.orig/fs/proc/version.c | |
54 | -+++ linux-5.1.20/fs/proc/version.c | |
53 | +--- linux-5.1.21.orig/fs/proc/version.c | |
54 | ++++ linux-5.1.21/fs/proc/version.c | |
55 | 55 | @@ -21,3 +21,10 @@ static int __init proc_version_init(void |
56 | 56 | return 0; |
57 | 57 | } |
@@ -59,12 +59,12 @@ | ||
59 | 59 | + |
60 | 60 | +static int __init ccs_show_version(void) |
61 | 61 | +{ |
62 | -+ printk(KERN_INFO "Hook version: 5.1.20 2019/07/27\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 5.1.21 2019/07/29\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-5.1.20.orig/include/linux/sched.h | |
67 | -+++ linux-5.1.20/include/linux/sched.h | |
66 | +--- linux-5.1.21.orig/include/linux/sched.h | |
67 | ++++ linux-5.1.21/include/linux/sched.h | |
68 | 68 | @@ -36,6 +36,7 @@ struct audit_context; |
69 | 69 | struct backing_dev_info; |
70 | 70 | struct bio_list; |
@@ -84,8 +84,8 @@ | ||
84 | 84 | |
85 | 85 | /* |
86 | 86 | * New fields for task_struct should be added above here, so that |
87 | ---- linux-5.1.20.orig/include/linux/security.h | |
88 | -+++ linux-5.1.20/include/linux/security.h | |
87 | +--- linux-5.1.21.orig/include/linux/security.h | |
88 | ++++ linux-5.1.21/include/linux/security.h | |
89 | 89 | @@ -56,6 +56,7 @@ struct mm_struct; |
90 | 90 | struct fs_context; |
91 | 91 | struct fs_parameter; |
@@ -306,8 +306,8 @@ | ||
306 | 306 | } |
307 | 307 | #endif /* CONFIG_SECURITY_PATH */ |
308 | 308 | |
309 | ---- linux-5.1.20.orig/include/net/ip.h | |
310 | -+++ linux-5.1.20/include/net/ip.h | |
309 | +--- linux-5.1.21.orig/include/net/ip.h | |
310 | ++++ linux-5.1.21/include/net/ip.h | |
311 | 311 | @@ -302,6 +302,8 @@ void inet_get_local_port_range(struct ne |
312 | 312 | #ifdef CONFIG_SYSCTL |
313 | 313 | static inline int inet_is_local_reserved_port(struct net *net, int port) |
@@ -326,8 +326,8 @@ | ||
326 | 326 | return 0; |
327 | 327 | } |
328 | 328 | |
329 | ---- linux-5.1.20.orig/init/init_task.c | |
330 | -+++ linux-5.1.20/init/init_task.c | |
329 | +--- linux-5.1.21.orig/init/init_task.c | |
330 | ++++ linux-5.1.21/init/init_task.c | |
331 | 331 | @@ -180,6 +180,10 @@ struct task_struct init_task |
332 | 332 | #ifdef CONFIG_SECURITY |
333 | 333 | .security = NULL, |
@@ -339,8 +339,8 @@ | ||
339 | 339 | }; |
340 | 340 | EXPORT_SYMBOL(init_task); |
341 | 341 | |
342 | ---- linux-5.1.20.orig/kernel/kexec.c | |
343 | -+++ linux-5.1.20/kernel/kexec.c | |
342 | +--- linux-5.1.21.orig/kernel/kexec.c | |
343 | ++++ linux-5.1.21/kernel/kexec.c | |
344 | 344 | @@ -18,7 +18,7 @@ |
345 | 345 | #include <linux/syscalls.h> |
346 | 346 | #include <linux/vmalloc.h> |
@@ -359,8 +359,8 @@ | ||
359 | 359 | |
360 | 360 | /* Permit LSMs and IMA to fail the kexec */ |
361 | 361 | result = security_kernel_load_data(LOADING_KEXEC_IMAGE); |
362 | ---- linux-5.1.20.orig/kernel/module.c | |
363 | -+++ linux-5.1.20/kernel/module.c | |
362 | +--- linux-5.1.21.orig/kernel/module.c | |
363 | ++++ linux-5.1.21/kernel/module.c | |
364 | 364 | @@ -66,6 +66,7 @@ |
365 | 365 | #include <linux/audit.h> |
366 | 366 | #include <uapi/linux/module.h> |
@@ -387,8 +387,8 @@ | ||
387 | 387 | |
388 | 388 | return 0; |
389 | 389 | } |
390 | ---- linux-5.1.20.orig/kernel/ptrace.c | |
391 | -+++ linux-5.1.20/kernel/ptrace.c | |
390 | +--- linux-5.1.21.orig/kernel/ptrace.c | |
391 | ++++ linux-5.1.21/kernel/ptrace.c | |
392 | 392 | @@ -1136,6 +1136,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l |
393 | 393 | { |
394 | 394 | struct task_struct *child; |
@@ -413,8 +413,8 @@ | ||
413 | 413 | |
414 | 414 | if (request == PTRACE_TRACEME) { |
415 | 415 | ret = ptrace_traceme(); |
416 | ---- linux-5.1.20.orig/kernel/reboot.c | |
417 | -+++ linux-5.1.20/kernel/reboot.c | |
416 | +--- linux-5.1.21.orig/kernel/reboot.c | |
417 | ++++ linux-5.1.21/kernel/reboot.c | |
418 | 418 | @@ -16,6 +16,7 @@ |
419 | 419 | #include <linux/syscalls.h> |
420 | 420 | #include <linux/syscore_ops.h> |
@@ -432,8 +432,8 @@ | ||
432 | 432 | |
433 | 433 | /* |
434 | 434 | * If pid namespaces are enabled and the current task is in a child |
435 | ---- linux-5.1.20.orig/kernel/sched/core.c | |
436 | -+++ linux-5.1.20/kernel/sched/core.c | |
435 | +--- linux-5.1.21.orig/kernel/sched/core.c | |
436 | ++++ linux-5.1.21/kernel/sched/core.c | |
437 | 437 | @@ -3989,6 +3989,8 @@ int can_nice(const struct task_struct *p |
438 | 438 | SYSCALL_DEFINE1(nice, int, increment) |
439 | 439 | { |
@@ -443,8 +443,8 @@ | ||
443 | 443 | |
444 | 444 | /* |
445 | 445 | * Setpriority might change our priority at the same moment. |
446 | ---- linux-5.1.20.orig/kernel/signal.c | |
447 | -+++ linux-5.1.20/kernel/signal.c | |
446 | +--- linux-5.1.21.orig/kernel/signal.c | |
447 | ++++ linux-5.1.21/kernel/signal.c | |
448 | 448 | @@ -3554,6 +3554,8 @@ static inline void prepare_kill_siginfo( |
449 | 449 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
450 | 450 | { |
@@ -512,8 +512,8 @@ | ||
512 | 512 | |
513 | 513 | return do_send_specific(tgid, pid, sig, info); |
514 | 514 | } |
515 | ---- linux-5.1.20.orig/kernel/sys.c | |
516 | -+++ linux-5.1.20/kernel/sys.c | |
515 | +--- linux-5.1.21.orig/kernel/sys.c | |
516 | ++++ linux-5.1.21/kernel/sys.c | |
517 | 517 | @@ -204,6 +204,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
518 | 518 | |
519 | 519 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -543,8 +543,8 @@ | ||
543 | 543 | |
544 | 544 | errno = -EFAULT; |
545 | 545 | if (!copy_from_user(tmp, name, len)) { |
546 | ---- linux-5.1.20.orig/kernel/time/timekeeping.c | |
547 | -+++ linux-5.1.20/kernel/time/timekeeping.c | |
546 | +--- linux-5.1.21.orig/kernel/time/timekeeping.c | |
547 | ++++ linux-5.1.21/kernel/time/timekeeping.c | |
548 | 548 | @@ -21,6 +21,7 @@ |
549 | 549 | #include <linux/stop_machine.h> |
550 | 550 | #include <linux/pvclock_gtod.h> |
@@ -578,8 +578,8 @@ | ||
578 | 578 | |
579 | 579 | /* |
580 | 580 | * Validate if a timespec/timeval used to inject a time |
581 | ---- linux-5.1.20.orig/net/ipv4/raw.c | |
582 | -+++ linux-5.1.20/net/ipv4/raw.c | |
581 | +--- linux-5.1.21.orig/net/ipv4/raw.c | |
582 | ++++ linux-5.1.21/net/ipv4/raw.c | |
583 | 583 | @@ -771,6 +771,10 @@ static int raw_recvmsg(struct sock *sk, |
584 | 584 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
585 | 585 | if (!skb) |
@@ -591,8 +591,8 @@ | ||
591 | 591 | |
592 | 592 | copied = skb->len; |
593 | 593 | if (len < copied) { |
594 | ---- linux-5.1.20.orig/net/ipv4/udp.c | |
595 | -+++ linux-5.1.20/net/ipv4/udp.c | |
594 | +--- linux-5.1.21.orig/net/ipv4/udp.c | |
595 | ++++ linux-5.1.21/net/ipv4/udp.c | |
596 | 596 | @@ -1730,6 +1730,8 @@ try_again: |
597 | 597 | skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err); |
598 | 598 | if (!skb) |
@@ -602,8 +602,8 @@ | ||
602 | 602 | |
603 | 603 | ulen = udp_skb_len(skb); |
604 | 604 | copied = len; |
605 | ---- linux-5.1.20.orig/net/ipv6/raw.c | |
606 | -+++ linux-5.1.20/net/ipv6/raw.c | |
605 | +--- linux-5.1.21.orig/net/ipv6/raw.c | |
606 | ++++ linux-5.1.21/net/ipv6/raw.c | |
607 | 607 | @@ -484,6 +484,10 @@ static int rawv6_recvmsg(struct sock *sk |
608 | 608 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
609 | 609 | if (!skb) |
@@ -615,8 +615,8 @@ | ||
615 | 615 | |
616 | 616 | copied = skb->len; |
617 | 617 | if (copied > len) { |
618 | ---- linux-5.1.20.orig/net/ipv6/udp.c | |
619 | -+++ linux-5.1.20/net/ipv6/udp.c | |
618 | +--- linux-5.1.21.orig/net/ipv6/udp.c | |
619 | ++++ linux-5.1.21/net/ipv6/udp.c | |
620 | 620 | @@ -304,6 +304,8 @@ try_again: |
621 | 621 | skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err); |
622 | 622 | if (!skb) |
@@ -626,8 +626,8 @@ | ||
626 | 626 | |
627 | 627 | ulen = udp6_skb_len(skb); |
628 | 628 | copied = len; |
629 | ---- linux-5.1.20.orig/net/socket.c | |
630 | -+++ linux-5.1.20/net/socket.c | |
629 | +--- linux-5.1.21.orig/net/socket.c | |
630 | ++++ linux-5.1.21/net/socket.c | |
631 | 631 | @@ -1735,6 +1735,10 @@ int __sys_accept4(int fd, struct sockadd |
632 | 632 | if (err < 0) |
633 | 633 | goto out_fd; |
@@ -639,8 +639,8 @@ | ||
639 | 639 | if (upeer_sockaddr) { |
640 | 640 | len = newsock->ops->getname(newsock, |
641 | 641 | (struct sockaddr *)&address, 2); |
642 | ---- linux-5.1.20.orig/net/unix/af_unix.c | |
643 | -+++ linux-5.1.20/net/unix/af_unix.c | |
642 | +--- linux-5.1.21.orig/net/unix/af_unix.c | |
643 | ++++ linux-5.1.21/net/unix/af_unix.c | |
644 | 644 | @@ -2080,6 +2080,10 @@ static int unix_dgram_recvmsg(struct soc |
645 | 645 | EPOLLOUT | EPOLLWRNORM | |
646 | 646 | EPOLLWRBAND); |
@@ -660,8 +660,8 @@ | ||
660 | 660 | mutex_unlock(&u->iolock); |
661 | 661 | out: |
662 | 662 | return err; |
663 | ---- linux-5.1.20.orig/security/Kconfig | |
664 | -+++ linux-5.1.20/security/Kconfig | |
663 | +--- linux-5.1.21.orig/security/Kconfig | |
664 | ++++ linux-5.1.21/security/Kconfig | |
665 | 665 | @@ -287,5 +287,7 @@ config LSM |
666 | 666 | |
667 | 667 | If unsure, leave this as the default. |
@@ -670,8 +670,8 @@ | ||
670 | 670 | + |
671 | 671 | endmenu |
672 | 672 | |
673 | ---- linux-5.1.20.orig/security/Makefile | |
674 | -+++ linux-5.1.20/security/Makefile | |
673 | +--- linux-5.1.21.orig/security/Makefile | |
674 | ++++ linux-5.1.21/security/Makefile | |
675 | 675 | @@ -32,3 +32,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c |
676 | 676 | # Object integrity file lists |
677 | 677 | subdir-$(CONFIG_INTEGRITY) += integrity |
@@ -679,8 +679,8 @@ | ||
679 | 679 | + |
680 | 680 | +subdir-$(CONFIG_CCSECURITY) += ccsecurity |
681 | 681 | +obj-$(CONFIG_CCSECURITY) += ccsecurity/ |
682 | ---- linux-5.1.20.orig/security/security.c | |
683 | -+++ linux-5.1.20/security/security.c | |
682 | +--- linux-5.1.21.orig/security/security.c | |
683 | ++++ linux-5.1.21/security/security.c | |
684 | 684 | @@ -1457,7 +1457,9 @@ int security_task_alloc(struct task_stru |
685 | 685 | |
686 | 686 | if (rc) |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 5.2.3. | |
1 | +This is TOMOYO Linux patch for kernel 5.2.6. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.3.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.6.tar.xz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 - |
6 | 6 | fs/open.c | 2 + |
@@ -28,8 +28,8 @@ | ||
28 | 28 | security/security.c | 5 ++- |
29 | 29 | 24 files changed, 160 insertions(+), 30 deletions(-) |
30 | 30 | |
31 | ---- linux-5.2.3.orig/fs/exec.c | |
32 | -+++ linux-5.2.3/fs/exec.c | |
31 | +--- linux-5.2.6.orig/fs/exec.c | |
32 | ++++ linux-5.2.6/fs/exec.c | |
33 | 33 | @@ -1698,7 +1698,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,9 +39,9 @@ | ||
39 | 39 | if (ret >= 0) { |
40 | 40 | audit_bprm(bprm); |
41 | 41 | trace_sched_process_exec(current, old_pid, bprm); |
42 | ---- linux-5.2.3.orig/fs/open.c | |
43 | -+++ linux-5.2.3/fs/open.c | |
44 | -@@ -1181,6 +1181,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd) | |
42 | +--- linux-5.2.6.orig/fs/open.c | |
43 | ++++ linux-5.2.6/fs/open.c | |
44 | +@@ -1200,6 +1200,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd) | |
45 | 45 | */ |
46 | 46 | SYSCALL_DEFINE0(vhangup) |
47 | 47 | { |
@@ -50,8 +50,8 @@ | ||
50 | 50 | if (capable(CAP_SYS_TTY_CONFIG)) { |
51 | 51 | tty_vhangup_self(); |
52 | 52 | return 0; |
53 | ---- linux-5.2.3.orig/fs/proc/version.c | |
54 | -+++ linux-5.2.3/fs/proc/version.c | |
53 | +--- linux-5.2.6.orig/fs/proc/version.c | |
54 | ++++ linux-5.2.6/fs/proc/version.c | |
55 | 55 | @@ -21,3 +21,10 @@ static int __init proc_version_init(void |
56 | 56 | return 0; |
57 | 57 | } |
@@ -59,12 +59,12 @@ | ||
59 | 59 | + |
60 | 60 | +static int __init ccs_show_version(void) |
61 | 61 | +{ |
62 | -+ printk(KERN_INFO "Hook version: 5.2.3 2019/07/27\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 5.2.6 2019/08/06\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-5.2.3.orig/include/linux/sched.h | |
67 | -+++ linux-5.2.3/include/linux/sched.h | |
66 | +--- linux-5.2.6.orig/include/linux/sched.h | |
67 | ++++ linux-5.2.6/include/linux/sched.h | |
68 | 68 | @@ -35,6 +35,7 @@ struct audit_context; |
69 | 69 | struct backing_dev_info; |
70 | 70 | struct bio_list; |
@@ -73,7 +73,7 @@ | ||
73 | 73 | struct cfs_rq; |
74 | 74 | struct fs_struct; |
75 | 75 | struct futex_pi_state; |
76 | -@@ -1194,6 +1195,10 @@ struct task_struct { | |
76 | +@@ -1202,6 +1203,10 @@ struct task_struct { | |
77 | 77 | /* Used by LSM modules for access restriction: */ |
78 | 78 | void *security; |
79 | 79 | #endif |
@@ -84,8 +84,8 @@ | ||
84 | 84 | |
85 | 85 | #ifdef CONFIG_GCC_PLUGIN_STACKLEAK |
86 | 86 | unsigned long lowest_stack; |
87 | ---- linux-5.2.3.orig/include/linux/security.h | |
88 | -+++ linux-5.2.3/include/linux/security.h | |
87 | +--- linux-5.2.6.orig/include/linux/security.h | |
88 | ++++ linux-5.2.6/include/linux/security.h | |
89 | 89 | @@ -57,6 +57,7 @@ struct mm_struct; |
90 | 90 | struct fs_context; |
91 | 91 | struct fs_parameter; |
@@ -315,8 +315,8 @@ | ||
315 | 315 | } |
316 | 316 | #endif /* CONFIG_SECURITY_PATH */ |
317 | 317 | |
318 | ---- linux-5.2.3.orig/include/net/ip.h | |
319 | -+++ linux-5.2.3/include/net/ip.h | |
318 | +--- linux-5.2.6.orig/include/net/ip.h | |
319 | ++++ linux-5.2.6/include/net/ip.h | |
320 | 320 | @@ -302,6 +302,8 @@ void inet_get_local_port_range(struct ne |
321 | 321 | #ifdef CONFIG_SYSCTL |
322 | 322 | static inline int inet_is_local_reserved_port(struct net *net, int port) |
@@ -335,8 +335,8 @@ | ||
335 | 335 | return 0; |
336 | 336 | } |
337 | 337 | |
338 | ---- linux-5.2.3.orig/init/init_task.c | |
339 | -+++ linux-5.2.3/init/init_task.c | |
338 | +--- linux-5.2.6.orig/init/init_task.c | |
339 | ++++ linux-5.2.6/init/init_task.c | |
340 | 340 | @@ -180,6 +180,10 @@ struct task_struct init_task |
341 | 341 | #ifdef CONFIG_SECURITY |
342 | 342 | .security = NULL, |
@@ -348,8 +348,8 @@ | ||
348 | 348 | }; |
349 | 349 | EXPORT_SYMBOL(init_task); |
350 | 350 | |
351 | ---- linux-5.2.3.orig/kernel/kexec.c | |
352 | -+++ linux-5.2.3/kernel/kexec.c | |
351 | +--- linux-5.2.6.orig/kernel/kexec.c | |
352 | ++++ linux-5.2.6/kernel/kexec.c | |
353 | 353 | @@ -16,7 +16,7 @@ |
354 | 354 | #include <linux/syscalls.h> |
355 | 355 | #include <linux/vmalloc.h> |
@@ -368,8 +368,8 @@ | ||
368 | 368 | |
369 | 369 | /* Permit LSMs and IMA to fail the kexec */ |
370 | 370 | result = security_kernel_load_data(LOADING_KEXEC_IMAGE); |
371 | ---- linux-5.2.3.orig/kernel/module.c | |
372 | -+++ linux-5.2.3/kernel/module.c | |
371 | +--- linux-5.2.6.orig/kernel/module.c | |
372 | ++++ linux-5.2.6/kernel/module.c | |
373 | 373 | @@ -54,6 +54,7 @@ |
374 | 374 | #include <linux/audit.h> |
375 | 375 | #include <uapi/linux/module.h> |
@@ -396,8 +396,8 @@ | ||
396 | 396 | |
397 | 397 | return 0; |
398 | 398 | } |
399 | ---- linux-5.2.3.orig/kernel/ptrace.c | |
400 | -+++ linux-5.2.3/kernel/ptrace.c | |
399 | +--- linux-5.2.6.orig/kernel/ptrace.c | |
400 | ++++ linux-5.2.6/kernel/ptrace.c | |
401 | 401 | @@ -1137,6 +1137,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l |
402 | 402 | { |
403 | 403 | struct task_struct *child; |
@@ -422,8 +422,8 @@ | ||
422 | 422 | |
423 | 423 | if (request == PTRACE_TRACEME) { |
424 | 424 | ret = ptrace_traceme(); |
425 | ---- linux-5.2.3.orig/kernel/reboot.c | |
426 | -+++ linux-5.2.3/kernel/reboot.c | |
425 | +--- linux-5.2.6.orig/kernel/reboot.c | |
426 | ++++ linux-5.2.6/kernel/reboot.c | |
427 | 427 | @@ -17,6 +17,7 @@ |
428 | 428 | #include <linux/syscalls.h> |
429 | 429 | #include <linux/syscore_ops.h> |
@@ -441,8 +441,8 @@ | ||
441 | 441 | |
442 | 442 | /* |
443 | 443 | * If pid namespaces are enabled and the current task is in a child |
444 | ---- linux-5.2.3.orig/kernel/sched/core.c | |
445 | -+++ linux-5.2.3/kernel/sched/core.c | |
444 | +--- linux-5.2.6.orig/kernel/sched/core.c | |
445 | ++++ linux-5.2.6/kernel/sched/core.c | |
446 | 446 | @@ -3937,6 +3937,8 @@ int can_nice(const struct task_struct *p |
447 | 447 | SYSCALL_DEFINE1(nice, int, increment) |
448 | 448 | { |
@@ -452,8 +452,8 @@ | ||
452 | 452 | |
453 | 453 | /* |
454 | 454 | * Setpriority might change our priority at the same moment. |
455 | ---- linux-5.2.3.orig/kernel/signal.c | |
456 | -+++ linux-5.2.3/kernel/signal.c | |
455 | +--- linux-5.2.6.orig/kernel/signal.c | |
456 | ++++ linux-5.2.6/kernel/signal.c | |
457 | 457 | @@ -3615,6 +3615,8 @@ static inline void prepare_kill_siginfo( |
458 | 458 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
459 | 459 | { |
@@ -521,8 +521,8 @@ | ||
521 | 521 | |
522 | 522 | return do_send_specific(tgid, pid, sig, info); |
523 | 523 | } |
524 | ---- linux-5.2.3.orig/kernel/sys.c | |
525 | -+++ linux-5.2.3/kernel/sys.c | |
524 | +--- linux-5.2.6.orig/kernel/sys.c | |
525 | ++++ linux-5.2.6/kernel/sys.c | |
526 | 526 | @@ -204,6 +204,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
527 | 527 | |
528 | 528 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -552,8 +552,8 @@ | ||
552 | 552 | |
553 | 553 | errno = -EFAULT; |
554 | 554 | if (!copy_from_user(tmp, name, len)) { |
555 | ---- linux-5.2.3.orig/kernel/time/timekeeping.c | |
556 | -+++ linux-5.2.3/kernel/time/timekeeping.c | |
555 | +--- linux-5.2.6.orig/kernel/time/timekeeping.c | |
556 | ++++ linux-5.2.6/kernel/time/timekeeping.c | |
557 | 557 | @@ -22,6 +22,7 @@ |
558 | 558 | #include <linux/pvclock_gtod.h> |
559 | 559 | #include <linux/compiler.h> |
@@ -587,8 +587,8 @@ | ||
587 | 587 | |
588 | 588 | /* |
589 | 589 | * Validate if a timespec/timeval used to inject a time |
590 | ---- linux-5.2.3.orig/net/ipv4/raw.c | |
591 | -+++ linux-5.2.3/net/ipv4/raw.c | |
590 | +--- linux-5.2.6.orig/net/ipv4/raw.c | |
591 | ++++ linux-5.2.6/net/ipv4/raw.c | |
592 | 592 | @@ -767,6 +767,10 @@ static int raw_recvmsg(struct sock *sk, |
593 | 593 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
594 | 594 | if (!skb) |
@@ -600,8 +600,8 @@ | ||
600 | 600 | |
601 | 601 | copied = skb->len; |
602 | 602 | if (len < copied) { |
603 | ---- linux-5.2.3.orig/net/ipv4/udp.c | |
604 | -+++ linux-5.2.3/net/ipv4/udp.c | |
603 | +--- linux-5.2.6.orig/net/ipv4/udp.c | |
604 | ++++ linux-5.2.6/net/ipv4/udp.c | |
605 | 605 | @@ -1720,6 +1720,8 @@ try_again: |
606 | 606 | skb = __skb_recv_udp(sk, flags, noblock, &off, &err); |
607 | 607 | if (!skb) |
@@ -611,8 +611,8 @@ | ||
611 | 611 | |
612 | 612 | ulen = udp_skb_len(skb); |
613 | 613 | copied = len; |
614 | ---- linux-5.2.3.orig/net/ipv6/raw.c | |
615 | -+++ linux-5.2.3/net/ipv6/raw.c | |
614 | +--- linux-5.2.6.orig/net/ipv6/raw.c | |
615 | ++++ linux-5.2.6/net/ipv6/raw.c | |
616 | 616 | @@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk |
617 | 617 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
618 | 618 | if (!skb) |
@@ -624,8 +624,8 @@ | ||
624 | 624 | |
625 | 625 | copied = skb->len; |
626 | 626 | if (copied > len) { |
627 | ---- linux-5.2.3.orig/net/ipv6/udp.c | |
628 | -+++ linux-5.2.3/net/ipv6/udp.c | |
627 | +--- linux-5.2.6.orig/net/ipv6/udp.c | |
628 | ++++ linux-5.2.6/net/ipv6/udp.c | |
629 | 629 | @@ -299,6 +299,8 @@ try_again: |
630 | 630 | skb = __skb_recv_udp(sk, flags, noblock, &off, &err); |
631 | 631 | if (!skb) |
@@ -635,8 +635,8 @@ | ||
635 | 635 | |
636 | 636 | ulen = udp6_skb_len(skb); |
637 | 637 | copied = len; |
638 | ---- linux-5.2.3.orig/net/socket.c | |
639 | -+++ linux-5.2.3/net/socket.c | |
638 | +--- linux-5.2.6.orig/net/socket.c | |
639 | ++++ linux-5.2.6/net/socket.c | |
640 | 640 | @@ -1761,6 +1761,10 @@ int __sys_accept4(int fd, struct sockadd |
641 | 641 | if (err < 0) |
642 | 642 | goto out_fd; |
@@ -648,8 +648,8 @@ | ||
648 | 648 | if (upeer_sockaddr) { |
649 | 649 | len = newsock->ops->getname(newsock, |
650 | 650 | (struct sockaddr *)&address, 2); |
651 | ---- linux-5.2.3.orig/net/unix/af_unix.c | |
652 | -+++ linux-5.2.3/net/unix/af_unix.c | |
651 | +--- linux-5.2.6.orig/net/unix/af_unix.c | |
652 | ++++ linux-5.2.6/net/unix/af_unix.c | |
653 | 653 | @@ -2075,6 +2075,10 @@ static int unix_dgram_recvmsg(struct soc |
654 | 654 | EPOLLOUT | EPOLLWRNORM | |
655 | 655 | EPOLLWRBAND); |
@@ -669,8 +669,8 @@ | ||
669 | 669 | mutex_unlock(&u->iolock); |
670 | 670 | out: |
671 | 671 | return err; |
672 | ---- linux-5.2.3.orig/security/Kconfig | |
673 | -+++ linux-5.2.3/security/Kconfig | |
672 | +--- linux-5.2.6.orig/security/Kconfig | |
673 | ++++ linux-5.2.6/security/Kconfig | |
674 | 674 | @@ -290,5 +290,7 @@ config LSM |
675 | 675 | |
676 | 676 | source "security/Kconfig.hardening" |
@@ -679,8 +679,8 @@ | ||
679 | 679 | + |
680 | 680 | endmenu |
681 | 681 | |
682 | ---- linux-5.2.3.orig/security/Makefile | |
683 | -+++ linux-5.2.3/security/Makefile | |
682 | +--- linux-5.2.6.orig/security/Makefile | |
683 | ++++ linux-5.2.6/security/Makefile | |
684 | 684 | @@ -32,3 +32,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c |
685 | 685 | # Object integrity file lists |
686 | 686 | subdir-$(CONFIG_INTEGRITY) += integrity |
@@ -688,8 +688,8 @@ | ||
688 | 688 | + |
689 | 689 | +subdir-$(CONFIG_CCSECURITY) += ccsecurity |
690 | 690 | +obj-$(CONFIG_CCSECURITY) += ccsecurity/ |
691 | ---- linux-5.2.3.orig/security/security.c | |
692 | -+++ linux-5.2.3/security/security.c | |
691 | +--- linux-5.2.6.orig/security/security.c | |
692 | ++++ linux-5.2.6/security/security.c | |
693 | 693 | @@ -1464,7 +1464,9 @@ int security_task_alloc(struct task_stru |
694 | 694 | |
695 | 695 | if (rc) |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 5.3-rc1. | |
1 | +This is TOMOYO Linux patch for kernel 5.3-rc3. | |
2 | 2 | |
3 | -Source code for this patch is https://git.kernel.org/torvalds/t/linux-5.3-rc1.tar.gz | |
3 | +Source code for this patch is https://git.kernel.org/torvalds/t/linux-5.3-rc3.tar.gz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 - |
6 | 6 | fs/open.c | 2 + |
@@ -28,8 +28,8 @@ | ||
28 | 28 | security/security.c | 5 ++- |
29 | 29 | 24 files changed, 160 insertions(+), 30 deletions(-) |
30 | 30 | |
31 | ---- linux-5.3-rc1.orig/fs/exec.c | |
32 | -+++ linux-5.3-rc1/fs/exec.c | |
31 | +--- linux-5.3-rc3.orig/fs/exec.c | |
32 | ++++ linux-5.3-rc3/fs/exec.c | |
33 | 33 | @@ -1698,7 +1698,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,9 +39,9 @@ | ||
39 | 39 | if (ret >= 0) { |
40 | 40 | audit_bprm(bprm); |
41 | 41 | trace_sched_process_exec(current, old_pid, bprm); |
42 | ---- linux-5.3-rc1.orig/fs/open.c | |
43 | -+++ linux-5.3-rc1/fs/open.c | |
44 | -@@ -1181,6 +1181,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd) | |
42 | +--- linux-5.3-rc3.orig/fs/open.c | |
43 | ++++ linux-5.3-rc3/fs/open.c | |
44 | +@@ -1200,6 +1200,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd) | |
45 | 45 | */ |
46 | 46 | SYSCALL_DEFINE0(vhangup) |
47 | 47 | { |
@@ -50,8 +50,8 @@ | ||
50 | 50 | if (capable(CAP_SYS_TTY_CONFIG)) { |
51 | 51 | tty_vhangup_self(); |
52 | 52 | return 0; |
53 | ---- linux-5.3-rc1.orig/fs/proc/version.c | |
54 | -+++ linux-5.3-rc1/fs/proc/version.c | |
53 | +--- linux-5.3-rc3.orig/fs/proc/version.c | |
54 | ++++ linux-5.3-rc3/fs/proc/version.c | |
55 | 55 | @@ -21,3 +21,10 @@ static int __init proc_version_init(void |
56 | 56 | return 0; |
57 | 57 | } |
@@ -59,12 +59,12 @@ | ||
59 | 59 | + |
60 | 60 | +static int __init ccs_show_version(void) |
61 | 61 | +{ |
62 | -+ printk(KERN_INFO "Hook version: 5.3-rc1 2019/07/22\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 5.3-rc3 2019/08/06\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-5.3-rc1.orig/include/linux/sched.h | |
67 | -+++ linux-5.3-rc1/include/linux/sched.h | |
66 | +--- linux-5.3-rc3.orig/include/linux/sched.h | |
67 | ++++ linux-5.3-rc3/include/linux/sched.h | |
68 | 68 | @@ -36,6 +36,7 @@ struct backing_dev_info; |
69 | 69 | struct bio_list; |
70 | 70 | struct blk_plug; |
@@ -73,7 +73,7 @@ | ||
73 | 73 | struct cfs_rq; |
74 | 74 | struct fs_struct; |
75 | 75 | struct futex_pi_state; |
76 | -@@ -1260,6 +1261,10 @@ struct task_struct { | |
76 | +@@ -1268,6 +1269,10 @@ struct task_struct { | |
77 | 77 | /* Used by LSM modules for access restriction: */ |
78 | 78 | void *security; |
79 | 79 | #endif |
@@ -84,8 +84,8 @@ | ||
84 | 84 | |
85 | 85 | #ifdef CONFIG_GCC_PLUGIN_STACKLEAK |
86 | 86 | unsigned long lowest_stack; |
87 | ---- linux-5.3-rc1.orig/include/linux/security.h | |
88 | -+++ linux-5.3-rc1/include/linux/security.h | |
87 | +--- linux-5.3-rc3.orig/include/linux/security.h | |
88 | ++++ linux-5.3-rc3/include/linux/security.h | |
89 | 89 | @@ -57,6 +57,7 @@ struct mm_struct; |
90 | 90 | struct fs_context; |
91 | 91 | struct fs_parameter; |
@@ -315,8 +315,8 @@ | ||
315 | 315 | } |
316 | 316 | #endif /* CONFIG_SECURITY_PATH */ |
317 | 317 | |
318 | ---- linux-5.3-rc1.orig/include/net/ip.h | |
319 | -+++ linux-5.3-rc1/include/net/ip.h | |
318 | +--- linux-5.3-rc3.orig/include/net/ip.h | |
319 | ++++ linux-5.3-rc3/include/net/ip.h | |
320 | 320 | @@ -340,6 +340,8 @@ void inet_get_local_port_range(struct ne |
321 | 321 | #ifdef CONFIG_SYSCTL |
322 | 322 | static inline int inet_is_local_reserved_port(struct net *net, int port) |
@@ -335,8 +335,8 @@ | ||
335 | 335 | return 0; |
336 | 336 | } |
337 | 337 | |
338 | ---- linux-5.3-rc1.orig/init/init_task.c | |
339 | -+++ linux-5.3-rc1/init/init_task.c | |
338 | +--- linux-5.3-rc3.orig/init/init_task.c | |
339 | ++++ linux-5.3-rc3/init/init_task.c | |
340 | 340 | @@ -183,6 +183,10 @@ struct task_struct init_task |
341 | 341 | #ifdef CONFIG_SECURITY |
342 | 342 | .security = NULL, |
@@ -348,8 +348,8 @@ | ||
348 | 348 | }; |
349 | 349 | EXPORT_SYMBOL(init_task); |
350 | 350 | |
351 | ---- linux-5.3-rc1.orig/kernel/kexec.c | |
352 | -+++ linux-5.3-rc1/kernel/kexec.c | |
351 | +--- linux-5.3-rc3.orig/kernel/kexec.c | |
352 | ++++ linux-5.3-rc3/kernel/kexec.c | |
353 | 353 | @@ -16,7 +16,7 @@ |
354 | 354 | #include <linux/syscalls.h> |
355 | 355 | #include <linux/vmalloc.h> |
@@ -368,8 +368,8 @@ | ||
368 | 368 | |
369 | 369 | /* Permit LSMs and IMA to fail the kexec */ |
370 | 370 | result = security_kernel_load_data(LOADING_KEXEC_IMAGE); |
371 | ---- linux-5.3-rc1.orig/kernel/module.c | |
372 | -+++ linux-5.3-rc1/kernel/module.c | |
371 | +--- linux-5.3-rc3.orig/kernel/module.c | |
372 | ++++ linux-5.3-rc3/kernel/module.c | |
373 | 373 | @@ -54,6 +54,7 @@ |
374 | 374 | #include <linux/audit.h> |
375 | 375 | #include <uapi/linux/module.h> |
@@ -396,8 +396,8 @@ | ||
396 | 396 | |
397 | 397 | return 0; |
398 | 398 | } |
399 | ---- linux-5.3-rc1.orig/kernel/ptrace.c | |
400 | -+++ linux-5.3-rc1/kernel/ptrace.c | |
399 | +--- linux-5.3-rc3.orig/kernel/ptrace.c | |
400 | ++++ linux-5.3-rc3/kernel/ptrace.c | |
401 | 401 | @@ -1239,6 +1239,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l |
402 | 402 | { |
403 | 403 | struct task_struct *child; |
@@ -422,8 +422,8 @@ | ||
422 | 422 | |
423 | 423 | if (request == PTRACE_TRACEME) { |
424 | 424 | ret = ptrace_traceme(); |
425 | ---- linux-5.3-rc1.orig/kernel/reboot.c | |
426 | -+++ linux-5.3-rc1/kernel/reboot.c | |
425 | +--- linux-5.3-rc3.orig/kernel/reboot.c | |
426 | ++++ linux-5.3-rc3/kernel/reboot.c | |
427 | 427 | @@ -17,6 +17,7 @@ |
428 | 428 | #include <linux/syscalls.h> |
429 | 429 | #include <linux/syscore_ops.h> |
@@ -441,8 +441,8 @@ | ||
441 | 441 | |
442 | 442 | /* |
443 | 443 | * If pid namespaces are enabled and the current task is in a child |
444 | ---- linux-5.3-rc1.orig/kernel/sched/core.c | |
445 | -+++ linux-5.3-rc1/kernel/sched/core.c | |
444 | +--- linux-5.3-rc3.orig/kernel/sched/core.c | |
445 | ++++ linux-5.3-rc3/kernel/sched/core.c | |
446 | 446 | @@ -4372,6 +4372,8 @@ int can_nice(const struct task_struct *p |
447 | 447 | SYSCALL_DEFINE1(nice, int, increment) |
448 | 448 | { |
@@ -452,9 +452,9 @@ | ||
452 | 452 | |
453 | 453 | /* |
454 | 454 | * Setpriority might change our priority at the same moment. |
455 | ---- linux-5.3-rc1.orig/kernel/signal.c | |
456 | -+++ linux-5.3-rc1/kernel/signal.c | |
457 | -@@ -3628,6 +3628,8 @@ static inline void prepare_kill_siginfo( | |
455 | +--- linux-5.3-rc3.orig/kernel/signal.c | |
456 | ++++ linux-5.3-rc3/kernel/signal.c | |
457 | +@@ -3629,6 +3629,8 @@ static inline void prepare_kill_siginfo( | |
458 | 458 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
459 | 459 | { |
460 | 460 | struct kernel_siginfo info; |
@@ -463,7 +463,7 @@ | ||
463 | 463 | |
464 | 464 | prepare_kill_siginfo(sig, &info); |
465 | 465 | |
466 | -@@ -3723,6 +3725,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int, | |
466 | +@@ -3724,6 +3726,21 @@ SYSCALL_DEFINE4(pidfd_send_signal, int, | |
467 | 467 | if (!access_pidfd_pidns(pid)) |
468 | 468 | goto err; |
469 | 469 |
@@ -485,7 +485,7 @@ | ||
485 | 485 | if (info) { |
486 | 486 | ret = copy_siginfo_from_user_any(&kinfo, info); |
487 | 487 | if (unlikely(ret)) |
488 | -@@ -3807,6 +3824,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid | |
488 | +@@ -3808,6 +3825,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid | |
489 | 489 | /* This is only valid for single tasks */ |
490 | 490 | if (pid <= 0 || tgid <= 0) |
491 | 491 | return -EINVAL; |
@@ -494,7 +494,7 @@ | ||
494 | 494 | |
495 | 495 | return do_tkill(tgid, pid, sig); |
496 | 496 | } |
497 | -@@ -3823,6 +3842,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int, | |
497 | +@@ -3824,6 +3843,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int, | |
498 | 498 | /* This is only valid for single tasks */ |
499 | 499 | if (pid <= 0) |
500 | 500 | return -EINVAL; |
@@ -503,7 +503,7 @@ | ||
503 | 503 | |
504 | 504 | return do_tkill(0, pid, sig); |
505 | 505 | } |
506 | -@@ -3835,6 +3856,8 @@ static int do_rt_sigqueueinfo(pid_t pid, | |
506 | +@@ -3836,6 +3857,8 @@ static int do_rt_sigqueueinfo(pid_t pid, | |
507 | 507 | if ((info->si_code >= 0 || info->si_code == SI_TKILL) && |
508 | 508 | (task_pid_vnr(current) != pid)) |
509 | 509 | return -EPERM; |
@@ -512,7 +512,7 @@ | ||
512 | 512 | |
513 | 513 | /* POSIX.1b doesn't mention process groups. */ |
514 | 514 | return kill_proc_info(sig, info, pid); |
515 | -@@ -3882,6 +3905,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg | |
515 | +@@ -3883,6 +3906,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg | |
516 | 516 | if ((info->si_code >= 0 || info->si_code == SI_TKILL) && |
517 | 517 | (task_pid_vnr(current) != pid)) |
518 | 518 | return -EPERM; |
@@ -521,8 +521,8 @@ | ||
521 | 521 | |
522 | 522 | return do_send_specific(tgid, pid, sig, info); |
523 | 523 | } |
524 | ---- linux-5.3-rc1.orig/kernel/sys.c | |
525 | -+++ linux-5.3-rc1/kernel/sys.c | |
524 | +--- linux-5.3-rc3.orig/kernel/sys.c | |
525 | ++++ linux-5.3-rc3/kernel/sys.c | |
526 | 526 | @@ -204,6 +204,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
527 | 527 | |
528 | 528 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -552,8 +552,8 @@ | ||
552 | 552 | |
553 | 553 | errno = -EFAULT; |
554 | 554 | if (!copy_from_user(tmp, name, len)) { |
555 | ---- linux-5.3-rc1.orig/kernel/time/timekeeping.c | |
556 | -+++ linux-5.3-rc1/kernel/time/timekeeping.c | |
555 | +--- linux-5.3-rc3.orig/kernel/time/timekeeping.c | |
556 | ++++ linux-5.3-rc3/kernel/time/timekeeping.c | |
557 | 557 | @@ -22,6 +22,7 @@ |
558 | 558 | #include <linux/pvclock_gtod.h> |
559 | 559 | #include <linux/compiler.h> |
@@ -587,8 +587,8 @@ | ||
587 | 587 | |
588 | 588 | /* |
589 | 589 | * Validate if a timespec/timeval used to inject a time |
590 | ---- linux-5.3-rc1.orig/net/ipv4/raw.c | |
591 | -+++ linux-5.3-rc1/net/ipv4/raw.c | |
590 | +--- linux-5.3-rc3.orig/net/ipv4/raw.c | |
591 | ++++ linux-5.3-rc3/net/ipv4/raw.c | |
592 | 592 | @@ -767,6 +767,10 @@ static int raw_recvmsg(struct sock *sk, |
593 | 593 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
594 | 594 | if (!skb) |
@@ -600,8 +600,8 @@ | ||
600 | 600 | |
601 | 601 | copied = skb->len; |
602 | 602 | if (len < copied) { |
603 | ---- linux-5.3-rc1.orig/net/ipv4/udp.c | |
604 | -+++ linux-5.3-rc1/net/ipv4/udp.c | |
603 | +--- linux-5.3-rc3.orig/net/ipv4/udp.c | |
604 | ++++ linux-5.3-rc3/net/ipv4/udp.c | |
605 | 605 | @@ -1708,6 +1708,8 @@ try_again: |
606 | 606 | skb = __skb_recv_udp(sk, flags, noblock, &off, &err); |
607 | 607 | if (!skb) |
@@ -611,8 +611,8 @@ | ||
611 | 611 | |
612 | 612 | ulen = udp_skb_len(skb); |
613 | 613 | copied = len; |
614 | ---- linux-5.3-rc1.orig/net/ipv6/raw.c | |
615 | -+++ linux-5.3-rc1/net/ipv6/raw.c | |
614 | +--- linux-5.3-rc3.orig/net/ipv6/raw.c | |
615 | ++++ linux-5.3-rc3/net/ipv6/raw.c | |
616 | 616 | @@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk |
617 | 617 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
618 | 618 | if (!skb) |
@@ -624,8 +624,8 @@ | ||
624 | 624 | |
625 | 625 | copied = skb->len; |
626 | 626 | if (copied > len) { |
627 | ---- linux-5.3-rc1.orig/net/ipv6/udp.c | |
628 | -+++ linux-5.3-rc1/net/ipv6/udp.c | |
627 | +--- linux-5.3-rc3.orig/net/ipv6/udp.c | |
628 | ++++ linux-5.3-rc3/net/ipv6/udp.c | |
629 | 629 | @@ -287,6 +287,8 @@ try_again: |
630 | 630 | skb = __skb_recv_udp(sk, flags, noblock, &off, &err); |
631 | 631 | if (!skb) |
@@ -635,8 +635,8 @@ | ||
635 | 635 | |
636 | 636 | ulen = udp6_skb_len(skb); |
637 | 637 | copied = len; |
638 | ---- linux-5.3-rc1.orig/net/socket.c | |
639 | -+++ linux-5.3-rc1/net/socket.c | |
638 | +--- linux-5.3-rc3.orig/net/socket.c | |
639 | ++++ linux-5.3-rc3/net/socket.c | |
640 | 640 | @@ -1755,6 +1755,10 @@ int __sys_accept4(int fd, struct sockadd |
641 | 641 | if (err < 0) |
642 | 642 | goto out_fd; |
@@ -648,8 +648,8 @@ | ||
648 | 648 | if (upeer_sockaddr) { |
649 | 649 | len = newsock->ops->getname(newsock, |
650 | 650 | (struct sockaddr *)&address, 2); |
651 | ---- linux-5.3-rc1.orig/net/unix/af_unix.c | |
652 | -+++ linux-5.3-rc1/net/unix/af_unix.c | |
651 | +--- linux-5.3-rc3.orig/net/unix/af_unix.c | |
652 | ++++ linux-5.3-rc3/net/unix/af_unix.c | |
653 | 653 | @@ -2075,6 +2075,10 @@ static int unix_dgram_recvmsg(struct soc |
654 | 654 | EPOLLOUT | EPOLLWRNORM | |
655 | 655 | EPOLLWRBAND); |
@@ -669,8 +669,8 @@ | ||
669 | 669 | mutex_unlock(&u->iolock); |
670 | 670 | out: |
671 | 671 | return err; |
672 | ---- linux-5.3-rc1.orig/security/Kconfig | |
673 | -+++ linux-5.3-rc1/security/Kconfig | |
672 | +--- linux-5.3-rc3.orig/security/Kconfig | |
673 | ++++ linux-5.3-rc3/security/Kconfig | |
674 | 674 | @@ -290,5 +290,7 @@ config LSM |
675 | 675 | |
676 | 676 | source "security/Kconfig.hardening" |
@@ -679,8 +679,8 @@ | ||
679 | 679 | + |
680 | 680 | endmenu |
681 | 681 | |
682 | ---- linux-5.3-rc1.orig/security/Makefile | |
683 | -+++ linux-5.3-rc1/security/Makefile | |
682 | +--- linux-5.3-rc3.orig/security/Makefile | |
683 | ++++ linux-5.3-rc3/security/Makefile | |
684 | 684 | @@ -32,3 +32,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c |
685 | 685 | # Object integrity file lists |
686 | 686 | subdir-$(CONFIG_INTEGRITY) += integrity |
@@ -688,8 +688,8 @@ | ||
688 | 688 | + |
689 | 689 | +subdir-$(CONFIG_CCSECURITY) += ccsecurity |
690 | 690 | +obj-$(CONFIG_CCSECURITY) += ccsecurity/ |
691 | ---- linux-5.3-rc1.orig/security/security.c | |
692 | -+++ linux-5.3-rc1/security/security.c | |
691 | +--- linux-5.3-rc3.orig/security/security.c | |
692 | ++++ linux-5.3-rc3/security/security.c | |
693 | 693 | @@ -1467,7 +1467,9 @@ int security_task_alloc(struct task_stru |
694 | 694 | |
695 | 695 | if (rc) |
@@ -936,8 +936,12 @@ | ||
936 | 936 | } |
937 | 937 | /* Same with put_arg_page(page) in fs/exec.c */ |
938 | 938 | #ifdef CONFIG_MMU |
939 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0) | |
940 | + put_user_page(page); | |
941 | +#else | |
939 | 942 | put_page(page); |
940 | 943 | #endif |
944 | +#endif | |
941 | 945 | return true; |
942 | 946 | } |
943 | 947 |
@@ -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-754.15.3.el6.src.rpm ] | |
13 | +if [ ! -r kernel-2.6.32-754.17.1.el6.src.rpm ] | |
14 | 14 | then |
15 | - wget http://vault.centos.org/6.10/updates/Source/SPackages/kernel-2.6.32-754.15.3.el6.src.rpm || die "Can't download source package." | |
15 | + wget http://vault.centos.org/6.10/updates/Source/SPackages/kernel-2.6.32-754.17.1.el6.src.rpm || die "Can't download source package." | |
16 | 16 | fi |
17 | -LANG=C rpm --checksig kernel-2.6.32-754.15.3.el6.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature." | |
18 | -rpm -ivh kernel-2.6.32-754.15.3.el6.src.rpm || die "Can't install source package." | |
17 | +LANG=C rpm --checksig kernel-2.6.32-754.17.1.el6.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature." | |
18 | +rpm -ivh kernel-2.6.32-754.17.1.el6.src.rpm || die "Can't install source package." | |
19 | 19 | |
20 | 20 | cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ." |
21 | 21 | if [ ! -r caitsith-patch-0.2-20190506.tar.gz ] |
@@ -35,7 +35,7 @@ | ||
35 | 35 | -# % define buildid .local |
36 | 36 | +%define buildid _caitsith_0.2.3 |
37 | 37 | |
38 | - %define distro_build 754.15.3 | |
38 | + %define distro_build 754.17.1 | |
39 | 39 | %define kabi_build 754 |
40 | 40 | @@ -438,7 +438,7 @@ |
41 | 41 | # Packages that need to be installed before the kernel is, because the %post |
@@ -10,12 +10,12 @@ | ||
10 | 10 | |
11 | 11 | cd /tmp/ || die "Can't chdir to /tmp/ ." |
12 | 12 | |
13 | -if [ ! -r kernel-3.10.0-957.21.3.el7.src.rpm ] | |
13 | +if [ ! -r kernel-3.10.0-957.27.2.el7.src.rpm ] | |
14 | 14 | then |
15 | - wget http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-957.21.3.el7.src.rpm || die "Can't download source package." | |
15 | + wget http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-957.27.2.el7.src.rpm || die "Can't download source package." | |
16 | 16 | fi |
17 | -LANG=C rpm --checksig kernel-3.10.0-957.21.3.el7.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature." | |
18 | -rpm -ivh kernel-3.10.0-957.21.3.el7.src.rpm || die "Can't install source package." | |
17 | +LANG=C rpm --checksig kernel-3.10.0-957.27.2.el7.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature." | |
18 | +rpm -ivh kernel-3.10.0-957.27.2.el7.src.rpm || die "Can't install source package." | |
19 | 19 | |
20 | 20 | cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ." |
21 | 21 | if [ ! -r caitsith-patch-0.2-20190506.tar.gz ] |