(empty log message)
@@ -1,28 +1,28 @@ | ||
1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | 2 | <repomd xmlns="http://linux.duke.edu/metadata/repo" xmlns:rpm="http://linux.duke.edu/metadata/rpm"> |
3 | - <revision>1531545575</revision> | |
3 | + <revision>1536029613</revision> | |
4 | 4 | <data type="filelists"> |
5 | - <checksum type="sha256">6982cde9aa364a1d8d04b0e5c91902d255a6b3ef917d948dbd2c5379462cde80</checksum> | |
6 | - <open-checksum type="sha256">7b95dc591b9789918f651230a2f578b3d78c7b670e9ea1fb644a02d8f7322b7f</open-checksum> | |
5 | + <checksum type="sha256">b51226f94407927392247df8ef64047a2eab8dacca30218d3c06c380b9e1edb9</checksum> | |
6 | + <open-checksum type="sha256">0531e2134741e231157b3d44981fb5df607fb69d646d169e3acdc708cb1e3fdf</open-checksum> | |
7 | 7 | <location href="repodata/filelists.xml.gz"/> |
8 | - <timestamp>1531545576</timestamp> | |
9 | - <size>79318</size> | |
10 | - <open-size>1435761</open-size> | |
8 | + <timestamp>1536029613</timestamp> | |
9 | + <size>79324</size> | |
10 | + <open-size>1435970</open-size> | |
11 | 11 | </data> |
12 | 12 | <data type="other"> |
13 | - <checksum type="sha256">24627cbfb7bedd584a97eef574dc5b1b14873e0880ade762096c577740dc9a2c</checksum> | |
14 | - <open-checksum type="sha256">91f782c555152464b8ed048bab5f9f00159ce751ee2069b00b4e8c93e1daa5e6</open-checksum> | |
13 | + <checksum type="sha256">ea50968c9b3198ced21016e1955a4c7b3dbfd715d0e8a88fcc861db9b508b871</checksum> | |
14 | + <open-checksum type="sha256">277fcdf5617abbbf8711b3503db468aa210ff7368e6d7d798466605f2718096f</open-checksum> | |
15 | 15 | <location href="repodata/other.xml.gz"/> |
16 | - <timestamp>1531545576</timestamp> | |
17 | - <size>8093</size> | |
18 | - <open-size>75041</open-size> | |
16 | + <timestamp>1536029613</timestamp> | |
17 | + <size>9474</size> | |
18 | + <open-size>97658</open-size> | |
19 | 19 | </data> |
20 | 20 | <data type="primary"> |
21 | - <checksum type="sha256">a7a3fe636fcaa72839534736f636b0bc33e05370575dbd0e322d546cc9e3e266</checksum> | |
22 | - <open-checksum type="sha256">9a07cdaea702f341df22b82ed2d540dbe988ce44a31b402aa3807a06457a550a</open-checksum> | |
21 | + <checksum type="sha256">7d8cd326b6f717ae7477a757c181743cecfd8c9ac8bfade5943e7f83f13da4c4</checksum> | |
22 | + <open-checksum type="sha256">16fcfe30818d0c4dacfdf76236be3eb1eed95a4b8ec76aa99c452cb64be857d2</open-checksum> | |
23 | 23 | <location href="repodata/primary.xml.gz"/> |
24 | - <timestamp>1531545576</timestamp> | |
25 | - <size>160663</size> | |
26 | - <open-size>1111746</open-size> | |
24 | + <timestamp>1536029613</timestamp> | |
25 | + <size>160690</size> | |
26 | + <open-size>1111917</open-size> | |
27 | 27 | </data> |
28 | 28 | </repomd> |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 3.18.119. | |
1 | +This is TOMOYO Linux patch for kernel 3.18.120. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.119.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.120.tar.xz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 |
6 | 6 | fs/open.c | 2 |
@@ -29,8 +29,8 @@ | ||
29 | 29 | security/security.c | 111 +++++++++++++++++++++++++++++++++++++++++----- |
30 | 30 | 25 files changed, 252 insertions(+), 37 deletions(-) |
31 | 31 | |
32 | ---- linux-3.18.119.orig/fs/exec.c | |
33 | -+++ linux-3.18.119/fs/exec.c | |
32 | +--- linux-3.18.120.orig/fs/exec.c | |
33 | ++++ linux-3.18.120/fs/exec.c | |
34 | 34 | @@ -1463,7 +1463,7 @@ static int exec_binprm(struct linux_binp |
35 | 35 | old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent)); |
36 | 36 | rcu_read_unlock(); |
@@ -40,8 +40,8 @@ | ||
40 | 40 | if (ret >= 0) { |
41 | 41 | audit_bprm(bprm); |
42 | 42 | trace_sched_process_exec(current, old_pid, bprm); |
43 | ---- linux-3.18.119.orig/fs/open.c | |
44 | -+++ linux-3.18.119/fs/open.c | |
43 | +--- linux-3.18.120.orig/fs/open.c | |
44 | ++++ linux-3.18.120/fs/open.c | |
45 | 45 | @@ -1091,6 +1091,8 @@ EXPORT_SYMBOL(sys_close); |
46 | 46 | */ |
47 | 47 | SYSCALL_DEFINE0(vhangup) |
@@ -51,8 +51,8 @@ | ||
51 | 51 | if (capable(CAP_SYS_TTY_CONFIG)) { |
52 | 52 | tty_vhangup_self(); |
53 | 53 | return 0; |
54 | ---- linux-3.18.119.orig/fs/proc/version.c | |
55 | -+++ linux-3.18.119/fs/proc/version.c | |
54 | +--- linux-3.18.120.orig/fs/proc/version.c | |
55 | ++++ linux-3.18.120/fs/proc/version.c | |
56 | 56 | @@ -32,3 +32,10 @@ static int __init proc_version_init(void |
57 | 57 | return 0; |
58 | 58 | } |
@@ -60,12 +60,12 @@ | ||
60 | 60 | + |
61 | 61 | +static int __init ccs_show_version(void) |
62 | 62 | +{ |
63 | -+ printk(KERN_INFO "Hook version: 3.18.119 2018/08/25\n"); | |
63 | ++ printk(KERN_INFO "Hook version: 3.18.120 2018/09/04\n"); | |
64 | 64 | + return 0; |
65 | 65 | +} |
66 | 66 | +fs_initcall(ccs_show_version); |
67 | ---- linux-3.18.119.orig/include/linux/init_task.h | |
68 | -+++ linux-3.18.119/include/linux/init_task.h | |
67 | +--- linux-3.18.120.orig/include/linux/init_task.h | |
68 | ++++ linux-3.18.120/include/linux/init_task.h | |
69 | 69 | @@ -166,6 +166,14 @@ extern struct task_group root_task_group |
70 | 70 | # define INIT_RT_MUTEXES(tsk) |
71 | 71 | #endif |
@@ -89,8 +89,8 @@ | ||
89 | 89 | } |
90 | 90 | |
91 | 91 | |
92 | ---- linux-3.18.119.orig/include/linux/sched.h | |
93 | -+++ linux-3.18.119/include/linux/sched.h | |
92 | +--- linux-3.18.120.orig/include/linux/sched.h | |
93 | ++++ linux-3.18.120/include/linux/sched.h | |
94 | 94 | @@ -6,6 +6,8 @@ |
95 | 95 | #include <linux/sched/prio.h> |
96 | 96 |
@@ -111,8 +111,8 @@ | ||
111 | 111 | }; |
112 | 112 | |
113 | 113 | /* Future-safe accessor for struct task_struct's cpus_allowed. */ |
114 | ---- linux-3.18.119.orig/include/linux/security.h | |
115 | -+++ linux-3.18.119/include/linux/security.h | |
114 | +--- linux-3.18.120.orig/include/linux/security.h | |
115 | ++++ linux-3.18.120/include/linux/security.h | |
116 | 116 | @@ -53,6 +53,7 @@ struct msg_queue; |
117 | 117 | struct xattr; |
118 | 118 | struct xfrm_sec_ctx; |
@@ -324,8 +324,8 @@ | ||
324 | 324 | } |
325 | 325 | #endif /* CONFIG_SECURITY_PATH */ |
326 | 326 | |
327 | ---- linux-3.18.119.orig/include/net/ip.h | |
328 | -+++ linux-3.18.119/include/net/ip.h | |
327 | +--- linux-3.18.120.orig/include/net/ip.h | |
328 | ++++ linux-3.18.120/include/net/ip.h | |
329 | 329 | @@ -218,6 +218,8 @@ void inet_get_local_port_range(struct ne |
330 | 330 | #ifdef CONFIG_SYSCTL |
331 | 331 | static inline int inet_is_local_reserved_port(struct net *net, int port) |
@@ -344,8 +344,8 @@ | ||
344 | 344 | return 0; |
345 | 345 | } |
346 | 346 | #endif |
347 | ---- linux-3.18.119.orig/kernel/fork.c | |
348 | -+++ linux-3.18.119/kernel/fork.c | |
347 | +--- linux-3.18.120.orig/kernel/fork.c | |
348 | ++++ linux-3.18.120/kernel/fork.c | |
349 | 349 | @@ -246,6 +246,7 @@ void __put_task_struct(struct task_struc |
350 | 350 | delayacct_tsk_free(tsk); |
351 | 351 | put_signal_struct(tsk->signal); |
@@ -372,8 +372,8 @@ | ||
372 | 372 | bad_fork_cleanup_perf: |
373 | 373 | perf_event_free_task(p); |
374 | 374 | bad_fork_cleanup_policy: |
375 | ---- linux-3.18.119.orig/kernel/kexec.c | |
376 | -+++ linux-3.18.119/kernel/kexec.c | |
375 | +--- linux-3.18.120.orig/kernel/kexec.c | |
376 | ++++ linux-3.18.120/kernel/kexec.c | |
377 | 377 | @@ -41,6 +41,7 @@ |
378 | 378 | #include <asm/uaccess.h> |
379 | 379 | #include <asm/io.h> |
@@ -391,8 +391,8 @@ | ||
391 | 391 | |
392 | 392 | /* |
393 | 393 | * Verify we have a legal set of flags |
394 | ---- linux-3.18.119.orig/kernel/module.c | |
395 | -+++ linux-3.18.119/kernel/module.c | |
394 | +--- linux-3.18.120.orig/kernel/module.c | |
395 | ++++ linux-3.18.120/kernel/module.c | |
396 | 396 | @@ -62,6 +62,7 @@ |
397 | 397 | #include <linux/bsearch.h> |
398 | 398 | #include <uapi/linux/module.h> |
@@ -419,8 +419,8 @@ | ||
419 | 419 | |
420 | 420 | return 0; |
421 | 421 | } |
422 | ---- linux-3.18.119.orig/kernel/ptrace.c | |
423 | -+++ linux-3.18.119/kernel/ptrace.c | |
422 | +--- linux-3.18.120.orig/kernel/ptrace.c | |
423 | ++++ linux-3.18.120/kernel/ptrace.c | |
424 | 424 | @@ -1081,6 +1081,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l |
425 | 425 | { |
426 | 426 | struct task_struct *child; |
@@ -445,8 +445,8 @@ | ||
445 | 445 | |
446 | 446 | if (request == PTRACE_TRACEME) { |
447 | 447 | ret = ptrace_traceme(); |
448 | ---- linux-3.18.119.orig/kernel/reboot.c | |
449 | -+++ linux-3.18.119/kernel/reboot.c | |
448 | +--- linux-3.18.120.orig/kernel/reboot.c | |
449 | ++++ linux-3.18.120/kernel/reboot.c | |
450 | 450 | @@ -16,6 +16,7 @@ |
451 | 451 | #include <linux/syscalls.h> |
452 | 452 | #include <linux/syscore_ops.h> |
@@ -464,8 +464,8 @@ | ||
464 | 464 | |
465 | 465 | /* |
466 | 466 | * If pid namespaces are enabled and the current task is in a child |
467 | ---- linux-3.18.119.orig/kernel/sched/core.c | |
468 | -+++ linux-3.18.119/kernel/sched/core.c | |
467 | +--- linux-3.18.120.orig/kernel/sched/core.c | |
468 | ++++ linux-3.18.120/kernel/sched/core.c | |
469 | 469 | @@ -3218,6 +3218,8 @@ int can_nice(const struct task_struct *p |
470 | 470 | SYSCALL_DEFINE1(nice, int, increment) |
471 | 471 | { |
@@ -475,8 +475,8 @@ | ||
475 | 475 | |
476 | 476 | /* |
477 | 477 | * Setpriority might change our priority at the same moment. |
478 | ---- linux-3.18.119.orig/kernel/signal.c | |
479 | -+++ linux-3.18.119/kernel/signal.c | |
478 | +--- linux-3.18.120.orig/kernel/signal.c | |
479 | ++++ linux-3.18.120/kernel/signal.c | |
480 | 480 | @@ -2901,6 +2901,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s |
481 | 481 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
482 | 482 | { |
@@ -522,8 +522,8 @@ | ||
522 | 522 | |
523 | 523 | return do_send_specific(tgid, pid, sig, info); |
524 | 524 | } |
525 | ---- linux-3.18.119.orig/kernel/sys.c | |
526 | -+++ linux-3.18.119/kernel/sys.c | |
525 | +--- linux-3.18.120.orig/kernel/sys.c | |
526 | ++++ linux-3.18.120/kernel/sys.c | |
527 | 527 | @@ -171,6 +171,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
528 | 528 | |
529 | 529 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -553,8 +553,8 @@ | ||
553 | 553 | |
554 | 554 | down_write(&uts_sem); |
555 | 555 | errno = -EFAULT; |
556 | ---- linux-3.18.119.orig/kernel/time/ntp.c | |
557 | -+++ linux-3.18.119/kernel/time/ntp.c | |
556 | +--- linux-3.18.120.orig/kernel/time/ntp.c | |
557 | ++++ linux-3.18.120/kernel/time/ntp.c | |
558 | 558 | @@ -16,6 +16,7 @@ |
559 | 559 | #include <linux/mm.h> |
560 | 560 | #include <linux/module.h> |
@@ -588,8 +588,8 @@ | ||
588 | 588 | |
589 | 589 | /* |
590 | 590 | * Check for potential multiplication overflows that can |
591 | ---- linux-3.18.119.orig/net/ipv4/raw.c | |
592 | -+++ linux-3.18.119/net/ipv4/raw.c | |
591 | +--- linux-3.18.120.orig/net/ipv4/raw.c | |
592 | ++++ linux-3.18.120/net/ipv4/raw.c | |
593 | 593 | @@ -719,6 +719,10 @@ static int raw_recvmsg(struct kiocb *ioc |
594 | 594 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
595 | 595 | if (!skb) |
@@ -601,8 +601,8 @@ | ||
601 | 601 | |
602 | 602 | copied = skb->len; |
603 | 603 | if (len < copied) { |
604 | ---- linux-3.18.119.orig/net/ipv4/udp.c | |
605 | -+++ linux-3.18.119/net/ipv4/udp.c | |
604 | +--- linux-3.18.120.orig/net/ipv4/udp.c | |
605 | ++++ linux-3.18.120/net/ipv4/udp.c | |
606 | 606 | @@ -1266,6 +1266,10 @@ try_again: |
607 | 607 | &peeked, &off, &err); |
608 | 608 | if (!skb) |
@@ -614,8 +614,8 @@ | ||
614 | 614 | |
615 | 615 | ulen = skb->len - sizeof(struct udphdr); |
616 | 616 | copied = len; |
617 | ---- linux-3.18.119.orig/net/ipv6/raw.c | |
618 | -+++ linux-3.18.119/net/ipv6/raw.c | |
617 | +--- linux-3.18.120.orig/net/ipv6/raw.c | |
618 | ++++ linux-3.18.120/net/ipv6/raw.c | |
619 | 619 | @@ -478,6 +478,10 @@ static int rawv6_recvmsg(struct kiocb *i |
620 | 620 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
621 | 621 | if (!skb) |
@@ -627,8 +627,8 @@ | ||
627 | 627 | |
628 | 628 | copied = skb->len; |
629 | 629 | if (copied > len) { |
630 | ---- linux-3.18.119.orig/net/ipv6/udp.c | |
631 | -+++ linux-3.18.119/net/ipv6/udp.c | |
630 | +--- linux-3.18.120.orig/net/ipv6/udp.c | |
631 | ++++ linux-3.18.120/net/ipv6/udp.c | |
632 | 632 | @@ -403,6 +403,10 @@ try_again: |
633 | 633 | &peeked, &off, &err); |
634 | 634 | if (!skb) |
@@ -640,8 +640,8 @@ | ||
640 | 640 | |
641 | 641 | ulen = skb->len - sizeof(struct udphdr); |
642 | 642 | copied = len; |
643 | ---- linux-3.18.119.orig/net/socket.c | |
644 | -+++ linux-3.18.119/net/socket.c | |
643 | +--- linux-3.18.120.orig/net/socket.c | |
644 | ++++ linux-3.18.120/net/socket.c | |
645 | 645 | @@ -1637,6 +1637,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct |
646 | 646 | if (err < 0) |
647 | 647 | goto out_fd; |
@@ -653,8 +653,8 @@ | ||
653 | 653 | if (upeer_sockaddr) { |
654 | 654 | if (newsock->ops->getname(newsock, (struct sockaddr *)&address, |
655 | 655 | &len, 2) < 0) { |
656 | ---- linux-3.18.119.orig/net/unix/af_unix.c | |
657 | -+++ linux-3.18.119/net/unix/af_unix.c | |
656 | +--- linux-3.18.120.orig/net/unix/af_unix.c | |
657 | ++++ linux-3.18.120/net/unix/af_unix.c | |
658 | 658 | @@ -1981,6 +1981,10 @@ static int unix_dgram_recvmsg(struct kio |
659 | 659 | wake_up_interruptible_sync_poll(&u->peer_wait, |
660 | 660 | POLLOUT | POLLWRNORM | POLLWRBAND); |
@@ -666,8 +666,8 @@ | ||
666 | 666 | if (msg->msg_name) |
667 | 667 | unix_copy_addr(msg, skb->sk); |
668 | 668 | |
669 | ---- linux-3.18.119.orig/security/Kconfig | |
670 | -+++ linux-3.18.119/security/Kconfig | |
669 | +--- linux-3.18.120.orig/security/Kconfig | |
670 | ++++ linux-3.18.120/security/Kconfig | |
671 | 671 | @@ -167,5 +167,7 @@ config DEFAULT_SECURITY |
672 | 672 | default "yama" if DEFAULT_SECURITY_YAMA |
673 | 673 | default "" if DEFAULT_SECURITY_DAC |
@@ -676,8 +676,8 @@ | ||
676 | 676 | + |
677 | 677 | endmenu |
678 | 678 | |
679 | ---- linux-3.18.119.orig/security/Makefile | |
680 | -+++ linux-3.18.119/security/Makefile | |
679 | +--- linux-3.18.120.orig/security/Makefile | |
680 | ++++ linux-3.18.120/security/Makefile | |
681 | 681 | @@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c |
682 | 682 | # Object integrity file lists |
683 | 683 | subdir-$(CONFIG_INTEGRITY) += integrity |
@@ -685,8 +685,8 @@ | ||
685 | 685 | + |
686 | 686 | +subdir-$(CONFIG_CCSECURITY) += ccsecurity |
687 | 687 | +obj-$(CONFIG_CCSECURITY) += ccsecurity/ |
688 | ---- linux-3.18.119.orig/security/security.c | |
689 | -+++ linux-3.18.119/security/security.c | |
688 | +--- linux-3.18.120.orig/security/security.c | |
689 | ++++ linux-3.18.120/security/security.c | |
690 | 690 | @@ -203,7 +203,10 @@ int security_syslog(int type) |
691 | 691 | |
692 | 692 | int security_settime(const struct timespec *ts, const struct timezone *tz) |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 4.19-rc1. | |
1 | +This is TOMOYO Linux patch for kernel 4.19-rc2. | |
2 | 2 | |
3 | -Source code for this patch is https://git.kernel.org/torvalds/t/linux-4.19-rc1.tar.gz | |
3 | +Source code for this patch is https://git.kernel.org/torvalds/t/linux-4.19-rc2.tar.gz | |
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.orig/fs/exec.c | |
32 | -+++ linux/fs/exec.c | |
31 | +--- linux-4.19-rc2.orig/fs/exec.c | |
32 | ++++ linux-4.19-rc2/fs/exec.c | |
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,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.orig/fs/open.c | |
43 | -+++ linux/fs/open.c | |
42 | +--- linux-4.19-rc2.orig/fs/open.c | |
43 | ++++ linux-4.19-rc2/fs/open.c | |
44 | 44 | @@ -1174,6 +1174,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.orig/fs/proc/version.c | |
54 | -+++ linux/fs/proc/version.c | |
53 | +--- linux-4.19-rc2.orig/fs/proc/version.c | |
54 | ++++ linux-4.19-rc2/fs/proc/version.c | |
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-rc1 2018/08/27\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.19-rc2 2018/09/04\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux.orig/include/linux/sched.h | |
67 | -+++ linux/include/linux/sched.h | |
66 | +--- linux-4.19-rc2.orig/include/linux/sched.h | |
67 | ++++ linux-4.19-rc2/include/linux/sched.h | |
68 | 68 | @@ -34,6 +34,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.orig/include/linux/security.h | |
88 | -+++ linux/include/linux/security.h | |
87 | +--- linux-4.19-rc2.orig/include/linux/security.h | |
88 | ++++ linux-4.19-rc2/include/linux/security.h | |
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.orig/include/net/ip.h | |
310 | -+++ linux/include/net/ip.h | |
309 | +--- linux-4.19-rc2.orig/include/net/ip.h | |
310 | ++++ linux-4.19-rc2/include/net/ip.h | |
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.orig/init/init_task.c | |
330 | -+++ linux/init/init_task.c | |
329 | +--- linux-4.19-rc2.orig/init/init_task.c | |
330 | ++++ linux-4.19-rc2/init/init_task.c | |
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.orig/kernel/kexec.c | |
343 | -+++ linux/kernel/kexec.c | |
342 | +--- linux-4.19-rc2.orig/kernel/kexec.c | |
343 | ++++ linux-4.19-rc2/kernel/kexec.c | |
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.orig/kernel/module.c | |
363 | -+++ linux/kernel/module.c | |
362 | +--- linux-4.19-rc2.orig/kernel/module.c | |
363 | ++++ linux-4.19-rc2/kernel/module.c | |
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.orig/kernel/ptrace.c | |
391 | -+++ linux/kernel/ptrace.c | |
390 | +--- linux-4.19-rc2.orig/kernel/ptrace.c | |
391 | ++++ linux-4.19-rc2/kernel/ptrace.c | |
392 | 392 | @@ -1112,6 +1112,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.orig/kernel/reboot.c | |
417 | -+++ linux/kernel/reboot.c | |
416 | +--- linux-4.19-rc2.orig/kernel/reboot.c | |
417 | ++++ linux-4.19-rc2/kernel/reboot.c | |
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.orig/kernel/sched/core.c | |
436 | -+++ linux/kernel/sched/core.c | |
435 | +--- linux-4.19-rc2.orig/kernel/sched/core.c | |
436 | ++++ linux-4.19-rc2/kernel/sched/core.c | |
437 | 437 | @@ -3944,6 +3944,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.orig/kernel/signal.c | |
447 | -+++ linux/kernel/signal.c | |
446 | +--- linux-4.19-rc2.orig/kernel/signal.c | |
447 | ++++ linux-4.19-rc2/kernel/signal.c | |
448 | 448 | @@ -3210,6 +3210,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.orig/kernel/sys.c | |
494 | -+++ linux/kernel/sys.c | |
493 | +--- linux-4.19-rc2.orig/kernel/sys.c | |
494 | ++++ linux-4.19-rc2/kernel/sys.c | |
495 | 495 | @@ -204,6 +204,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.orig/kernel/time/timekeeping.c | |
525 | -+++ linux/kernel/time/timekeeping.c | |
524 | +--- linux-4.19-rc2.orig/kernel/time/timekeeping.c | |
525 | ++++ linux-4.19-rc2/kernel/time/timekeeping.c | |
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.orig/net/ipv4/raw.c | |
560 | -+++ linux/net/ipv4/raw.c | |
559 | +--- linux-4.19-rc2.orig/net/ipv4/raw.c | |
560 | ++++ linux-4.19-rc2/net/ipv4/raw.c | |
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.orig/net/ipv4/udp.c | |
573 | -+++ linux/net/ipv4/udp.c | |
572 | +--- linux-4.19-rc2.orig/net/ipv4/udp.c | |
573 | ++++ linux-4.19-rc2/net/ipv4/udp.c | |
574 | 574 | @@ -1655,6 +1655,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.orig/net/ipv6/raw.c | |
584 | -+++ linux/net/ipv6/raw.c | |
583 | +--- linux-4.19-rc2.orig/net/ipv6/raw.c | |
584 | ++++ linux-4.19-rc2/net/ipv6/raw.c | |
585 | 585 | @@ -483,6 +483,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.orig/net/ipv6/udp.c | |
597 | -+++ linux/net/ipv6/udp.c | |
596 | +--- linux-4.19-rc2.orig/net/ipv6/udp.c | |
597 | ++++ linux-4.19-rc2/net/ipv6/udp.c | |
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.orig/net/socket.c | |
608 | -+++ linux/net/socket.c | |
607 | +--- linux-4.19-rc2.orig/net/socket.c | |
608 | ++++ linux-4.19-rc2/net/socket.c | |
609 | 609 | @@ -1589,6 +1589,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.orig/net/unix/af_unix.c | |
621 | -+++ linux/net/unix/af_unix.c | |
620 | +--- linux-4.19-rc2.orig/net/unix/af_unix.c | |
621 | ++++ linux-4.19-rc2/net/unix/af_unix.c | |
622 | 622 | @@ -2127,6 +2127,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.orig/security/Kconfig | |
642 | -+++ linux/security/Kconfig | |
641 | +--- linux-4.19-rc2.orig/security/Kconfig | |
642 | ++++ linux-4.19-rc2/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.orig/security/Makefile | |
652 | -+++ linux/security/Makefile | |
651 | +--- linux-4.19-rc2.orig/security/Makefile | |
652 | ++++ linux-4.19-rc2/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.orig/security/security.c | |
661 | -+++ linux/security/security.c | |
660 | +--- linux-4.19-rc2.orig/security/security.c | |
661 | ++++ linux-4.19-rc2/security/security.c | |
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.152. | |
1 | +This is TOMOYO Linux patch for kernel 4.4.153. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.152.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.153.tar.xz | |
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.152.orig/fs/exec.c | |
32 | -+++ linux-4.4.152/fs/exec.c | |
31 | +--- linux-4.4.153.orig/fs/exec.c | |
32 | ++++ linux-4.4.153/fs/exec.c | |
33 | 33 | @@ -1508,7 +1508,7 @@ static int exec_binprm(struct linux_binp |
34 | 34 | old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent)); |
35 | 35 | rcu_read_unlock(); |
@@ -39,8 +39,8 @@ | ||
39 | 39 | if (ret >= 0) { |
40 | 40 | audit_bprm(bprm); |
41 | 41 | trace_sched_process_exec(current, old_pid, bprm); |
42 | ---- linux-4.4.152.orig/fs/open.c | |
43 | -+++ linux-4.4.152/fs/open.c | |
42 | +--- linux-4.4.153.orig/fs/open.c | |
43 | ++++ linux-4.4.153/fs/open.c | |
44 | 44 | @@ -1117,6 +1117,8 @@ EXPORT_SYMBOL(sys_close); |
45 | 45 | */ |
46 | 46 | SYSCALL_DEFINE0(vhangup) |
@@ -50,8 +50,8 @@ | ||
50 | 50 | if (capable(CAP_SYS_TTY_CONFIG)) { |
51 | 51 | tty_vhangup_self(); |
52 | 52 | return 0; |
53 | ---- linux-4.4.152.orig/fs/proc/version.c | |
54 | -+++ linux-4.4.152/fs/proc/version.c | |
53 | +--- linux-4.4.153.orig/fs/proc/version.c | |
54 | ++++ linux-4.4.153/fs/proc/version.c | |
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.152 2018/08/25\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.4.153 2018/09/04\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-4.4.152.orig/include/linux/init_task.h | |
67 | -+++ linux-4.4.152/include/linux/init_task.h | |
66 | +--- linux-4.4.153.orig/include/linux/init_task.h | |
67 | ++++ linux-4.4.153/include/linux/init_task.h | |
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.152.orig/include/linux/sched.h | |
92 | -+++ linux-4.4.152/include/linux/sched.h | |
91 | +--- linux-4.4.153.orig/include/linux/sched.h | |
92 | ++++ linux-4.4.153/include/linux/sched.h | |
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.152.orig/include/linux/security.h | |
114 | -+++ linux-4.4.152/include/linux/security.h | |
113 | +--- linux-4.4.153.orig/include/linux/security.h | |
114 | ++++ linux-4.4.153/include/linux/security.h | |
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.152.orig/include/net/ip.h | |
322 | -+++ linux-4.4.152/include/net/ip.h | |
321 | +--- linux-4.4.153.orig/include/net/ip.h | |
322 | ++++ linux-4.4.153/include/net/ip.h | |
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.152.orig/kernel/fork.c | |
342 | -+++ linux-4.4.152/kernel/fork.c | |
341 | +--- linux-4.4.153.orig/kernel/fork.c | |
342 | ++++ linux-4.4.153/kernel/fork.c | |
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.152.orig/kernel/kexec.c | |
370 | -+++ linux-4.4.152/kernel/kexec.c | |
369 | +--- linux-4.4.153.orig/kernel/kexec.c | |
370 | ++++ linux-4.4.153/kernel/kexec.c | |
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.152.orig/kernel/module.c | |
390 | -+++ linux-4.4.152/kernel/module.c | |
389 | +--- linux-4.4.153.orig/kernel/module.c | |
390 | ++++ linux-4.4.153/kernel/module.c | |
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.152.orig/kernel/ptrace.c | |
418 | -+++ linux-4.4.152/kernel/ptrace.c | |
417 | +--- linux-4.4.153.orig/kernel/ptrace.c | |
418 | ++++ linux-4.4.153/kernel/ptrace.c | |
419 | 419 | @@ -1085,6 +1085,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.152.orig/kernel/reboot.c | |
444 | -+++ linux-4.4.152/kernel/reboot.c | |
443 | +--- linux-4.4.153.orig/kernel/reboot.c | |
444 | ++++ linux-4.4.153/kernel/reboot.c | |
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.152.orig/kernel/sched/core.c | |
463 | -+++ linux-4.4.152/kernel/sched/core.c | |
462 | +--- linux-4.4.153.orig/kernel/sched/core.c | |
463 | ++++ linux-4.4.153/kernel/sched/core.c | |
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.152.orig/kernel/signal.c | |
474 | -+++ linux-4.4.152/kernel/signal.c | |
473 | +--- linux-4.4.153.orig/kernel/signal.c | |
474 | ++++ linux-4.4.153/kernel/signal.c | |
475 | 475 | @@ -2868,6 +2868,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.152.orig/kernel/sys.c | |
521 | -+++ linux-4.4.152/kernel/sys.c | |
520 | +--- linux-4.4.153.orig/kernel/sys.c | |
521 | ++++ linux-4.4.153/kernel/sys.c | |
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 | down_write(&uts_sem); |
550 | 550 | errno = -EFAULT; |
551 | ---- linux-4.4.152.orig/kernel/time/ntp.c | |
552 | -+++ linux-4.4.152/kernel/time/ntp.c | |
551 | +--- linux-4.4.153.orig/kernel/time/ntp.c | |
552 | ++++ linux-4.4.153/kernel/time/ntp.c | |
553 | 553 | @@ -16,6 +16,7 @@ |
554 | 554 | #include <linux/mm.h> |
555 | 555 | #include <linux/module.h> |
@@ -583,8 +583,8 @@ | ||
583 | 583 | |
584 | 584 | if (txc->modes & ADJ_NANO) { |
585 | 585 | struct timespec ts; |
586 | ---- linux-4.4.152.orig/net/ipv4/raw.c | |
587 | -+++ linux-4.4.152/net/ipv4/raw.c | |
586 | +--- linux-4.4.153.orig/net/ipv4/raw.c | |
587 | ++++ linux-4.4.153/net/ipv4/raw.c | |
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.152.orig/net/ipv4/udp.c | |
600 | -+++ linux-4.4.152/net/ipv4/udp.c | |
599 | +--- linux-4.4.153.orig/net/ipv4/udp.c | |
600 | ++++ linux-4.4.153/net/ipv4/udp.c | |
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.152.orig/net/ipv6/raw.c | |
613 | -+++ linux-4.4.152/net/ipv6/raw.c | |
612 | +--- linux-4.4.153.orig/net/ipv6/raw.c | |
613 | ++++ linux-4.4.153/net/ipv6/raw.c | |
614 | 614 | @@ -478,6 +478,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.152.orig/net/ipv6/udp.c | |
626 | -+++ linux-4.4.152/net/ipv6/udp.c | |
625 | +--- linux-4.4.153.orig/net/ipv6/udp.c | |
626 | ++++ linux-4.4.153/net/ipv6/udp.c | |
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.152.orig/net/socket.c | |
639 | -+++ linux-4.4.152/net/socket.c | |
638 | +--- linux-4.4.153.orig/net/socket.c | |
639 | ++++ linux-4.4.153/net/socket.c | |
640 | 640 | @@ -1477,6 +1477,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.152.orig/net/unix/af_unix.c | |
652 | -+++ linux-4.4.152/net/unix/af_unix.c | |
651 | +--- linux-4.4.153.orig/net/unix/af_unix.c | |
652 | ++++ linux-4.4.153/net/unix/af_unix.c | |
653 | 653 | @@ -2144,6 +2144,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.152.orig/security/Kconfig | |
665 | -+++ linux-4.4.152/security/Kconfig | |
664 | +--- linux-4.4.153.orig/security/Kconfig | |
665 | ++++ linux-4.4.153/security/Kconfig | |
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.152.orig/security/Makefile | |
675 | -+++ linux-4.4.152/security/Makefile | |
674 | +--- linux-4.4.153.orig/security/Makefile | |
675 | ++++ linux-4.4.153/security/Makefile | |
676 | 676 | @@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c |
677 | 677 | # Object integrity file lists |
678 | 678 | subdir-$(CONFIG_INTEGRITY) += integrity |