(empty log message)
@@ -304,12 +304,12 @@ | ||
304 | 304 | <p>Run the following commands in order to extract source code of CaitSith:</p> |
305 | 305 | |
306 | 306 | <pre class="command"> |
307 | -# wget -O caitsith-patch-0.2-20161030.tar.gz 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20161030.tar.gz' | |
308 | -# wget -O caitsith-patch-0.2-20161030.tar.gz.asc 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20161030.tar.gz.asc' | |
307 | +# wget -O caitsith-patch-0.2-20161229.tar.gz 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20161229.tar.gz' | |
308 | +# wget -O caitsith-patch-0.2-20161229.tar.gz.asc 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20161229.tar.gz.asc' | |
309 | 309 | # wget https://tomoyo.osdn.jp/kumaneko-key |
310 | 310 | # gpg --import kumaneko-key |
311 | -# gpg caitsith-patch-0.2-20161030.tar.gz.asc | |
312 | -# tar -zxf caitsith-patch-0.2-20161030.tar.gz | |
311 | +# gpg caitsith-patch-0.2-20161229.tar.gz.asc | |
312 | +# tar -zxf caitsith-patch-0.2-20161229.tar.gz | |
313 | 313 | </pre> |
314 | 314 | |
315 | 315 | <hr> |
@@ -423,10 +423,10 @@ | ||
423 | 423 | <p>Make sure the dependencies described above have been installed. Compile and install the tools with the following commands. (Please use USRLIBDIR=/usr/lib or USRLIBDIR=/usr/lib32 if needed):</p> |
424 | 424 | |
425 | 425 | <pre class="command"> |
426 | -$ wget -O caitsith-tools-0.2-20161016.tar.gz 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66538/caitsith-tools-0.2-20161016.tar.gz' | |
427 | -$ wget -O caitsith-tools-0.2-20161016.tar.gz.asc 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66538/caitsith-tools-0.2-20161016.tar.gz.asc' | |
428 | -$ gpg caitsith-tools-0.2-20161016.tar.gz.asc | |
429 | -$ tar -zxf caitsith-tools-0.2-20161016.tar.gz | |
426 | +$ wget -O caitsith-tools-0.2-20161229.tar.gz 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66538/caitsith-tools-0.2-20161229.tar.gz' | |
427 | +$ wget -O caitsith-tools-0.2-20161229.tar.gz.asc 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66538/caitsith-tools-0.2-20161229.tar.gz.asc' | |
428 | +$ gpg caitsith-tools-0.2-20161229.tar.gz.asc | |
429 | +$ tar -zxf caitsith-tools-0.2-20161229.tar.gz | |
430 | 430 | $ cd caitsith-tools/ |
431 | 431 | $ make -s USRLIBDIR=/usr/lib64 |
432 | 432 | $ su |
@@ -448,7 +448,7 @@ | ||
448 | 448 | <p>FYI: If your system has rpm-build package installed, you can make a tools RPM package with the following commands:</p> |
449 | 449 | |
450 | 450 | <pre class="command"> |
451 | -$ rpmbuild -tb caitsith-tools-0.2-20161016.tar.gz | |
451 | +$ rpmbuild -tb caitsith-tools-0.2-20161229.tar.gz | |
452 | 452 | </pre> |
453 | 453 | |
454 | 454 | <hr> |
@@ -603,16 +603,16 @@ | ||
603 | 603 | Linux kernel 4.0 and later are supported from the linux-4 tree.</p> |
604 | 604 | |
605 | 605 | <p>Extract the kernel source and go to the extracted directory.<br> |
606 | -In the operations below, "$VERSION" should be replaced with appropriate kernel version. For example "4.6" if using Linux kernel 4.6.4, "2.6.27" if using Linux kernel 2.6.27.62.<br> | |
606 | +In the operations below, "$VERSION" should be replaced with appropriate kernel version. For example "4.8" if using Linux kernel 4.8.15, "2.6.27" if using Linux kernel 2.6.27.62.<br> | |
607 | 607 | Also, there are several patches which can be applied to distributor's latest kernels. For example "2.6.32-centos-6" if using CentOS 6's latest kernel:</p> |
608 | 608 | |
609 | 609 | <pre class="command"> |
610 | -$ wget -O caitsith-patch-0.2-20161030.tar.gz 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20161030.tar.gz' | |
611 | -$ wget -O caitsith-patch-0.2-20161030.tar.gz.asc 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20161030.tar.gz.asc' | |
610 | +$ wget -O caitsith-patch-0.2-20161229.tar.gz 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20161229.tar.gz' | |
611 | +$ wget -O caitsith-patch-0.2-20161229.tar.gz.asc 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66537/caitsith-patch-0.2-20161229.tar.gz.asc' | |
612 | 612 | $ wget https://tomoyo.osdn.jp/kumaneko-key |
613 | 613 | $ gpg --import kumaneko-key |
614 | -$ gpg caitsith-patch-0.2-20161030.tar.gz.asc | |
615 | -$ tar -zxf caitsith-patch-0.2-20161030.tar.gz | |
614 | +$ gpg caitsith-patch-0.2-20161229.tar.gz.asc | |
615 | +$ tar -zxf caitsith-patch-0.2-20161229.tar.gz | |
616 | 616 | $ sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' -- patches/ccs-patch-*.diff |
617 | 617 | $ patch -sp1 < patches/ccs-patch-$VERSION.diff |
618 | 618 | </pre> |
@@ -679,10 +679,10 @@ | ||
679 | 679 | <p>Make sure the dependencies described above have been installed. Compile and install the tools with the following commands. (Please use USRLIBDIR=/usr/lib or USRLIBDIR=/usr/lib32 if needed):</p> |
680 | 680 | |
681 | 681 | <pre class="command"> |
682 | -$ wget -O caitsith-tools-0.2-20161016.tar.gz 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66538/caitsith-tools-0.2-20161016.tar.gz' | |
683 | -$ wget -O caitsith-tools-0.2-20161016.tar.gz.asc 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66538/caitsith-tools-0.2-20161016.tar.gz.asc' | |
684 | -$ gpg caitsith-tools-0.2-20161016.tar.gz.asc | |
685 | -$ tar -zxf caitsith-tools-0.2-20161016.tar.gz | |
682 | +$ wget -O caitsith-tools-0.2-20161229.tar.gz 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66538/caitsith-tools-0.2-20161229.tar.gz' | |
683 | +$ wget -O caitsith-tools-0.2-20161229.tar.gz.asc 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66538/caitsith-tools-0.2-20161229.tar.gz.asc' | |
684 | +$ gpg caitsith-tools-0.2-20161229.tar.gz.asc | |
685 | +$ tar -zxf caitsith-tools-0.2-20161229.tar.gz | |
686 | 686 | $ cd caitsith-tools/ |
687 | 687 | $ make -s USRLIBDIR=/usr/lib64 |
688 | 688 | $ su |
@@ -704,7 +704,7 @@ | ||
704 | 704 | <p>FYI: If your system has rpm-build package installed, you can make a tools RPM package with the following commands:</p> |
705 | 705 | |
706 | 706 | <pre class="command"> |
707 | -$ rpmbuild -tb caitsith-tools-0.2-20161016.tar.gz | |
707 | +$ rpmbuild -tb caitsith-tools-0.2-20161229.tar.gz | |
708 | 708 | </pre> |
709 | 709 | |
710 | 710 | <hr> |
@@ -4485,7 +4485,7 @@ | ||
4485 | 4485 | <li>Otherwise, do not use execute handler.</li> |
4486 | 4486 | </ul> |
4487 | 4487 | |
4488 | -<p>Please see usr_lib_caitsith/audit-exec-param.c included in the caitsith-tools-0.2-20161016.tar.gz for example for using as execute handler program.</p> | |
4488 | +<p>Please see usr_lib_caitsith/audit-exec-param.c included in the caitsith-tools-0.2-20161229.tar.gz as an example of using execute handler program.</p> | |
4489 | 4489 | |
4490 | 4490 | <hr> |
4491 | 4491 | <a href="#index">Return to index.</a> |
@@ -141,10 +141,12 @@ | ||
141 | 141 | <p>Make sure the dependencies described above have been installed. Compile and install the tools with the following commands. (Please use USRLIBDIR=/usr/lib or USRLIBDIR=/usr/lib32 if needed):</p> |
142 | 142 | |
143 | 143 | <pre class="command"> |
144 | -$ wget -O caitsith-tools-0.2-20161016.tar.gz 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66538/caitsith-tools-0.2-20161016.tar.gz' | |
145 | -$ wget -O caitsith-tools-0.2-20161016.tar.gz.asc 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66538/caitsith-tools-0.2-20161016.tar.gz.asc' | |
146 | -$ gpg caitsith-tools-0.2-20161016.tar.gz.asc | |
147 | -$ tar -zxf caitsith-tools-0.2-20161016.tar.gz | |
144 | +$ wget -O caitsith-tools-0.2-20161229.tar.gz 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66538/caitsith-tools-0.2-20161229.tar.gz' | |
145 | +$ wget -O caitsith-tools-0.2-20161229.tar.gz.asc 'http://osdn.jp/frs/redir.php?m=jaist&f=/caitsith/66538/caitsith-tools-0.2-20161229.tar.gz.asc' | |
146 | +$ wget https://tomoyo.osdn.jp/kumaneko-key | |
147 | +$ gpg --import kumaneko-key | |
148 | +$ gpg caitsith-tools-0.2-20161229.tar.gz.asc | |
149 | +$ tar -zxf caitsith-tools-0.2-20161229.tar.gz | |
148 | 150 | $ cd caitsith-tools/ |
149 | 151 | $ make -s USRLIBDIR=/usr/lib64 |
150 | 152 | $ su |
@@ -166,7 +168,7 @@ | ||
166 | 168 | <p>FYI: If your system has rpm-build package installed, you can make a tools RPM package with the following commands:</p> |
167 | 169 | |
168 | 170 | <pre class="command"> |
169 | -$ rpmbuild -tb caitsith-tools-0.2-20161016.tar.gz | |
171 | +$ rpmbuild -tb caitsith-tools-0.2-20161229.tar.gz | |
170 | 172 | </pre> |
171 | 173 | |
172 | 174 | <p>If your system has alien package installed, you can convert the RPM package into a DEB package with the following commands:</p> |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 3.18.45. | |
1 | +This is TOMOYO Linux patch for kernel 3.18.46. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.45.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.46.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.45.orig/fs/exec.c | |
33 | -+++ linux-3.18.45/fs/exec.c | |
32 | +--- linux-3.18.46.orig/fs/exec.c | |
33 | ++++ linux-3.18.46/fs/exec.c | |
34 | 34 | @@ -1436,7 +1436,7 @@ static int exec_binprm(struct linux_binp |
35 | 35 | old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent)); |
36 | 36 | rcu_read_unlock(); |
@@ -40,8 +40,8 @@ | ||
40 | 40 | if (ret >= 0) { |
41 | 41 | audit_bprm(bprm); |
42 | 42 | trace_sched_process_exec(current, old_pid, bprm); |
43 | ---- linux-3.18.45.orig/fs/open.c | |
44 | -+++ linux-3.18.45/fs/open.c | |
43 | +--- linux-3.18.46.orig/fs/open.c | |
44 | ++++ linux-3.18.46/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.45.orig/fs/proc/version.c | |
55 | -+++ linux-3.18.45/fs/proc/version.c | |
54 | +--- linux-3.18.46.orig/fs/proc/version.c | |
55 | ++++ linux-3.18.46/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.45 2016/12/04\n"); | |
63 | ++ printk(KERN_INFO "Hook version: 3.18.46 2016/12/29\n"); | |
64 | 64 | + return 0; |
65 | 65 | +} |
66 | 66 | +fs_initcall(ccs_show_version); |
67 | ---- linux-3.18.45.orig/include/linux/init_task.h | |
68 | -+++ linux-3.18.45/include/linux/init_task.h | |
67 | +--- linux-3.18.46.orig/include/linux/init_task.h | |
68 | ++++ linux-3.18.46/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.45.orig/include/linux/sched.h | |
93 | -+++ linux-3.18.45/include/linux/sched.h | |
92 | +--- linux-3.18.46.orig/include/linux/sched.h | |
93 | ++++ linux-3.18.46/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.45.orig/include/linux/security.h | |
115 | -+++ linux-3.18.45/include/linux/security.h | |
114 | +--- linux-3.18.46.orig/include/linux/security.h | |
115 | ++++ linux-3.18.46/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.45.orig/include/net/ip.h | |
328 | -+++ linux-3.18.45/include/net/ip.h | |
327 | +--- linux-3.18.46.orig/include/net/ip.h | |
328 | ++++ linux-3.18.46/include/net/ip.h | |
329 | 329 | @@ -216,6 +216,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.45.orig/kernel/fork.c | |
348 | -+++ linux-3.18.45/kernel/fork.c | |
347 | +--- linux-3.18.46.orig/kernel/fork.c | |
348 | ++++ linux-3.18.46/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.45.orig/kernel/kexec.c | |
376 | -+++ linux-3.18.45/kernel/kexec.c | |
375 | +--- linux-3.18.46.orig/kernel/kexec.c | |
376 | ++++ linux-3.18.46/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.45.orig/kernel/module.c | |
395 | -+++ linux-3.18.45/kernel/module.c | |
394 | +--- linux-3.18.46.orig/kernel/module.c | |
395 | ++++ linux-3.18.46/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.45.orig/kernel/ptrace.c | |
423 | -+++ linux-3.18.45/kernel/ptrace.c | |
422 | +--- linux-3.18.46.orig/kernel/ptrace.c | |
423 | ++++ linux-3.18.46/kernel/ptrace.c | |
424 | 424 | @@ -1075,6 +1075,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.45.orig/kernel/reboot.c | |
449 | -+++ linux-3.18.45/kernel/reboot.c | |
448 | +--- linux-3.18.46.orig/kernel/reboot.c | |
449 | ++++ linux-3.18.46/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.45.orig/kernel/sched/core.c | |
468 | -+++ linux-3.18.45/kernel/sched/core.c | |
467 | +--- linux-3.18.46.orig/kernel/sched/core.c | |
468 | ++++ linux-3.18.46/kernel/sched/core.c | |
469 | 469 | @@ -3217,6 +3217,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.45.orig/kernel/signal.c | |
479 | -+++ linux-3.18.45/kernel/signal.c | |
478 | +--- linux-3.18.46.orig/kernel/signal.c | |
479 | ++++ linux-3.18.46/kernel/signal.c | |
480 | 480 | @@ -2887,6 +2887,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.45.orig/kernel/sys.c | |
526 | -+++ linux-3.18.45/kernel/sys.c | |
525 | +--- linux-3.18.46.orig/kernel/sys.c | |
526 | ++++ linux-3.18.46/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.45.orig/kernel/time/ntp.c | |
557 | -+++ linux-3.18.45/kernel/time/ntp.c | |
556 | +--- linux-3.18.46.orig/kernel/time/ntp.c | |
557 | ++++ linux-3.18.46/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.45.orig/net/ipv4/raw.c | |
592 | -+++ linux-3.18.45/net/ipv4/raw.c | |
591 | +--- linux-3.18.46.orig/net/ipv4/raw.c | |
592 | ++++ linux-3.18.46/net/ipv4/raw.c | |
593 | 593 | @@ -711,6 +711,10 @@ static int raw_recvmsg(struct kiocb *ioc |
594 | 594 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
595 | 595 | if (!skb) |
@@ -601,8 +601,8 @@ | ||
601 | 601 | |
602 | 602 | copied = skb->len; |
603 | 603 | if (len < copied) { |
604 | ---- linux-3.18.45.orig/net/ipv4/udp.c | |
605 | -+++ linux-3.18.45/net/ipv4/udp.c | |
604 | +--- linux-3.18.46.orig/net/ipv4/udp.c | |
605 | ++++ linux-3.18.46/net/ipv4/udp.c | |
606 | 606 | @@ -1263,6 +1263,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.45.orig/net/ipv6/raw.c | |
618 | -+++ linux-3.18.45/net/ipv6/raw.c | |
617 | +--- linux-3.18.46.orig/net/ipv6/raw.c | |
618 | ++++ linux-3.18.46/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.45.orig/net/ipv6/udp.c | |
631 | -+++ linux-3.18.45/net/ipv6/udp.c | |
630 | +--- linux-3.18.46.orig/net/ipv6/udp.c | |
631 | ++++ linux-3.18.46/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.45.orig/net/socket.c | |
644 | -+++ linux-3.18.45/net/socket.c | |
643 | +--- linux-3.18.46.orig/net/socket.c | |
644 | ++++ linux-3.18.46/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.45.orig/net/unix/af_unix.c | |
657 | -+++ linux-3.18.45/net/unix/af_unix.c | |
656 | +--- linux-3.18.46.orig/net/unix/af_unix.c | |
657 | ++++ linux-3.18.46/net/unix/af_unix.c | |
658 | 658 | @@ -1990,6 +1990,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.45.orig/security/Kconfig | |
670 | -+++ linux-3.18.45/security/Kconfig | |
669 | +--- linux-3.18.46.orig/security/Kconfig | |
670 | ++++ linux-3.18.46/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.45.orig/security/Makefile | |
680 | -+++ linux-3.18.45/security/Makefile | |
679 | +--- linux-3.18.46.orig/security/Makefile | |
680 | ++++ linux-3.18.46/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.45.orig/security/security.c | |
689 | -+++ linux-3.18.45/security/security.c | |
688 | +--- linux-3.18.46.orig/security/security.c | |
689 | ++++ linux-3.18.46/security/security.c | |
690 | 690 | @@ -203,7 +203,10 @@ int security_syslog(int type) |
691 | 691 | |
692 | 692 | int security_settime(const struct timespec *ts, const struct timezone *tz) |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for kernel 4.1.36. | |
1 | +This is TOMOYO Linux patch for kernel 4.1.37. | |
2 | 2 | |
3 | -Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.36.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.37.tar.xz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 |
6 | 6 | fs/open.c | 2 |
@@ -29,8 +29,8 @@ | ||
29 | 29 | security/security.c | 110 ++++++++++++++++++++++++++++++++++++++++------ |
30 | 30 | 25 files changed, 248 insertions(+), 37 deletions(-) |
31 | 31 | |
32 | ---- linux-4.1.36.orig/fs/exec.c | |
33 | -+++ linux-4.1.36/fs/exec.c | |
32 | +--- linux-4.1.37.orig/fs/exec.c | |
33 | ++++ linux-4.1.37/fs/exec.c | |
34 | 34 | @@ -1461,7 +1461,7 @@ static int exec_binprm(struct linux_binp |
35 | 35 | old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent)); |
36 | 36 | rcu_read_unlock(); |
@@ -40,8 +40,8 @@ | ||
40 | 40 | if (ret >= 0) { |
41 | 41 | audit_bprm(bprm); |
42 | 42 | trace_sched_process_exec(current, old_pid, bprm); |
43 | ---- linux-4.1.36.orig/fs/open.c | |
44 | -+++ linux-4.1.36/fs/open.c | |
43 | +--- linux-4.1.37.orig/fs/open.c | |
44 | ++++ linux-4.1.37/fs/open.c | |
45 | 45 | @@ -1107,6 +1107,8 @@ EXPORT_SYMBOL(sys_close); |
46 | 46 | */ |
47 | 47 | SYSCALL_DEFINE0(vhangup) |
@@ -51,8 +51,8 @@ | ||
51 | 51 | if (capable(CAP_SYS_TTY_CONFIG)) { |
52 | 52 | tty_vhangup_self(); |
53 | 53 | return 0; |
54 | ---- linux-4.1.36.orig/fs/proc/version.c | |
55 | -+++ linux-4.1.36/fs/proc/version.c | |
54 | +--- linux-4.1.37.orig/fs/proc/version.c | |
55 | ++++ linux-4.1.37/fs/proc/version.c | |
56 | 56 | @@ -32,3 +32,10 @@ static int __init proc_version_init(void |
57 | 57 | return 0; |
58 | 58 | } |
@@ -60,12 +60,12 @@ | ||
60 | 60 | + |
61 | 61 | +static int __init ccs_show_version(void) |
62 | 62 | +{ |
63 | -+ printk(KERN_INFO "Hook version: 4.1.36 2016/12/04\n"); | |
63 | ++ printk(KERN_INFO "Hook version: 4.1.37 2016/12/29\n"); | |
64 | 64 | + return 0; |
65 | 65 | +} |
66 | 66 | +fs_initcall(ccs_show_version); |
67 | ---- linux-4.1.36.orig/include/linux/init_task.h | |
68 | -+++ linux-4.1.36/include/linux/init_task.h | |
67 | +--- linux-4.1.37.orig/include/linux/init_task.h | |
68 | ++++ linux-4.1.37/include/linux/init_task.h | |
69 | 69 | @@ -182,6 +182,14 @@ extern struct task_group root_task_group |
70 | 70 | # define INIT_KASAN(tsk) |
71 | 71 | #endif |
@@ -89,8 +89,8 @@ | ||
89 | 89 | } |
90 | 90 | |
91 | 91 | |
92 | ---- linux-4.1.36.orig/include/linux/sched.h | |
93 | -+++ linux-4.1.36/include/linux/sched.h | |
92 | +--- linux-4.1.37.orig/include/linux/sched.h | |
93 | ++++ linux-4.1.37/include/linux/sched.h | |
94 | 94 | @@ -6,6 +6,8 @@ |
95 | 95 | #include <linux/sched/prio.h> |
96 | 96 |
@@ -111,8 +111,8 @@ | ||
111 | 111 | }; |
112 | 112 | |
113 | 113 | /* Future-safe accessor for struct task_struct's cpus_allowed. */ |
114 | ---- linux-4.1.36.orig/include/linux/security.h | |
115 | -+++ linux-4.1.36/include/linux/security.h | |
114 | +--- linux-4.1.37.orig/include/linux/security.h | |
115 | ++++ linux-4.1.37/include/linux/security.h | |
116 | 116 | @@ -53,6 +53,7 @@ struct msg_queue; |
117 | 117 | struct xattr; |
118 | 118 | struct xfrm_sec_ctx; |
@@ -319,8 +319,8 @@ | ||
319 | 319 | } |
320 | 320 | #endif /* CONFIG_SECURITY_PATH */ |
321 | 321 | |
322 | ---- linux-4.1.36.orig/include/net/ip.h | |
323 | -+++ linux-4.1.36/include/net/ip.h | |
322 | +--- linux-4.1.37.orig/include/net/ip.h | |
323 | ++++ linux-4.1.37/include/net/ip.h | |
324 | 324 | @@ -217,6 +217,8 @@ void inet_get_local_port_range(struct ne |
325 | 325 | #ifdef CONFIG_SYSCTL |
326 | 326 | static inline int inet_is_local_reserved_port(struct net *net, int port) |
@@ -339,8 +339,8 @@ | ||
339 | 339 | return 0; |
340 | 340 | } |
341 | 341 | #endif |
342 | ---- linux-4.1.36.orig/kernel/fork.c | |
343 | -+++ linux-4.1.36/kernel/fork.c | |
342 | +--- linux-4.1.37.orig/kernel/fork.c | |
343 | ++++ linux-4.1.37/kernel/fork.c | |
344 | 344 | @@ -257,6 +257,7 @@ void __put_task_struct(struct task_struc |
345 | 345 | delayacct_tsk_free(tsk); |
346 | 346 | put_signal_struct(tsk->signal); |
@@ -367,8 +367,8 @@ | ||
367 | 367 | bad_fork_cleanup_perf: |
368 | 368 | perf_event_free_task(p); |
369 | 369 | bad_fork_cleanup_policy: |
370 | ---- linux-4.1.36.orig/kernel/kexec.c | |
371 | -+++ linux-4.1.36/kernel/kexec.c | |
370 | +--- linux-4.1.37.orig/kernel/kexec.c | |
371 | ++++ linux-4.1.37/kernel/kexec.c | |
372 | 372 | @@ -41,6 +41,7 @@ |
373 | 373 | #include <asm/uaccess.h> |
374 | 374 | #include <asm/io.h> |
@@ -386,8 +386,8 @@ | ||
386 | 386 | |
387 | 387 | /* |
388 | 388 | * Verify we have a legal set of flags |
389 | ---- linux-4.1.36.orig/kernel/module.c | |
390 | -+++ linux-4.1.36/kernel/module.c | |
389 | +--- linux-4.1.37.orig/kernel/module.c | |
390 | ++++ linux-4.1.37/kernel/module.c | |
391 | 391 | @@ -61,6 +61,7 @@ |
392 | 392 | #include <linux/bsearch.h> |
393 | 393 | #include <uapi/linux/module.h> |
@@ -414,9 +414,9 @@ | ||
414 | 414 | |
415 | 415 | return 0; |
416 | 416 | } |
417 | ---- linux-4.1.36.orig/kernel/ptrace.c | |
418 | -+++ linux-4.1.36/kernel/ptrace.c | |
419 | -@@ -1057,6 +1057,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l | |
417 | +--- linux-4.1.37.orig/kernel/ptrace.c | |
418 | ++++ linux-4.1.37/kernel/ptrace.c | |
419 | +@@ -1080,6 +1080,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l | |
420 | 420 | { |
421 | 421 | struct task_struct *child; |
422 | 422 | long ret; |
@@ -428,7 +428,7 @@ | ||
428 | 428 | |
429 | 429 | if (request == PTRACE_TRACEME) { |
430 | 430 | ret = ptrace_traceme(); |
431 | -@@ -1203,6 +1208,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo | |
431 | +@@ -1226,6 +1231,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo | |
432 | 432 | { |
433 | 433 | struct task_struct *child; |
434 | 434 | long ret; |
@@ -440,8 +440,8 @@ | ||
440 | 440 | |
441 | 441 | if (request == PTRACE_TRACEME) { |
442 | 442 | ret = ptrace_traceme(); |
443 | ---- linux-4.1.36.orig/kernel/reboot.c | |
444 | -+++ linux-4.1.36/kernel/reboot.c | |
443 | +--- linux-4.1.37.orig/kernel/reboot.c | |
444 | ++++ linux-4.1.37/kernel/reboot.c | |
445 | 445 | @@ -16,6 +16,7 @@ |
446 | 446 | #include <linux/syscalls.h> |
447 | 447 | #include <linux/syscore_ops.h> |
@@ -459,8 +459,8 @@ | ||
459 | 459 | |
460 | 460 | /* |
461 | 461 | * If pid namespaces are enabled and the current task is in a child |
462 | ---- linux-4.1.36.orig/kernel/sched/core.c | |
463 | -+++ linux-4.1.36/kernel/sched/core.c | |
462 | +--- linux-4.1.37.orig/kernel/sched/core.c | |
463 | ++++ linux-4.1.37/kernel/sched/core.c | |
464 | 464 | @@ -3174,6 +3174,8 @@ int can_nice(const struct task_struct *p |
465 | 465 | SYSCALL_DEFINE1(nice, int, increment) |
466 | 466 | { |
@@ -470,8 +470,8 @@ | ||
470 | 470 | |
471 | 471 | /* |
472 | 472 | * Setpriority might change our priority at the same moment. |
473 | ---- linux-4.1.36.orig/kernel/signal.c | |
474 | -+++ linux-4.1.36/kernel/signal.c | |
473 | +--- linux-4.1.37.orig/kernel/signal.c | |
474 | ++++ linux-4.1.37/kernel/signal.c | |
475 | 475 | @@ -2901,6 +2901,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s |
476 | 476 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
477 | 477 | { |
@@ -517,8 +517,8 @@ | ||
517 | 517 | |
518 | 518 | return do_send_specific(tgid, pid, sig, info); |
519 | 519 | } |
520 | ---- linux-4.1.36.orig/kernel/sys.c | |
521 | -+++ linux-4.1.36/kernel/sys.c | |
520 | +--- linux-4.1.37.orig/kernel/sys.c | |
521 | ++++ linux-4.1.37/kernel/sys.c | |
522 | 522 | @@ -183,6 +183,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
523 | 523 | |
524 | 524 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -548,8 +548,8 @@ | ||
548 | 548 | |
549 | 549 | down_write(&uts_sem); |
550 | 550 | errno = -EFAULT; |
551 | ---- linux-4.1.36.orig/kernel/time/ntp.c | |
552 | -+++ linux-4.1.36/kernel/time/ntp.c | |
551 | +--- linux-4.1.37.orig/kernel/time/ntp.c | |
552 | ++++ linux-4.1.37/kernel/time/ntp.c | |
553 | 553 | @@ -16,6 +16,7 @@ |
554 | 554 | #include <linux/mm.h> |
555 | 555 | #include <linux/module.h> |
@@ -583,8 +583,8 @@ | ||
583 | 583 | |
584 | 584 | /* |
585 | 585 | * Check for potential multiplication overflows that can |
586 | ---- linux-4.1.36.orig/net/ipv4/raw.c | |
587 | -+++ linux-4.1.36/net/ipv4/raw.c | |
586 | +--- linux-4.1.37.orig/net/ipv4/raw.c | |
587 | ++++ linux-4.1.37/net/ipv4/raw.c | |
588 | 588 | @@ -729,6 +729,10 @@ static int raw_recvmsg(struct sock *sk, |
589 | 589 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
590 | 590 | if (!skb) |
@@ -596,8 +596,8 @@ | ||
596 | 596 | |
597 | 597 | copied = skb->len; |
598 | 598 | if (len < copied) { |
599 | ---- linux-4.1.36.orig/net/ipv4/udp.c | |
600 | -+++ linux-4.1.36/net/ipv4/udp.c | |
599 | +--- linux-4.1.37.orig/net/ipv4/udp.c | |
600 | ++++ linux-4.1.37/net/ipv4/udp.c | |
601 | 601 | @@ -1274,6 +1274,10 @@ try_again: |
602 | 602 | &peeked, &off, &err); |
603 | 603 | if (!skb) |
@@ -609,8 +609,8 @@ | ||
609 | 609 | |
610 | 610 | ulen = skb->len - sizeof(struct udphdr); |
611 | 611 | copied = len; |
612 | ---- linux-4.1.36.orig/net/ipv6/raw.c | |
613 | -+++ linux-4.1.36/net/ipv6/raw.c | |
612 | +--- linux-4.1.37.orig/net/ipv6/raw.c | |
613 | ++++ linux-4.1.37/net/ipv6/raw.c | |
614 | 614 | @@ -477,6 +477,10 @@ static int rawv6_recvmsg(struct sock *sk |
615 | 615 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
616 | 616 | if (!skb) |
@@ -622,8 +622,8 @@ | ||
622 | 622 | |
623 | 623 | copied = skb->len; |
624 | 624 | if (copied > len) { |
625 | ---- linux-4.1.36.orig/net/ipv6/udp.c | |
626 | -+++ linux-4.1.36/net/ipv6/udp.c | |
625 | +--- linux-4.1.37.orig/net/ipv6/udp.c | |
626 | ++++ linux-4.1.37/net/ipv6/udp.c | |
627 | 627 | @@ -413,6 +413,10 @@ try_again: |
628 | 628 | &peeked, &off, &err); |
629 | 629 | if (!skb) |
@@ -635,8 +635,8 @@ | ||
635 | 635 | |
636 | 636 | ulen = skb->len - sizeof(struct udphdr); |
637 | 637 | copied = len; |
638 | ---- linux-4.1.36.orig/net/socket.c | |
639 | -+++ linux-4.1.36/net/socket.c | |
638 | +--- linux-4.1.37.orig/net/socket.c | |
639 | ++++ linux-4.1.37/net/socket.c | |
640 | 640 | @@ -1485,6 +1485,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct |
641 | 641 | if (err < 0) |
642 | 642 | goto out_fd; |
@@ -648,8 +648,8 @@ | ||
648 | 648 | if (upeer_sockaddr) { |
649 | 649 | if (newsock->ops->getname(newsock, (struct sockaddr *)&address, |
650 | 650 | &len, 2) < 0) { |
651 | ---- linux-4.1.36.orig/net/unix/af_unix.c | |
652 | -+++ linux-4.1.36/net/unix/af_unix.c | |
651 | +--- linux-4.1.37.orig/net/unix/af_unix.c | |
652 | ++++ linux-4.1.37/net/unix/af_unix.c | |
653 | 653 | @@ -1978,6 +1978,10 @@ static int unix_dgram_recvmsg(struct soc |
654 | 654 | wake_up_interruptible_sync_poll(&u->peer_wait, |
655 | 655 | POLLOUT | POLLWRNORM | POLLWRBAND); |
@@ -661,8 +661,8 @@ | ||
661 | 661 | if (msg->msg_name) |
662 | 662 | unix_copy_addr(msg, skb->sk); |
663 | 663 | |
664 | ---- linux-4.1.36.orig/security/Kconfig | |
665 | -+++ linux-4.1.36/security/Kconfig | |
664 | +--- linux-4.1.37.orig/security/Kconfig | |
665 | ++++ linux-4.1.37/security/Kconfig | |
666 | 666 | @@ -168,5 +168,7 @@ config DEFAULT_SECURITY |
667 | 667 | default "yama" if DEFAULT_SECURITY_YAMA |
668 | 668 | default "" if DEFAULT_SECURITY_DAC |
@@ -671,8 +671,8 @@ | ||
671 | 671 | + |
672 | 672 | endmenu |
673 | 673 | |
674 | ---- linux-4.1.36.orig/security/Makefile | |
675 | -+++ linux-4.1.36/security/Makefile | |
674 | +--- linux-4.1.37.orig/security/Makefile | |
675 | ++++ linux-4.1.37/security/Makefile | |
676 | 676 | @@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c |
677 | 677 | # Object integrity file lists |
678 | 678 | subdir-$(CONFIG_INTEGRITY) += integrity |
@@ -680,8 +680,8 @@ | ||
680 | 680 | + |
681 | 681 | +subdir-$(CONFIG_CCSECURITY) += ccsecurity |
682 | 682 | +obj-$(CONFIG_CCSECURITY) += ccsecurity/ |
683 | ---- linux-4.1.36.orig/security/security.c | |
684 | -+++ linux-4.1.36/security/security.c | |
683 | +--- linux-4.1.37.orig/security/security.c | |
684 | ++++ linux-4.1.37/security/security.c | |
685 | 685 | @@ -226,7 +226,10 @@ int security_syslog(int type) |
686 | 686 | |
687 | 687 | int security_settime(const struct timespec *ts, const struct timezone *tz) |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for linux-next. | |
1 | +This is TOMOYO Linux patch for kernel 4.10-rc1. | |
2 | 2 | |
3 | -Source code for this patch is https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/snapshot/linux-next-next-20161212.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/testing/linux-4.10-rc1.tar.xz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 - |
6 | 6 | fs/open.c | 2 + |
@@ -28,9 +28,9 @@ | ||
28 | 28 | security/Makefile | 3 ++ |
29 | 29 | 24 files changed, 147 insertions(+), 26 deletions(-) |
30 | 30 | |
31 | ---- linux-next.orig/fs/exec.c | |
32 | -+++ linux-next/fs/exec.c | |
33 | -@@ -1636,7 +1636,7 @@ static int exec_binprm(struct linux_binp | |
31 | +--- linux-4.10-rc1.orig/fs/exec.c | |
32 | ++++ linux-4.10-rc1/fs/exec.c | |
33 | +@@ -1642,7 +1642,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(); |
36 | 36 |
@@ -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-next.orig/fs/open.c | |
43 | -+++ linux-next/fs/open.c | |
42 | +--- linux-4.10-rc1.orig/fs/open.c | |
43 | ++++ linux-4.10-rc1/fs/open.c | |
44 | 44 | @@ -1145,6 +1145,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-next.orig/fs/proc/version.c | |
54 | -+++ linux-next/fs/proc/version.c | |
53 | +--- linux-4.10-rc1.orig/fs/proc/version.c | |
54 | ++++ linux-4.10-rc1/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-next-20161212 2016/12/12\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.10-rc1 2016/12/26\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-next.orig/include/linux/init_task.h | |
67 | -+++ linux-next/include/linux/init_task.h | |
66 | +--- linux-4.10-rc1.orig/include/linux/init_task.h | |
67 | ++++ linux-4.10-rc1/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-next.orig/include/linux/sched.h | |
92 | -+++ linux-next/include/linux/sched.h | |
91 | +--- linux-4.10-rc1.orig/include/linux/sched.h | |
92 | ++++ linux-4.10-rc1/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-next.orig/include/linux/security.h | |
114 | -+++ linux-next/include/linux/security.h | |
113 | +--- linux-4.10-rc1.orig/include/linux/security.h | |
114 | ++++ linux-4.10-rc1/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-next.orig/include/net/ip.h | |
322 | -+++ linux-next/include/net/ip.h | |
321 | +--- linux-4.10-rc1.orig/include/net/ip.h | |
322 | ++++ linux-4.10-rc1/include/net/ip.h | |
323 | 323 | @@ -253,6 +253,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-next.orig/kernel/fork.c | |
342 | -+++ linux-next/kernel/fork.c | |
341 | +--- linux-4.10-rc1.orig/kernel/fork.c | |
342 | ++++ linux-4.10-rc1/kernel/fork.c | |
343 | 343 | @@ -392,6 +392,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-next.orig/kernel/kexec.c | |
370 | -+++ linux-next/kernel/kexec.c | |
369 | +--- linux-4.10-rc1.orig/kernel/kexec.c | |
370 | ++++ linux-4.10-rc1/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-next.orig/kernel/module.c | |
390 | -+++ linux-next/kernel/module.c | |
389 | +--- linux-4.10-rc1.orig/kernel/module.c | |
390 | ++++ linux-4.10-rc1/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-next.orig/kernel/ptrace.c | |
418 | -+++ linux-next/kernel/ptrace.c | |
417 | +--- linux-4.10-rc1.orig/kernel/ptrace.c | |
418 | ++++ linux-4.10-rc1/kernel/ptrace.c | |
419 | 419 | @@ -1110,6 +1110,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-next.orig/kernel/reboot.c | |
444 | -+++ linux-next/kernel/reboot.c | |
443 | +--- linux-4.10-rc1.orig/kernel/reboot.c | |
444 | ++++ linux-4.10-rc1/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-next.orig/kernel/sched/core.c | |
463 | -+++ linux-next/kernel/sched/core.c | |
462 | +--- linux-4.10-rc1.orig/kernel/sched/core.c | |
463 | ++++ linux-4.10-rc1/kernel/sched/core.c | |
464 | 464 | @@ -3812,6 +3812,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-next.orig/kernel/signal.c | |
474 | -+++ linux-next/kernel/signal.c | |
473 | +--- linux-4.10-rc1.orig/kernel/signal.c | |
474 | ++++ linux-4.10-rc1/kernel/signal.c | |
475 | 475 | @@ -2860,6 +2860,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-next.orig/kernel/sys.c | |
521 | -+++ linux-next/kernel/sys.c | |
520 | +--- linux-4.10-rc1.orig/kernel/sys.c | |
521 | ++++ linux-4.10-rc1/kernel/sys.c | |
522 | 522 | @@ -183,6 +183,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
523 | 523 | |
524 | 524 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -548,8 +548,8 @@ | ||
548 | 548 | |
549 | 549 | down_write(&uts_sem); |
550 | 550 | errno = -EFAULT; |
551 | ---- linux-next.orig/kernel/time/ntp.c | |
552 | -+++ linux-next/kernel/time/ntp.c | |
551 | +--- linux-4.10-rc1.orig/kernel/time/ntp.c | |
552 | ++++ linux-4.10-rc1/kernel/time/ntp.c | |
553 | 553 | @@ -17,6 +17,7 @@ |
554 | 554 | #include <linux/module.h> |
555 | 555 | #include <linux/rtc.h> |
@@ -583,8 +583,8 @@ | ||
583 | 583 | |
584 | 584 | if (txc->modes & ADJ_NANO) { |
585 | 585 | struct timespec ts; |
586 | ---- linux-next.orig/net/ipv4/raw.c | |
587 | -+++ linux-next/net/ipv4/raw.c | |
586 | +--- linux-4.10-rc1.orig/net/ipv4/raw.c | |
587 | ++++ linux-4.10-rc1/net/ipv4/raw.c | |
588 | 588 | @@ -746,6 +746,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-next.orig/net/ipv4/udp.c | |
600 | -+++ linux-next/net/ipv4/udp.c | |
599 | +--- linux-4.10-rc1.orig/net/ipv4/udp.c | |
600 | ++++ linux-4.10-rc1/net/ipv4/udp.c | |
601 | 601 | @@ -1436,6 +1436,8 @@ try_again: |
602 | 602 | skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err); |
603 | 603 | if (!skb) |
@@ -607,8 +607,8 @@ | ||
607 | 607 | |
608 | 608 | ulen = skb->len; |
609 | 609 | copied = len; |
610 | ---- linux-next.orig/net/ipv6/raw.c | |
611 | -+++ linux-next/net/ipv6/raw.c | |
610 | +--- linux-4.10-rc1.orig/net/ipv6/raw.c | |
611 | ++++ linux-4.10-rc1/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-next.orig/net/ipv6/udp.c | |
624 | -+++ linux-next/net/ipv6/udp.c | |
623 | +--- linux-4.10-rc1.orig/net/ipv6/udp.c | |
624 | ++++ linux-4.10-rc1/net/ipv6/udp.c | |
625 | 625 | @@ -347,6 +347,8 @@ try_again: |
626 | 626 | skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err); |
627 | 627 | if (!skb) |
@@ -631,8 +631,8 @@ | ||
631 | 631 | |
632 | 632 | ulen = skb->len; |
633 | 633 | copied = len; |
634 | ---- linux-next.orig/net/socket.c | |
635 | -+++ linux-next/net/socket.c | |
634 | +--- linux-4.10-rc1.orig/net/socket.c | |
635 | ++++ linux-4.10-rc1/net/socket.c | |
636 | 636 | @@ -1512,6 +1512,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct |
637 | 637 | if (err < 0) |
638 | 638 | goto out_fd; |
@@ -644,9 +644,9 @@ | ||
644 | 644 | if (upeer_sockaddr) { |
645 | 645 | if (newsock->ops->getname(newsock, (struct sockaddr *)&address, |
646 | 646 | &len, 2) < 0) { |
647 | ---- linux-next.orig/net/unix/af_unix.c | |
648 | -+++ linux-next/net/unix/af_unix.c | |
649 | -@@ -2137,6 +2137,10 @@ static int unix_dgram_recvmsg(struct soc | |
647 | +--- linux-4.10-rc1.orig/net/unix/af_unix.c | |
648 | ++++ linux-4.10-rc1/net/unix/af_unix.c | |
649 | +@@ -2140,6 +2140,10 @@ static int unix_dgram_recvmsg(struct soc | |
650 | 650 | POLLOUT | POLLWRNORM | |
651 | 651 | POLLWRBAND); |
652 | 652 |
@@ -657,7 +657,7 @@ | ||
657 | 657 | if (msg->msg_name) |
658 | 658 | unix_copy_addr(msg, skb->sk); |
659 | 659 | |
660 | -@@ -2187,6 +2191,7 @@ static int unix_dgram_recvmsg(struct soc | |
660 | +@@ -2190,6 +2194,7 @@ static int unix_dgram_recvmsg(struct soc | |
661 | 661 | |
662 | 662 | out_free: |
663 | 663 | skb_free_datagram(sk, skb); |
@@ -665,8 +665,8 @@ | ||
665 | 665 | mutex_unlock(&u->iolock); |
666 | 666 | out: |
667 | 667 | return err; |
668 | ---- linux-next.orig/security/Kconfig | |
669 | -+++ linux-next/security/Kconfig | |
668 | +--- linux-4.10-rc1.orig/security/Kconfig | |
669 | ++++ linux-4.10-rc1/security/Kconfig | |
670 | 670 | @@ -204,5 +204,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-next.orig/security/Makefile | |
679 | -+++ linux-next/security/Makefile | |
678 | +--- linux-4.10-rc1.orig/security/Makefile | |
679 | ++++ linux-4.10-rc1/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 |
@@ -18,9 +18,9 @@ | ||
18 | 18 | rpm -ivh kernel-2.6.32-642.11.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 | -if [ ! -r caitsith-patch-0.2-20161030.tar.gz ] | |
21 | +if [ ! -r caitsith-patch-0.2-20161229.tar.gz ] | |
22 | 22 | then |
23 | - wget -O caitsith-patch-0.2-20161030.tar.gz 'http://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20161030.tar.gz' || die "Can't download patch." | |
23 | + wget -O caitsith-patch-0.2-20161229.tar.gz 'http://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20161229.tar.gz' || die "Can't download patch." | |
24 | 24 | fi |
25 | 25 | |
26 | 26 | cd ~/rpmbuild/SPECS/ || die "Can't chdir to ~/rpmbuild/SPECS/ ." |
@@ -69,7 +69,7 @@ | ||
69 | 69 | ApplyOptionalPatch linux-kernel-test.patch |
70 | 70 | |
71 | 71 | +# CaitSith |
72 | -+tar -zxf %_sourcedir/caitsith-patch-0.2-20161030.tar.gz | |
72 | ++tar -zxf %_sourcedir/caitsith-patch-0.2-20161229.tar.gz | |
73 | 73 | +sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff |
74 | 74 | +patch -sp1 < patches/ccs-patch-2.6.32-centos-6.diff |
75 | 75 | # Any further pre-build tree manipulations happen here. |
@@ -18,9 +18,9 @@ | ||
18 | 18 | rpm -ivh kernel-3.10.0-514.2.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 | -if [ ! -r caitsith-patch-0.2-20161030.tar.gz ] | |
21 | +if [ ! -r caitsith-patch-0.2-20161229.tar.gz ] | |
22 | 22 | then |
23 | - wget -O caitsith-patch-0.2-20161030.tar.gz 'http://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20161030.tar.gz' || die "Can't download patch." | |
23 | + wget -O caitsith-patch-0.2-20161229.tar.gz 'http://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20161229.tar.gz' || die "Can't download patch." | |
24 | 24 | fi |
25 | 25 | |
26 | 26 | cd ~/rpmbuild/SPECS/ || die "Can't chdir to ~/rpmbuild/SPECS/ ." |
@@ -69,7 +69,7 @@ | ||
69 | 69 | ApplyOptionalPatch debrand-rh-i686-cpu.patch |
70 | 70 | |
71 | 71 | +# CaitSith |
72 | -+tar -zxf %_sourcedir/caitsith-patch-0.2-20161030.tar.gz | |
72 | ++tar -zxf %_sourcedir/caitsith-patch-0.2-20161229.tar.gz | |
73 | 73 | +sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff |
74 | 74 | +patch -sp1 < patches/ccs-patch-3.10-centos-7.diff |
75 | 75 | # Any further pre-build tree manipulations happen here. |
@@ -23,10 +23,10 @@ | ||
23 | 23 | # Download CaitSith patches. |
24 | 24 | mkdir -p ~/rpmbuild/SOURCES/ |
25 | 25 | cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ." |
26 | -if [ ! -r caitsith-patch-0.2-20161030.tar.gz ] | |
26 | +if [ ! -r caitsith-patch-0.2-20161229.tar.gz ] | |
27 | 27 | then |
28 | 28 | apt-get -y install wget |
29 | - wget -O caitsith-patch-0.2-20161030.tar.gz 'http://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20161030.tar.gz' || die "Can't download patch." | |
29 | + wget -O caitsith-patch-0.2-20161229.tar.gz 'http://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20161229.tar.gz' || die "Can't download patch." | |
30 | 30 | fi |
31 | 31 | |
32 | 32 | # Install kernel source packages. |
@@ -38,7 +38,7 @@ | ||
38 | 38 | |
39 | 39 | # Apply patches and create kernel config. |
40 | 40 | cd linux-source-3.2 || die "Can't chdir to linux-source-3.2/ ." |
41 | -tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20161030.tar.gz || die "Can't extract patch." | |
41 | +tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20161229.tar.gz || die "Can't extract patch." | |
42 | 42 | sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff |
43 | 43 | patch -p1 < patches/ccs-patch-3.2-debian-wheezy.diff || die "Can't apply patch." |
44 | 44 | cat /boot/config-3.2.0-$ABI_VERSION-$ORIGINAL_FLAVOUR config.caitsith > .config || die "Can't create config." |
@@ -29,9 +29,9 @@ | ||
29 | 29 | # Download CaitSith patches. |
30 | 30 | mkdir -p ~/rpmbuild/SOURCES/ |
31 | 31 | cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ." |
32 | -if [ ! -r caitsith-patch-0.2-20161030.tar.gz ] | |
32 | +if [ ! -r caitsith-patch-0.2-20161229.tar.gz ] | |
33 | 33 | then |
34 | - wget -O caitsith-patch-0.2-20161030.tar.gz 'http://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20161030.tar.gz' || die "Can't download patch." | |
34 | + wget -O caitsith-patch-0.2-20161229.tar.gz 'http://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20161229.tar.gz' || die "Can't download patch." | |
35 | 35 | fi |
36 | 36 | |
37 | 37 | # Install kernel source packages. |
@@ -44,7 +44,7 @@ | ||
44 | 44 | # Apply patches and create kernel config. |
45 | 45 | cd linux-3.2.0/ || die "Can't chdir to linux-3.2.0/ ." |
46 | 46 | update_maintainer |
47 | -tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20161030.tar.gz || die "Can't extract patch." | |
47 | +tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20161229.tar.gz || die "Can't extract patch." | |
48 | 48 | sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff |
49 | 49 | patch -p1 < patches/ccs-patch-3.2-ubuntu-12.04.diff || die "Can't apply patch." |
50 | 50 | rm -fR patches/ specs/ || die "Can't delete patch." |
@@ -29,9 +29,9 @@ | ||
29 | 29 | # Download CaitSith patches. |
30 | 30 | mkdir -p ~/rpmbuild/SOURCES/ |
31 | 31 | cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ." |
32 | -if [ ! -r caitsith-patch-0.2-20161030.tar.gz ] | |
32 | +if [ ! -r caitsith-patch-0.2-20161229.tar.gz ] | |
33 | 33 | then |
34 | - wget -O caitsith-patch-0.2-20161030.tar.gz 'http://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20161030.tar.gz' || die "Can't download patch." | |
34 | + wget -O caitsith-patch-0.2-20161229.tar.gz 'http://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20161229.tar.gz' || die "Can't download patch." | |
35 | 35 | fi |
36 | 36 | |
37 | 37 | # Install kernel source packages. |
@@ -44,7 +44,7 @@ | ||
44 | 44 | # Apply patches and create kernel config. |
45 | 45 | cd linux-3.13.0/ || die "Can't chdir to linux-3.13.0/ ." |
46 | 46 | update_maintainer |
47 | -tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20161030.tar.gz || die "Can't extract patch." | |
47 | +tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20161229.tar.gz || die "Can't extract patch." | |
48 | 48 | sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff |
49 | 49 | patch -p1 < patches/ccs-patch-3.13-ubuntu-14.04.diff || die "Can't apply patch." |
50 | 50 | rm -fR patches/ specs/ || die "Can't delete patch." |
@@ -18,9 +18,9 @@ | ||
18 | 18 | rpm -ivh kernel-3.4.110-4vl6.src.rpm || die "Can't install source package." |
19 | 19 | |
20 | 20 | cd ~/rpm/SOURCES/ || die "Can't chdir to ~/rpm/SOURCES/ ." |
21 | -if [ ! -r caitsith-patch-0.2-20161030.tar.gz ] | |
21 | +if [ ! -r caitsith-patch-0.2-20161229.tar.gz ] | |
22 | 22 | then |
23 | - wget -O caitsith-patch-0.2-20161030.tar.gz 'http://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20161030.tar.gz' || die "Can't download patch." | |
23 | + wget -O caitsith-patch-0.2-20161229.tar.gz 'http://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20161229.tar.gz' || die "Can't download patch." | |
24 | 24 | fi |
25 | 25 | |
26 | 26 | cd /tmp/ || die "Can't chdir to /tmp/ ." |
@@ -61,7 +61,7 @@ | ||
61 | 61 | # END OF PATCH APPLICATIONS |
62 | 62 | |
63 | 63 | +# CaitSith |
64 | -+tar -zxf %_sourcedir/caitsith-patch-0.2-20161030.tar.gz | |
64 | ++tar -zxf %_sourcedir/caitsith-patch-0.2-20161229.tar.gz | |
65 | 65 | +sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff |
66 | 66 | +patch -sp1 < patches/ccs-patch-3.4-vine-linux-6.diff |
67 | 67 | cp %{SOURCE10} Documentation/ |
@@ -17,7 +17,7 @@ | ||
17 | 17 | Requires: ncurses |
18 | 18 | Conflicts: caitsith-tools < 0.2-2 |
19 | 19 | |
20 | -Source0: http://osdn.dl.osdn.jp/caitsith/66538/caitsith-tools-0.2-20161016.tar.gz | |
20 | +Source0: http://osdn.dl.osdn.jp/caitsith/66538/caitsith-tools-0.2-20161229.tar.gz | |
21 | 21 | |
22 | 22 | %description |
23 | 23 | This package contains userspace tools for administrating CaitSith 0.2. |