OSDN > Find Software > System > Operating System Kernels > Linux > CaitSith > SCM > SVN > Commit

CaitSith

R/O
SSH
HTTPS

caitsith: Commit

Commit MetaInfo

Revision	153 (tree)
Time	2015-06-06 21:56:01
Author	kumaneko

Log Message

(empty log message)

Change Summary

modified: tags/htdocs/index.html (diff)
modified: trunk/caitsith-patch/include/linux/caitsith.h (diff)
modified: trunk/caitsith-patch/README.caitsith (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-3.19-fedora-20.diff (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-3.13-ubuntu-14.04.diff (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-3.10-centos-7.diff (diff)
modified: trunk/caitsith-patch/patches/ccs-patch-3.2-ubuntu-12.04.diff (diff)
modified: trunk/caitsith-patch/security/caitsith/gc.c (diff)
modified: trunk/caitsith-patch/security/caitsith/load_policy.c (diff)
modified: trunk/caitsith-patch/security/caitsith/realpath.c (diff)
modified: trunk/caitsith-patch/security/caitsith/internal.h (diff)
modified: trunk/caitsith-patch/security/caitsith/policy_io.c (diff)
modified: trunk/caitsith-patch/security/caitsith/memory.c (diff)
modified: trunk/caitsith-patch/security/caitsith/permission.c (diff)
modified: trunk/caitsith-patch/caitsith/lsm.c (diff)
modified: trunk/caitsith-patch/caitsith/lsm-4.2.c (diff)
modified: trunk/caitsith-patch/caitsith/realpath.c (diff)
modified: trunk/caitsith-patch/caitsith/mclsm.c (diff)
modified: trunk/caitsith-patch/caitsith/caitsith.h (diff)
modified: trunk/caitsith-patch/caitsith/lsm-2.6.27-vfs.c (diff)
modified: trunk/caitsith-patch/caitsith/lsm-2.6.27.c (diff)
modified: trunk/caitsith-patch/caitsith/policy_io.c (diff)
modified: trunk/caitsith-patch/caitsith/lsm-2.6.29.c (diff)
modified: trunk/caitsith-patch/caitsith/permission.c (diff)
modified: trunk/caitsith-patch/caitsith/gc.c (diff)

Incremental Difference

--- tags/htdocs/index.html (revision 152)

+++ tags/htdocs/index.html (revision 153)

		@@ -302,12 +302,12 @@
302	302	<p>Run the following commands in order to extract source code of CaitSith:</p>
303	303
304	304	<pre class="command">
305		-# wget -O caitsith-patch-0.1-20150505.tar.gz 'http://sourceforge.jp/frs/redir.php?m=jaist&f=/caitsith/55464/caitsith-patch-0.1-20150505.tar.gz'
306		-# wget -O caitsith-patch-0.1-20150505.tar.gz.asc 'http://sourceforge.jp/frs/redir.php?m=jaist&f=/caitsith/55464/caitsith-patch-0.1-20150505.tar.gz.asc'
	305	+# wget -O caitsith-patch-0.1-20150606.tar.gz 'http://sourceforge.jp/frs/redir.php?m=jaist&f=/caitsith/55464/caitsith-patch-0.1-20150606.tar.gz'
	306	+# wget -O caitsith-patch-0.1-20150606.tar.gz.asc 'http://sourceforge.jp/frs/redir.php?m=jaist&f=/caitsith/55464/caitsith-patch-0.1-20150606.tar.gz.asc'
307	307	# wget http://I-love.SAKURA.ne.jp/kumaneko-key
308	308	# gpg --import kumaneko-key
309		-# gpg caitsith-patch-0.1-20150505.tar.gz.asc
310		-# tar -zxf caitsith-patch-0.1-20150505.tar.gz
	309	+# gpg caitsith-patch-0.1-20150606.tar.gz.asc
	310	+# tar -zxf caitsith-patch-0.1-20150606.tar.gz
311	311	</pre>
312	312
313	313	<p>On systemd environments, <code>/usr/lib/systemd/systemd</code> will be executed rather than <code>/sbin/init</code>. If your system is using systemd, please edit CONFIG_CAITSITH_ACTIVATION_TRIGGER line in caitsith/config.h like below:</p>

		@@ -595,12 +595,12 @@
595	595	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>
596	596
597	597	<pre class="command">
598		-$ wget -O caitsith-patch-0.1-20150505.tar.gz 'http://sourceforge.jp/frs/redir.php?m=jaist&f=/caitsith/55464/caitsith-patch-0.1-20150505.tar.gz'
599		-$ wget -O caitsith-patch-0.1-20150505.tar.gz.asc 'http://sourceforge.jp/frs/redir.php?m=jaist&f=/caitsith/55464/caitsith-patch-0.1-20150505.tar.gz.asc'
	598	+$ wget -O caitsith-patch-0.1-20150606.tar.gz 'http://sourceforge.jp/frs/redir.php?m=jaist&f=/caitsith/55464/caitsith-patch-0.1-20150606.tar.gz'
	599	+$ wget -O caitsith-patch-0.1-20150606.tar.gz.asc 'http://sourceforge.jp/frs/redir.php?m=jaist&f=/caitsith/55464/caitsith-patch-0.1-20150606.tar.gz.asc'
600	600	$ wget http://I-love.SAKURA.ne.jp/kumaneko-key
601	601	$ gpg --import kumaneko-key
602		-$ gpg caitsith-patch-0.1-20150505.tar.gz.asc
603		-$ tar -zxf caitsith-patch-0.1-20150505.tar.gz
	602	+$ gpg caitsith-patch-0.1-20150606.tar.gz.asc
	603	+$ tar -zxf caitsith-patch-0.1-20150606.tar.gz
604	604	$ 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
605	605	$ patch -sp1 < patches/ccs-patch-$VERSION.diff
606	606	</pre>

--- trunk/caitsith-patch/include/linux/caitsith.h (revision 152)

+++ trunk/caitsith-patch/include/linux/caitsith.h (revision 153)

		@@ -3,7 +3,7 @@
3	3	*
4	4	* Copyright (C) 2005-2012 NTT DATA CORPORATION
5	5	*
6		- * Version: 0.1.12 2015/04/08
	6	+ * Version: 0.1.13 2015/06/06
7	7	*/
8	8
9	9	#ifndef _LINUX_CAITSITH_H

--- trunk/caitsith-patch/patches/ccs-patch-3.19-fedora-20.diff (revision 152)

+++ trunk/caitsith-patch/patches/ccs-patch-3.19-fedora-20.diff (revision 153)

		@@ -1,6 +1,6 @@
1	1	This is TOMOYO Linux patch for Fedora 20.
2	2
3		-Source code for this patch is http://ftp.riken.jp/Linux/fedora/updates/20/SRPMS/kernel-3.19.3-100.fc20.src.rpm
	3	+Source code for this patch is http://ftp.riken.jp/Linux/fedora/updates/20/SRPMS/kernel-3.19.8-100.fc20.src.rpm
4	4	---
5	5	fs/exec.c \| 2
6	6	fs/open.c \| 2

		@@ -29,9 +29,9 @@
29	29	security/security.c \| 111 +++++++++++++++++++++++++++++++++++++++++-----
30	30	25 files changed, 252 insertions(+), 37 deletions(-)
31	31
32		---- linux-3.19.3-100.fc20.orig/fs/exec.c
33		-+++ linux-3.19.3-100.fc20/fs/exec.c
34		-@@ -1422,7 +1422,7 @@ static int exec_binprm(struct linux_binp
	32	+--- linux-3.19.8-100.fc20.orig/fs/exec.c
	33	++++ linux-3.19.8-100.fc20/fs/exec.c
	34	+@@ -1442,7 +1442,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();
37	37

		@@ -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.19.3-100.fc20.orig/fs/open.c
44		-+++ linux-3.19.3-100.fc20/fs/open.c
	43	+--- linux-3.19.8-100.fc20.orig/fs/open.c
	44	++++ linux-3.19.8-100.fc20/fs/open.c
45	45	@@ -1102,6 +1102,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.19.3-100.fc20.orig/fs/proc/version.c
55		-+++ linux-3.19.3-100.fc20/fs/proc/version.c
	54	+--- linux-3.19.8-100.fc20.orig/fs/proc/version.c
	55	++++ linux-3.19.8-100.fc20/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.19.3-100.fc20 2015/04/08\n");
	63	++ printk(KERN_INFO "Hook version: 3.19.8-100.fc20 2015/06/06\n");
64	64	+ return 0;
65	65	+}
66	66	+fs_initcall(ccs_show_version);
67		---- linux-3.19.3-100.fc20.orig/include/linux/init_task.h
68		-+++ linux-3.19.3-100.fc20/include/linux/init_task.h
	67	+--- linux-3.19.8-100.fc20.orig/include/linux/init_task.h
	68	++++ linux-3.19.8-100.fc20/include/linux/init_task.h
69	69	@@ -175,6 +175,14 @@ extern struct task_group root_task_group
70	70	# define INIT_NUMA_BALANCING(tsk)
71	71	#endif

		@@ -89,8 +89,8 @@
89	89	}
90	90
91	91
92		---- linux-3.19.3-100.fc20.orig/include/linux/sched.h
93		-+++ linux-3.19.3-100.fc20/include/linux/sched.h
	92	+--- linux-3.19.8-100.fc20.orig/include/linux/sched.h
	93	++++ linux-3.19.8-100.fc20/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.19.3-100.fc20.orig/include/linux/security.h
115		-+++ linux-3.19.3-100.fc20/include/linux/security.h
	114	+--- linux-3.19.8-100.fc20.orig/include/linux/security.h
	115	++++ linux-3.19.8-100.fc20/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.19.3-100.fc20.orig/include/net/ip.h
328		-+++ linux-3.19.3-100.fc20/include/net/ip.h
	327	+--- linux-3.19.8-100.fc20.orig/include/net/ip.h
	328	++++ linux-3.19.8-100.fc20/include/net/ip.h
329	329	@@ -215,6 +215,8 @@ void inet_get_local_port_range(struct ne
330	330	#ifdef CONFIG_SYSCTL
331	331	static inline int inet_is_local_reserved_port(struct net *net, int port)

		@@ -344,8 +344,8 @@
344	344	return 0;
345	345	}
346	346	#endif
347		---- linux-3.19.3-100.fc20.orig/kernel/fork.c
348		-+++ linux-3.19.3-100.fc20/kernel/fork.c
	347	+--- linux-3.19.8-100.fc20.orig/kernel/fork.c
	348	++++ linux-3.19.8-100.fc20/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.19.3-100.fc20.orig/kernel/kexec.c
376		-+++ linux-3.19.3-100.fc20/kernel/kexec.c
	375	+--- linux-3.19.8-100.fc20.orig/kernel/kexec.c
	376	++++ linux-3.19.8-100.fc20/kernel/kexec.c
377	377	@@ -42,6 +42,7 @@
378	378	#include <asm/uaccess.h>
379	379	#include <asm/io.h>

		@@ -391,8 +391,8 @@
391	391
392	392	/*
393	393	* kexec can be used to circumvent module loading restrictions, so
394		---- linux-3.19.3-100.fc20.orig/kernel/module.c
395		-+++ linux-3.19.3-100.fc20/kernel/module.c
	394	+--- linux-3.19.8-100.fc20.orig/kernel/module.c
	395	++++ linux-3.19.8-100.fc20/kernel/module.c
396	396	@@ -61,6 +61,7 @@
397	397	#include <linux/bsearch.h>
398	398	#include <uapi/linux/module.h>

		@@ -419,9 +419,9 @@
419	419
420	420	return 0;
421	421	}
422		---- linux-3.19.3-100.fc20.orig/kernel/ptrace.c
423		-+++ linux-3.19.3-100.fc20/kernel/ptrace.c
424		-@@ -1015,6 +1015,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
	422	+--- linux-3.19.8-100.fc20.orig/kernel/ptrace.c
	423	++++ linux-3.19.8-100.fc20/kernel/ptrace.c
	424	+@@ -1035,6 +1035,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
425	425	{
426	426	struct task_struct *child;
427	427	long ret;

		@@ -433,7 +433,7 @@
433	433
434	434	if (request == PTRACE_TRACEME) {
435	435	ret = ptrace_traceme();
436		-@@ -1162,6 +1167,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
	436	+@@ -1182,6 +1187,11 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_lo
437	437	{
438	438	struct task_struct *child;
439	439	long ret;

		@@ -445,8 +445,8 @@
445	445
446	446	if (request == PTRACE_TRACEME) {
447	447	ret = ptrace_traceme();
448		---- linux-3.19.3-100.fc20.orig/kernel/reboot.c
449		-+++ linux-3.19.3-100.fc20/kernel/reboot.c
	448	+--- linux-3.19.8-100.fc20.orig/kernel/reboot.c
	449	++++ linux-3.19.8-100.fc20/kernel/reboot.c
450	450	@@ -16,6 +16,7 @@
451	451	#include <linux/syscalls.h>
452	452	#include <linux/syscore_ops.h>

		@@ -464,9 +464,9 @@
464	464
465	465	/*
466	466	* If pid namespaces are enabled and the current task is in a child
467		---- linux-3.19.3-100.fc20.orig/kernel/sched/core.c
468		-+++ linux-3.19.3-100.fc20/kernel/sched/core.c
469		-@@ -3168,6 +3168,8 @@ int can_nice(const struct task_struct *p
	467	+--- linux-3.19.8-100.fc20.orig/kernel/sched/core.c
	468	++++ linux-3.19.8-100.fc20/kernel/sched/core.c
	469	+@@ -3170,6 +3170,8 @@ int can_nice(const struct task_struct *p
470	470	SYSCALL_DEFINE1(nice, int, increment)
471	471	{
472	472	long nice, retval;

		@@ -475,8 +475,8 @@
475	475
476	476	/*
477	477	* Setpriority might change our priority at the same moment.
478		---- linux-3.19.3-100.fc20.orig/kernel/signal.c
479		-+++ linux-3.19.3-100.fc20/kernel/signal.c
	478	+--- linux-3.19.8-100.fc20.orig/kernel/signal.c
	479	++++ linux-3.19.8-100.fc20/kernel/signal.c
480	480	@@ -2898,6 +2898,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.19.3-100.fc20.orig/kernel/sys.c
526		-+++ linux-3.19.3-100.fc20/kernel/sys.c
	525	+--- linux-3.19.8-100.fc20.orig/kernel/sys.c
	526	++++ linux-3.19.8-100.fc20/kernel/sys.c
527	527	@@ -177,6 +177,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.19.3-100.fc20.orig/kernel/time/ntp.c
557		-+++ linux-3.19.3-100.fc20/kernel/time/ntp.c
	556	+--- linux-3.19.8-100.fc20.orig/kernel/time/ntp.c
	557	++++ linux-3.19.8-100.fc20/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.19.3-100.fc20.orig/net/ipv4/raw.c
592		-+++ linux-3.19.3-100.fc20/net/ipv4/raw.c
	591	+--- linux-3.19.8-100.fc20.orig/net/ipv4/raw.c
	592	++++ linux-3.19.8-100.fc20/net/ipv4/raw.c
593	593	@@ -730,6 +730,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.19.3-100.fc20.orig/net/ipv4/udp.c
605		-+++ linux-3.19.3-100.fc20/net/ipv4/udp.c
	604	+--- linux-3.19.8-100.fc20.orig/net/ipv4/udp.c
	605	++++ linux-3.19.8-100.fc20/net/ipv4/udp.c
606	606	@@ -1274,6 +1274,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.19.3-100.fc20.orig/net/ipv6/raw.c
618		-+++ linux-3.19.3-100.fc20/net/ipv6/raw.c
	617	+--- linux-3.19.8-100.fc20.orig/net/ipv6/raw.c
	618	++++ linux-3.19.8-100.fc20/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.19.3-100.fc20.orig/net/ipv6/udp.c
631		-+++ linux-3.19.3-100.fc20/net/ipv6/udp.c
	630	+--- linux-3.19.8-100.fc20.orig/net/ipv6/udp.c
	631	++++ linux-3.19.8-100.fc20/net/ipv6/udp.c
632	632	@@ -416,6 +416,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.19.3-100.fc20.orig/net/socket.c
644		-+++ linux-3.19.3-100.fc20/net/socket.c
	643	+--- linux-3.19.8-100.fc20.orig/net/socket.c
	644	++++ linux-3.19.8-100.fc20/net/socket.c
645	645	@@ -1612,6 +1612,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.19.3-100.fc20.orig/net/unix/af_unix.c
657		-+++ linux-3.19.3-100.fc20/net/unix/af_unix.c
	656	+--- linux-3.19.8-100.fc20.orig/net/unix/af_unix.c
	657	++++ linux-3.19.8-100.fc20/net/unix/af_unix.c
658	658	@@ -1816,6 +1816,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.19.3-100.fc20.orig/security/Kconfig
670		-+++ linux-3.19.3-100.fc20/security/Kconfig
	669	+--- linux-3.19.8-100.fc20.orig/security/Kconfig
	670	++++ linux-3.19.8-100.fc20/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.19.3-100.fc20.orig/security/Makefile
680		-+++ linux-3.19.3-100.fc20/security/Makefile
	679	+--- linux-3.19.8-100.fc20.orig/security/Makefile
	680	++++ linux-3.19.8-100.fc20/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.19.3-100.fc20.orig/security/security.c
689		-+++ linux-3.19.3-100.fc20/security/security.c
	688	+--- linux-3.19.8-100.fc20.orig/security/security.c
	689	++++ linux-3.19.8-100.fc20/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)

--- trunk/caitsith-patch/patches/ccs-patch-3.13-ubuntu-14.04.diff (revision 152)

+++ trunk/caitsith-patch/patches/ccs-patch-3.13-ubuntu-14.04.diff (revision 153)

		@@ -29,8 +29,8 @@
29	29	security/security.c \| 107 ++++++++++++++++++++++++++++++++++++++++------
30	30	25 files changed, 236 insertions(+), 37 deletions(-)
31	31
32		---- linux-3.13.0-52.85.orig/fs/exec.c
33		-+++ linux-3.13.0-52.85/fs/exec.c
	32	+--- linux-3.13.0-53.89.orig/fs/exec.c
	33	++++ linux-3.13.0-53.89/fs/exec.c
34	34	@@ -1449,7 +1449,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.13.0-52.85.orig/fs/open.c
44		-+++ linux-3.13.0-52.85/fs/open.c
	43	+--- linux-3.13.0-53.89.orig/fs/open.c
	44	++++ linux-3.13.0-53.89/fs/open.c
45	45	@@ -1090,6 +1090,8 @@ EXPORT_SYMBOL(sys_close);
46	46	*/
47	47	SYSCALL_DEFINE0(vhangup)

		@@ -51,8 +51,8 @@
51	51	if (capable(CAP_SYS_TTY_CONFIG)) {
52	52	tty_vhangup_self();
53	53	return 0;
54		---- linux-3.13.0-52.85.orig/fs/proc/version.c
55		-+++ linux-3.13.0-52.85/fs/proc/version.c
	54	+--- linux-3.13.0-53.89.orig/fs/proc/version.c
	55	++++ linux-3.13.0-53.89/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.13.0-52.85 2015/05/06\n");
	63	++ printk(KERN_INFO "Hook version: 3.13.0-53.89 2015/06/06\n");
64	64	+ return 0;
65	65	+}
66	66	+module_init(ccs_show_version);
67		---- linux-3.13.0-52.85.orig/include/linux/init_task.h
68		-+++ linux-3.13.0-52.85/include/linux/init_task.h
	67	+--- linux-3.13.0-53.89.orig/include/linux/init_task.h
	68	++++ linux-3.13.0-53.89/include/linux/init_task.h
69	69	@@ -155,6 +155,14 @@ extern struct task_group root_task_group
70	70
71	71	#define INIT_TASK_COMM "swapper"

		@@ -89,8 +89,8 @@
89	89	}
90	90
91	91
92		---- linux-3.13.0-52.85.orig/include/linux/sched.h
93		-+++ linux-3.13.0-52.85/include/linux/sched.h
	92	+--- linux-3.13.0-53.89.orig/include/linux/sched.h
	93	++++ linux-3.13.0-53.89/include/linux/sched.h
94	94	@@ -4,6 +4,8 @@
95	95	#include <uapi/linux/sched.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.13.0-52.85.orig/include/linux/security.h
115		-+++ linux-3.13.0-52.85/include/linux/security.h
	114	+--- linux-3.13.0-53.89.orig/include/linux/security.h
	115	++++ linux-3.13.0-53.89/include/linux/security.h
116	116	@@ -53,6 +53,7 @@ struct msg_queue;
117	117	struct xattr;
118	118	struct xfrm_sec_ctx;

		@@ -314,8 +314,8 @@
314	314	}
315	315	#endif /* CONFIG_SECURITY_PATH */
316	316
317		---- linux-3.13.0-52.85.orig/include/net/ip.h
318		-+++ linux-3.13.0-52.85/include/net/ip.h
	317	+--- linux-3.13.0-53.89.orig/include/net/ip.h
	318	++++ linux-3.13.0-53.89/include/net/ip.h
319	319	@@ -224,6 +224,8 @@ void inet_get_local_port_range(struct ne
320	320	extern unsigned long *sysctl_local_reserved_ports;
321	321	static inline int inet_is_reserved_local_port(int port)

		@@ -325,8 +325,8 @@
325	325	return test_bit(port, sysctl_local_reserved_ports);
326	326	}
327	327
328		---- linux-3.13.0-52.85.orig/kernel/fork.c
329		-+++ linux-3.13.0-52.85/kernel/fork.c
	328	+--- linux-3.13.0-53.89.orig/kernel/fork.c
	329	++++ linux-3.13.0-53.89/kernel/fork.c
330	330	@@ -242,6 +242,7 @@ void __put_task_struct(struct task_struc
331	331	delayacct_tsk_free(tsk);
332	332	put_signal_struct(tsk->signal);

		@@ -353,8 +353,8 @@
353	353	bad_fork_cleanup_perf:
354	354	perf_event_free_task(p);
355	355	bad_fork_cleanup_policy:
356		---- linux-3.13.0-52.85.orig/kernel/kexec.c
357		-+++ linux-3.13.0-52.85/kernel/kexec.c
	356	+--- linux-3.13.0-53.89.orig/kernel/kexec.c
	357	++++ linux-3.13.0-53.89/kernel/kexec.c
358	358	@@ -37,6 +37,7 @@
359	359	#include <asm/uaccess.h>
360	360	#include <asm/io.h>

		@@ -372,8 +372,8 @@
372	372
373	373	/*
374	374	* Verify we have a legal set of flags
375		---- linux-3.13.0-52.85.orig/kernel/module.c
376		-+++ linux-3.13.0-52.85/kernel/module.c
	375	+--- linux-3.13.0-53.89.orig/kernel/module.c
	376	++++ linux-3.13.0-53.89/kernel/module.c
377	377	@@ -63,6 +63,7 @@
378	378	#include <linux/fips.h>
379	379	#include <uapi/linux/module.h>

		@@ -400,8 +400,8 @@
400	400
401	401	return 0;
402	402	}
403		---- linux-3.13.0-52.85.orig/kernel/ptrace.c
404		-+++ linux-3.13.0-52.85/kernel/ptrace.c
	403	+--- linux-3.13.0-53.89.orig/kernel/ptrace.c
	404	++++ linux-3.13.0-53.89/kernel/ptrace.c
405	405	@@ -1038,6 +1038,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
406	406	{
407	407	struct task_struct *child;

		@@ -426,8 +426,8 @@
426	426
427	427	if (request == PTRACE_TRACEME) {
428	428	ret = ptrace_traceme();
429		---- linux-3.13.0-52.85.orig/kernel/reboot.c
430		-+++ linux-3.13.0-52.85/kernel/reboot.c
	429	+--- linux-3.13.0-53.89.orig/kernel/reboot.c
	430	++++ linux-3.13.0-53.89/kernel/reboot.c
431	431	@@ -16,6 +16,7 @@
432	432	#include <linux/syscalls.h>
433	433	#include <linux/syscore_ops.h>

		@@ -445,8 +445,8 @@
445	445
446	446	/*
447	447	* If pid namespaces are enabled and the current task is in a child
448		---- linux-3.13.0-52.85.orig/kernel/sched/core.c
449		-+++ linux-3.13.0-52.85/kernel/sched/core.c
	448	+--- linux-3.13.0-53.89.orig/kernel/sched/core.c
	449	++++ linux-3.13.0-53.89/kernel/sched/core.c
450	450	@@ -2909,6 +2909,8 @@ int can_nice(const struct task_struct *p
451	451	SYSCALL_DEFINE1(nice, int, increment)
452	452	{

		@@ -456,8 +456,8 @@
456	456
457	457	/*
458	458	* Setpriority might change our priority at the same moment.
459		---- linux-3.13.0-52.85.orig/kernel/signal.c
460		-+++ linux-3.13.0-52.85/kernel/signal.c
	459	+--- linux-3.13.0-53.89.orig/kernel/signal.c
	460	++++ linux-3.13.0-53.89/kernel/signal.c
461	461	@@ -2909,6 +2909,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
462	462	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
463	463	{

		@@ -503,8 +503,8 @@
503	503
504	504	return do_send_specific(tgid, pid, sig, info);
505	505	}
506		---- linux-3.13.0-52.85.orig/kernel/sys.c
507		-+++ linux-3.13.0-52.85/kernel/sys.c
	506	+--- linux-3.13.0-53.89.orig/kernel/sys.c
	507	++++ linux-3.13.0-53.89/kernel/sys.c
508	508	@@ -171,6 +171,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
509	509
510	510	if (which > PRIO_USER \|\| which < PRIO_PROCESS)

		@@ -534,8 +534,8 @@
534	534
535	535	down_write(&uts_sem);
536	536	errno = -EFAULT;
537		---- linux-3.13.0-52.85.orig/kernel/time/ntp.c
538		-+++ linux-3.13.0-52.85/kernel/time/ntp.c
	537	+--- linux-3.13.0-53.89.orig/kernel/time/ntp.c
	538	++++ linux-3.13.0-53.89/kernel/time/ntp.c
539	539	@@ -16,6 +16,7 @@
540	540	#include <linux/mm.h>
541	541	#include <linux/module.h>

		@@ -569,8 +569,8 @@
569	569
570	570	/*
571	571	* Check for potential multiplication overflows that can
572		---- linux-3.13.0-52.85.orig/net/ipv4/raw.c
573		-+++ linux-3.13.0-52.85/net/ipv4/raw.c
	572	+--- linux-3.13.0-53.89.orig/net/ipv4/raw.c
	573	++++ linux-3.13.0-53.89/net/ipv4/raw.c
574	574	@@ -704,6 +704,10 @@ static int raw_recvmsg(struct kiocb *ioc
575	575	skb = skb_recv_datagram(sk, flags, noblock, &err);
576	576	if (!skb)

		@@ -582,8 +582,8 @@
582	582
583	583	copied = skb->len;
584	584	if (len < copied) {
585		---- linux-3.13.0-52.85.orig/net/ipv4/udp.c
586		-+++ linux-3.13.0-52.85/net/ipv4/udp.c
	585	+--- linux-3.13.0-53.89.orig/net/ipv4/udp.c
	586	++++ linux-3.13.0-53.89/net/ipv4/udp.c
587	587	@@ -1243,6 +1243,10 @@ try_again:
588	588	&peeked, &off, &err);
589	589	if (!skb)

		@@ -595,8 +595,8 @@
595	595
596	596	ulen = skb->len - sizeof(struct udphdr);
597	597	copied = len;
598		---- linux-3.13.0-52.85.orig/net/ipv6/raw.c
599		-+++ linux-3.13.0-52.85/net/ipv6/raw.c
	598	+--- linux-3.13.0-53.89.orig/net/ipv6/raw.c
	599	++++ linux-3.13.0-53.89/net/ipv6/raw.c
600	600	@@ -474,6 +474,10 @@ static int rawv6_recvmsg(struct kiocb *i
601	601	skb = skb_recv_datagram(sk, flags, noblock, &err);
602	602	if (!skb)

		@@ -608,8 +608,8 @@
608	608
609	609	copied = skb->len;
610	610	if (copied > len) {
611		---- linux-3.13.0-52.85.orig/net/ipv6/udp.c
612		-+++ linux-3.13.0-52.85/net/ipv6/udp.c
	611	+--- linux-3.13.0-53.89.orig/net/ipv6/udp.c
	612	++++ linux-3.13.0-53.89/net/ipv6/udp.c
613	613	@@ -403,6 +403,10 @@ try_again:
614	614	&peeked, &off, &err);
615	615	if (!skb)

		@@ -621,8 +621,8 @@
621	621
622	622	ulen = skb->len - sizeof(struct udphdr);
623	623	copied = len;
624		---- linux-3.13.0-52.85.orig/net/socket.c
625		-+++ linux-3.13.0-52.85/net/socket.c
	624	+--- linux-3.13.0-53.89.orig/net/socket.c
	625	++++ linux-3.13.0-53.89/net/socket.c
626	626	@@ -1616,6 +1616,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
627	627	if (err < 0)
628	628	goto out_fd;

		@@ -634,8 +634,8 @@
634	634	if (upeer_sockaddr) {
635	635	if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
636	636	&len, 2) < 0) {
637		---- linux-3.13.0-52.85.orig/net/unix/af_unix.c
638		-+++ linux-3.13.0-52.85/net/unix/af_unix.c
	637	+--- linux-3.13.0-53.89.orig/net/unix/af_unix.c
	638	++++ linux-3.13.0-53.89/net/unix/af_unix.c
639	639	@@ -1809,6 +1809,10 @@ static int unix_dgram_recvmsg(struct kio
640	640	wake_up_interruptible_sync_poll(&u->peer_wait,
641	641	POLLOUT \| POLLWRNORM \| POLLWRBAND);

		@@ -647,8 +647,8 @@
647	647	if (msg->msg_name)
648	648	unix_copy_addr(msg, skb->sk);
649	649
650		---- linux-3.13.0-52.85.orig/security/Kconfig
651		-+++ linux-3.13.0-52.85/security/Kconfig
	650	+--- linux-3.13.0-53.89.orig/security/Kconfig
	651	++++ linux-3.13.0-53.89/security/Kconfig
652	652	@@ -167,5 +167,7 @@ config DEFAULT_SECURITY
653	653	default "yama" if DEFAULT_SECURITY_YAMA
654	654	default "" if DEFAULT_SECURITY_DAC

		@@ -657,8 +657,8 @@
657	657	+
658	658	endmenu
659	659
660		---- linux-3.13.0-52.85.orig/security/Makefile
661		-+++ linux-3.13.0-52.85/security/Makefile
	660	+--- linux-3.13.0-53.89.orig/security/Makefile
	661	++++ linux-3.13.0-53.89/security/Makefile
662	662	@@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
663	663	# Object integrity file lists
664	664	subdir-$(CONFIG_INTEGRITY) += integrity

		@@ -666,8 +666,8 @@
666	666	+
667	667	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
668	668	+obj-$(CONFIG_CCSECURITY) += ccsecurity/built-in.o
669		---- linux-3.13.0-52.85.orig/security/security.c
670		-+++ linux-3.13.0-52.85/security/security.c
	669	+--- linux-3.13.0-53.89.orig/security/security.c
	670	++++ linux-3.13.0-53.89/security/security.c
671	671	@@ -203,7 +203,10 @@ int security_syslog(int type)
672	672
673	673	int security_settime(const struct timespec ts, const struct timezone tz)

--- trunk/caitsith-patch/patches/ccs-patch-3.10-centos-7.diff (revision 152)

+++ trunk/caitsith-patch/patches/ccs-patch-3.10-centos-7.diff (revision 153)

		@@ -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-229.1.2.el7.src.rpm
	3	+Source code for this patch is http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-229.4.2.el7.src.rpm
4	4	---
5	5	fs/exec.c \| 2
6	6	fs/open.c \| 2

		@@ -28,9 +28,9 @@
28	28	security/security.c \| 111 +++++++++++++++++++++++++++++++++++++++++-----
29	29	24 files changed, 248 insertions(+), 37 deletions(-)
30	30
31		---- linux-3.10.0-229.1.2.el7.orig/fs/exec.c
32		-+++ linux-3.10.0-229.1.2.el7/fs/exec.c
33		-@@ -1537,7 +1537,7 @@ static int do_execve_common(const char *
	31	+--- linux-3.10.0-229.4.2.el7.orig/fs/exec.c
	32	++++ linux-3.10.0-229.4.2.el7/fs/exec.c
	33	+@@ -1550,7 +1550,7 @@ static int do_execve_common(struct filen
34	34	if (retval < 0)
35	35	goto out;
36	36

		@@ -39,9 +39,9 @@
39	39	if (retval < 0)
40	40	goto out;
41	41
42		---- linux-3.10.0-229.1.2.el7.orig/fs/open.c
43		-+++ linux-3.10.0-229.1.2.el7/fs/open.c
44		-@@ -1104,6 +1104,8 @@ EXPORT_SYMBOL(sys_close);
	42	+--- linux-3.10.0-229.4.2.el7.orig/fs/open.c
	43	++++ linux-3.10.0-229.4.2.el7/fs/open.c
	44	+@@ -1110,6 +1110,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-3.10.0-229.1.2.el7.orig/fs/proc/version.c
54		-+++ linux-3.10.0-229.1.2.el7/fs/proc/version.c
	53	+--- linux-3.10.0-229.4.2.el7.orig/fs/proc/version.c
	54	++++ linux-3.10.0-229.4.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-229.1.2.el7 2015/04/01\n");
	62	++ printk(KERN_INFO "Hook version: 3.10.0-229.4.2.el7 2015/06/06\n");
63	63	+ return 0;
64	64	+}
65	65	+module_init(ccs_show_version);
66		---- linux-3.10.0-229.1.2.el7.orig/include/linux/init_task.h
67		-+++ linux-3.10.0-229.1.2.el7/include/linux/init_task.h
	66	+--- linux-3.10.0-229.4.2.el7.orig/include/linux/init_task.h
	67	++++ linux-3.10.0-229.4.2.el7/include/linux/init_task.h
68	68	@@ -155,6 +155,14 @@ extern struct task_group root_task_group
69	69
70	70	#define INIT_TASK_COMM "swapper"

		@@ -88,8 +88,8 @@
88	88	}
89	89
90	90
91		---- linux-3.10.0-229.1.2.el7.orig/include/linux/sched.h
92		-+++ linux-3.10.0-229.1.2.el7/include/linux/sched.h
	91	+--- linux-3.10.0-229.4.2.el7.orig/include/linux/sched.h
	92	++++ linux-3.10.0-229.4.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>

		@@ -99,7 +99,7 @@
99	99	struct sched_param {
100	100	int sched_priority;
101	101	};
102		-@@ -1555,6 +1557,10 @@ struct task_struct {
	102	+@@ -1557,6 +1559,10 @@ struct task_struct {
103	103	RH_KABI_RESERVE(6)
104	104	RH_KABI_RESERVE(7)
105	105	RH_KABI_RESERVE(8)

		@@ -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-229.1.2.el7.orig/include/linux/security.h
114		-+++ linux-3.10.0-229.1.2.el7/include/linux/security.h
	113	+--- linux-3.10.0-229.4.2.el7.orig/include/linux/security.h
	114	++++ linux-3.10.0-229.4.2.el7/include/linux/security.h
115	115	@@ -53,6 +53,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-229.1.2.el7.orig/include/net/ip.h
327		-+++ linux-3.10.0-229.1.2.el7/include/net/ip.h
	326	+--- linux-3.10.0-229.4.2.el7.orig/include/net/ip.h
	327	++++ linux-3.10.0-229.4.2.el7/include/net/ip.h
328	328	@@ -229,6 +229,8 @@ extern void inet_get_local_port_range(in
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-229.1.2.el7.orig/kernel/fork.c
338		-+++ linux-3.10.0-229.1.2.el7/kernel/fork.c
	337	+--- linux-3.10.0-229.4.2.el7.orig/kernel/fork.c
	338	++++ linux-3.10.0-229.4.2.el7/kernel/fork.c
339	339	@@ -242,6 +242,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_policy:
363	363	perf_event_free_task(p);
364	364	#ifdef CONFIG_NUMA
365		---- linux-3.10.0-229.1.2.el7.orig/kernel/kexec.c
366		-+++ linux-3.10.0-229.1.2.el7/kernel/kexec.c
	365	+--- linux-3.10.0-229.4.2.el7.orig/kernel/kexec.c
	366	++++ linux-3.10.0-229.4.2.el7/kernel/kexec.c
367	367	@@ -1250,6 +1250,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-229.1.2.el7.orig/kernel/module.c
377		-+++ linux-3.10.0-229.1.2.el7/kernel/module.c
	376	+--- linux-3.10.0-229.4.2.el7.orig/kernel/module.c
	377	++++ linux-3.10.0-229.4.2.el7/kernel/module.c
378	378	@@ -62,6 +62,7 @@
379	379	#include <linux/bsearch.h>
380	380	#include <uapi/linux/module.h>

		@@ -401,8 +401,8 @@
401	401
402	402	return 0;
403	403	}
404		---- linux-3.10.0-229.1.2.el7.orig/kernel/ptrace.c
405		-+++ linux-3.10.0-229.1.2.el7/kernel/ptrace.c
	404	+--- linux-3.10.0-229.4.2.el7.orig/kernel/ptrace.c
	405	++++ linux-3.10.0-229.4.2.el7/kernel/ptrace.c
406	406	@@ -998,6 +998,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
407	407	{
408	408	struct task_struct *child;

		@@ -427,9 +427,9 @@
427	427
428	428	if (request == PTRACE_TRACEME) {
429	429	ret = ptrace_traceme();
430		---- linux-3.10.0-229.1.2.el7.orig/kernel/sched/core.c
431		-+++ linux-3.10.0-229.1.2.el7/kernel/sched/core.c
432		-@@ -3917,6 +3917,8 @@ int can_nice(const struct task_struct *p
	430	+--- linux-3.10.0-229.4.2.el7.orig/kernel/sched/core.c
	431	++++ linux-3.10.0-229.4.2.el7/kernel/sched/core.c
	432	+@@ -3929,6 +3929,8 @@ int can_nice(const struct task_struct *p
433	433	SYSCALL_DEFINE1(nice, int, increment)
434	434	{
435	435	long nice, retval;

		@@ -438,8 +438,8 @@
438	438
439	439	/*
440	440	* Setpriority might change our priority at the same moment.
441		---- linux-3.10.0-229.1.2.el7.orig/kernel/signal.c
442		-+++ linux-3.10.0-229.1.2.el7/kernel/signal.c
	441	+--- linux-3.10.0-229.4.2.el7.orig/kernel/signal.c
	442	++++ linux-3.10.0-229.4.2.el7/kernel/signal.c
443	443	@@ -2909,6 +2909,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-229.1.2.el7.orig/kernel/sys.c
489		-+++ linux-3.10.0-229.1.2.el7/kernel/sys.c
	488	+--- linux-3.10.0-229.4.2.el7.orig/kernel/sys.c
	489	++++ linux-3.10.0-229.4.2.el7/kernel/sys.c
490	490	@@ -186,6 +186,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-229.1.2.el7.orig/kernel/time/ntp.c
529		-+++ linux-3.10.0-229.1.2.el7/kernel/time/ntp.c
	528	+--- linux-3.10.0-229.4.2.el7.orig/kernel/time/ntp.c
	529	++++ linux-3.10.0-229.4.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-229.1.2.el7.orig/net/ipv4/raw.c
564		-+++ linux-3.10.0-229.1.2.el7/net/ipv4/raw.c
	563	+--- linux-3.10.0-229.4.2.el7.orig/net/ipv4/raw.c
	564	++++ linux-3.10.0-229.4.2.el7/net/ipv4/raw.c
565	565	@@ -702,6 +702,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-229.1.2.el7.orig/net/ipv4/udp.c
577		-+++ linux-3.10.0-229.1.2.el7/net/ipv4/udp.c
	576	+--- linux-3.10.0-229.4.2.el7.orig/net/ipv4/udp.c
	577	++++ linux-3.10.0-229.4.2.el7/net/ipv4/udp.c
578	578	@@ -1259,6 +1259,10 @@ try_again:
579	579	&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-229.1.2.el7.orig/net/ipv6/raw.c
590		-+++ linux-3.10.0-229.1.2.el7/net/ipv6/raw.c
	589	+--- linux-3.10.0-229.4.2.el7.orig/net/ipv6/raw.c
	590	++++ linux-3.10.0-229.4.2.el7/net/ipv6/raw.c
591	591	@@ -467,6 +467,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-229.1.2.el7.orig/net/ipv6/udp.c
603		-+++ linux-3.10.0-229.1.2.el7/net/ipv6/udp.c
	602	+--- linux-3.10.0-229.4.2.el7.orig/net/ipv6/udp.c
	603	++++ linux-3.10.0-229.4.2.el7/net/ipv6/udp.c
604	604	@@ -380,6 +380,10 @@ try_again:
605	605	&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-229.1.2.el7.orig/net/socket.c
616		-+++ linux-3.10.0-229.1.2.el7/net/socket.c
	615	+--- linux-3.10.0-229.4.2.el7.orig/net/socket.c
	616	++++ linux-3.10.0-229.4.2.el7/net/socket.c
617	617	@@ -1628,6 +1628,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-229.1.2.el7.orig/net/unix/af_unix.c
629		-+++ linux-3.10.0-229.1.2.el7/net/unix/af_unix.c
	628	+--- linux-3.10.0-229.4.2.el7.orig/net/unix/af_unix.c
	629	++++ linux-3.10.0-229.4.2.el7/net/unix/af_unix.c
630	630	@@ -1810,6 +1810,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-229.1.2.el7.orig/security/Kconfig
642		-+++ linux-3.10.0-229.1.2.el7/security/Kconfig
	641	+--- linux-3.10.0-229.4.2.el7.orig/security/Kconfig
	642	++++ linux-3.10.0-229.4.2.el7/security/Kconfig
643	643	@@ -175,5 +175,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-229.1.2.el7.orig/security/Makefile
652		-+++ linux-3.10.0-229.1.2.el7/security/Makefile
	651	+--- linux-3.10.0-229.4.2.el7.orig/security/Makefile
	652	++++ linux-3.10.0-229.4.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-229.1.2.el7.orig/security/security.c
661		-+++ linux-3.10.0-229.1.2.el7/security/security.c
	660	+--- linux-3.10.0-229.4.2.el7.orig/security/security.c
	661	++++ linux-3.10.0-229.4.2.el7/security/security.c
662	662	@@ -203,7 +203,10 @@ int security_syslog(int type)
663	663
664	664	int security_settime(const struct timespec ts, const struct timezone tz)

--- trunk/caitsith-patch/patches/ccs-patch-3.2-ubuntu-12.04.diff (revision 152)

+++ trunk/caitsith-patch/patches/ccs-patch-3.2-ubuntu-12.04.diff (revision 153)

		@@ -28,8 +28,8 @@
28	28	security/security.c \| 132 +++++++++++++++++++++++++++++++++++++---------
29	29	24 files changed, 245 insertions(+), 49 deletions(-)
30	30
31		---- linux-3.2.0-83.120.orig/fs/exec.c
32		-+++ linux-3.2.0-83.120/fs/exec.c
	31	+--- linux-3.2.0-84.121.orig/fs/exec.c
	32	++++ linux-3.2.0-84.121/fs/exec.c
33	33	@@ -1582,7 +1582,7 @@ static int do_execve_common(const char *
34	34	if (retval < 0)
35	35	goto out;

		@@ -39,8 +39,8 @@
39	39	if (retval < 0)
40	40	goto out;
41	41
42		---- linux-3.2.0-83.120.orig/fs/open.c
43		-+++ linux-3.2.0-83.120/fs/open.c
	42	+--- linux-3.2.0-84.121.orig/fs/open.c
	43	++++ linux-3.2.0-84.121/fs/open.c
44	44	@@ -1129,6 +1129,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.2.0-83.120.orig/fs/proc/version.c
54		-+++ linux-3.2.0-83.120/fs/proc/version.c
	53	+--- linux-3.2.0-84.121.orig/fs/proc/version.c
	54	++++ linux-3.2.0-84.121/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.2.0-83.120 2015/05/06\n");
	62	++ printk(KERN_INFO "Hook version: 3.2.0-84.121 2015/06/06\n");
63	63	+ return 0;
64	64	+}
65	65	+module_init(ccs_show_version);
66		---- linux-3.2.0-83.120.orig/include/linux/init_task.h
67		-+++ linux-3.2.0-83.120/include/linux/init_task.h
	66	+--- linux-3.2.0-84.121.orig/include/linux/init_task.h
	67	++++ linux-3.2.0-84.121/include/linux/init_task.h
68	68	@@ -144,6 +144,14 @@ extern struct task_group root_task_group
69	69
70	70	#define INIT_TASK_COMM "swapper"

		@@ -88,8 +88,8 @@
88	88	}
89	89
90	90
91		---- linux-3.2.0-83.120.orig/include/linux/sched.h
92		-+++ linux-3.2.0-83.120/include/linux/sched.h
	91	+--- linux-3.2.0-84.121.orig/include/linux/sched.h
	92	++++ linux-3.2.0-84.121/include/linux/sched.h
93	93	@@ -44,6 +44,8 @@
94	94
95	95	#ifdef __KERNEL__

		@@ -110,8 +110,8 @@
110	110	};
111	111
112	112	/* Future-safe accessor for struct task_struct's cpus_allowed. */
113		---- linux-3.2.0-83.120.orig/include/linux/security.h
114		-+++ linux-3.2.0-83.120/include/linux/security.h
	113	+--- linux-3.2.0-84.121.orig/include/linux/security.h
	114	++++ linux-3.2.0-84.121/include/linux/security.h
115	115	@@ -38,6 +38,7 @@
116	116	#include <linux/slab.h>
117	117	#include <linux/xattr.h>

		@@ -308,8 +308,8 @@
308	308	}
309	309	#endif /* CONFIG_SECURITY_PATH */
310	310
311		---- linux-3.2.0-83.120.orig/include/net/ip.h
312		-+++ linux-3.2.0-83.120/include/net/ip.h
	311	+--- linux-3.2.0-84.121.orig/include/net/ip.h
	312	++++ linux-3.2.0-84.121/include/net/ip.h
313	313	@@ -217,6 +217,8 @@ extern void inet_get_local_port_range(in
314	314	extern unsigned long *sysctl_local_reserved_ports;
315	315	static inline int inet_is_reserved_local_port(int port)

		@@ -319,8 +319,8 @@
319	319	return test_bit(port, sysctl_local_reserved_ports);
320	320	}
321	321
322		---- linux-3.2.0-83.120.orig/kernel/fork.c
323		-+++ linux-3.2.0-83.120/kernel/fork.c
	322	+--- linux-3.2.0-84.121.orig/kernel/fork.c
	323	++++ linux-3.2.0-84.121/kernel/fork.c
324	324	@@ -198,6 +198,7 @@ void __put_task_struct(struct task_struc
325	325	delayacct_tsk_free(tsk);
326	326	put_signal_struct(tsk->signal);

		@@ -347,8 +347,8 @@
347	347	bad_fork_cleanup_perf:
348	348	perf_event_free_task(p);
349	349	bad_fork_cleanup_policy:
350		---- linux-3.2.0-83.120.orig/kernel/kexec.c
351		-+++ linux-3.2.0-83.120/kernel/kexec.c
	350	+--- linux-3.2.0-84.121.orig/kernel/kexec.c
	351	++++ linux-3.2.0-84.121/kernel/kexec.c
352	352	@@ -39,6 +39,7 @@
353	353	#include <asm/io.h>
354	354	#include <asm/system.h>

		@@ -366,8 +366,8 @@
366	366
367	367	/* Processes in containers must not be allowed to load a new
368	368	* kernel, even if they have CAP_SYS_BOOT */
369		---- linux-3.2.0-83.120.orig/kernel/module.c
370		-+++ linux-3.2.0-83.120/kernel/module.c
	369	+--- linux-3.2.0-84.121.orig/kernel/module.c
	370	++++ linux-3.2.0-84.121/kernel/module.c
371	371	@@ -58,6 +58,7 @@
372	372	#include <linux/jump_label.h>
373	373	#include <linux/pfn.h>

		@@ -394,8 +394,8 @@
394	394
395	395	/* Do all the hard work */
396	396	mod = load_module(umod, len, uargs);
397		---- linux-3.2.0-83.120.orig/kernel/ptrace.c
398		-+++ linux-3.2.0-83.120/kernel/ptrace.c
	397	+--- linux-3.2.0-84.121.orig/kernel/ptrace.c
	398	++++ linux-3.2.0-84.121/kernel/ptrace.c
399	399	@@ -911,6 +911,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
400	400	{
401	401	struct task_struct *child;

		@@ -420,8 +420,8 @@
420	420
421	421	if (request == PTRACE_TRACEME) {
422	422	ret = ptrace_traceme();
423		---- linux-3.2.0-83.120.orig/kernel/sched.c
424		-+++ linux-3.2.0-83.120/kernel/sched.c
	423	+--- linux-3.2.0-84.121.orig/kernel/sched.c
	424	++++ linux-3.2.0-84.121/kernel/sched.c
425	425	@@ -5313,6 +5313,8 @@ int can_nice(const struct task_struct *p
426	426	SYSCALL_DEFINE1(nice, int, increment)
427	427	{

		@@ -431,8 +431,8 @@
431	431
432	432	/*
433	433	* Setpriority might change our priority at the same moment.
434		---- linux-3.2.0-83.120.orig/kernel/signal.c
435		-+++ linux-3.2.0-83.120/kernel/signal.c
	434	+--- linux-3.2.0-84.121.orig/kernel/signal.c
	435	++++ linux-3.2.0-84.121/kernel/signal.c
436	436	@@ -2755,6 +2755,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
437	437	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
438	438	{

		@@ -478,8 +478,8 @@
478	478
479	479	return do_send_specific(tgid, pid, sig, info);
480	480	}
481		---- linux-3.2.0-83.120.orig/kernel/sys.c
482		-+++ linux-3.2.0-83.120/kernel/sys.c
	481	+--- linux-3.2.0-84.121.orig/kernel/sys.c
	482	++++ linux-3.2.0-84.121/kernel/sys.c
483	483	@@ -180,6 +180,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
484	484
485	485	if (which > PRIO_USER \|\| which < PRIO_PROCESS)

		@@ -518,8 +518,8 @@
518	518
519	519	down_write(&uts_sem);
520	520	errno = -EFAULT;
521		---- linux-3.2.0-83.120.orig/kernel/time/ntp.c
522		-+++ linux-3.2.0-83.120/kernel/time/ntp.c
	521	+--- linux-3.2.0-84.121.orig/kernel/time/ntp.c
	522	++++ linux-3.2.0-84.121/kernel/time/ntp.c
523	523	@@ -15,6 +15,7 @@
524	524	#include <linux/time.h>
525	525	#include <linux/mm.h>

		@@ -553,8 +553,8 @@
553	553	if (!(txc->modes & ADJ_NANO))
554	554	delta.tv_nsec *= 1000;
555	555	result = timekeeping_inject_offset(&delta);
556		---- linux-3.2.0-83.120.orig/net/ipv4/raw.c
557		-+++ linux-3.2.0-83.120/net/ipv4/raw.c
	556	+--- linux-3.2.0-84.121.orig/net/ipv4/raw.c
	557	++++ linux-3.2.0-84.121/net/ipv4/raw.c
558	558	@@ -697,6 +697,10 @@ static int raw_recvmsg(struct kiocb *ioc
559	559	skb = skb_recv_datagram(sk, flags, noblock, &err);
560	560	if (!skb)

		@@ -566,8 +566,8 @@
566	566
567	567	copied = skb->len;
568	568	if (len < copied) {
569		---- linux-3.2.0-83.120.orig/net/ipv4/udp.c
570		-+++ linux-3.2.0-83.120/net/ipv4/udp.c
	569	+--- linux-3.2.0-84.121.orig/net/ipv4/udp.c
	570	++++ linux-3.2.0-84.121/net/ipv4/udp.c
571	571	@@ -1182,6 +1182,10 @@ try_again:
572	572	&peeked, &err);
573	573	if (!skb)

		@@ -579,8 +579,8 @@
579	579
580	580	ulen = skb->len - sizeof(struct udphdr);
581	581	copied = len;
582		---- linux-3.2.0-83.120.orig/net/ipv6/raw.c
583		-+++ linux-3.2.0-83.120/net/ipv6/raw.c
	582	+--- linux-3.2.0-84.121.orig/net/ipv6/raw.c
	583	++++ linux-3.2.0-84.121/net/ipv6/raw.c
584	584	@@ -465,6 +465,10 @@ static int rawv6_recvmsg(struct kiocb *i
585	585	skb = skb_recv_datagram(sk, flags, noblock, &err);
586	586	if (!skb)

		@@ -592,8 +592,8 @@
592	592
593	593	copied = skb->len;
594	594	if (copied > len) {
595		---- linux-3.2.0-83.120.orig/net/ipv6/udp.c
596		-+++ linux-3.2.0-83.120/net/ipv6/udp.c
	595	+--- linux-3.2.0-84.121.orig/net/ipv6/udp.c
	596	++++ linux-3.2.0-84.121/net/ipv6/udp.c
597	597	@@ -358,6 +358,10 @@ try_again:
598	598	&peeked, &err);
599	599	if (!skb)

		@@ -605,8 +605,8 @@
605	605
606	606	ulen = skb->len - sizeof(struct udphdr);
607	607	copied = len;
608		---- linux-3.2.0-83.120.orig/net/socket.c
609		-+++ linux-3.2.0-83.120/net/socket.c
	608	+--- linux-3.2.0-84.121.orig/net/socket.c
	609	++++ linux-3.2.0-84.121/net/socket.c
610	610	@@ -1531,6 +1531,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
611	611	if (err < 0)
612	612	goto out_fd;

		@@ -618,8 +618,8 @@
618	618	if (upeer_sockaddr) {
619	619	if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
620	620	&len, 2) < 0) {
621		---- linux-3.2.0-83.120.orig/net/unix/af_unix.c
622		-+++ linux-3.2.0-83.120/net/unix/af_unix.c
	621	+--- linux-3.2.0-84.121.orig/net/unix/af_unix.c
	622	++++ linux-3.2.0-84.121/net/unix/af_unix.c
623	623	@@ -1793,6 +1793,10 @@ static int unix_dgram_recvmsg(struct kio
624	624	wake_up_interruptible_sync_poll(&u->peer_wait,
625	625	POLLOUT \| POLLWRNORM \| POLLWRBAND);

		@@ -631,8 +631,8 @@
631	631	if (msg->msg_name)
632	632	unix_copy_addr(msg, skb->sk);
633	633
634		---- linux-3.2.0-83.120.orig/security/Kconfig
635		-+++ linux-3.2.0-83.120/security/Kconfig
	634	+--- linux-3.2.0-84.121.orig/security/Kconfig
	635	++++ linux-3.2.0-84.121/security/Kconfig
636	636	@@ -233,5 +233,7 @@ config DEFAULT_SECURITY
637	637	default "yama" if DEFAULT_SECURITY_YAMA
638	638	default "" if DEFAULT_SECURITY_DAC

		@@ -641,8 +641,8 @@
641	641	+
642	642	endmenu
643	643
644		---- linux-3.2.0-83.120.orig/security/Makefile
645		-+++ linux-3.2.0-83.120/security/Makefile
	644	+--- linux-3.2.0-84.121.orig/security/Makefile
	645	++++ linux-3.2.0-84.121/security/Makefile
646	646	@@ -28,3 +28,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
647	647	# Object integrity file lists
648	648	subdir-$(CONFIG_INTEGRITY) += integrity

		@@ -650,8 +650,8 @@
650	650	+
651	651	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
652	652	+obj-$(CONFIG_CCSECURITY) += ccsecurity/built-in.o
653		---- linux-3.2.0-83.120.orig/security/security.c
654		-+++ linux-3.2.0-83.120/security/security.c
	653	+--- linux-3.2.0-84.121.orig/security/security.c
	654	++++ linux-3.2.0-84.121/security/security.c
655	655	@@ -206,7 +206,10 @@ int security_syslog(int type)
656	656
657	657	int security_settime(const struct timespec ts, const struct timezone tz)

--- trunk/caitsith-patch/security/caitsith/gc.c (revision 152)

+++ trunk/caitsith-patch/security/caitsith/gc.c (revision 153)

		@@ -3,7 +3,7 @@
3	3	*
4	4	* Copyright (C) 2005-2012 NTT DATA CORPORATION
5	5	*
6		- * Version: 0.1.12 2015/04/08
	6	+ * Version: 0.1.13 2015/06/06
7	7	*/
8	8
9	9	#include "internal.h"

--- trunk/caitsith-patch/security/caitsith/load_policy.c (revision 152)

+++ trunk/caitsith-patch/security/caitsith/load_policy.c (revision 153)

		@@ -3,7 +3,7 @@
3	3	*
4	4	* Copyright (C) 2005-2012 NTT DATA CORPORATION
5	5	*
6		- * Version: 0.1.12 2015/04/08
	6	+ * Version: 0.1.13 2015/06/06
7	7	*/
8	8
9	9	#include <linux/version.h>

--- trunk/caitsith-patch/security/caitsith/realpath.c (revision 152)

+++ trunk/caitsith-patch/security/caitsith/realpath.c (revision 153)

		@@ -3,7 +3,7 @@
3	3	*
4	4	* Copyright (C) 2005-2012 NTT DATA CORPORATION
5	5	*
6		- * Version: 0.1.12 2015/04/08
	6	+ * Version: 0.1.13 2015/06/06
7	7	*/
8	8
9	9	#include "internal.h"

--- trunk/caitsith-patch/security/caitsith/internal.h (revision 152)

+++ trunk/caitsith-patch/security/caitsith/internal.h (revision 153)

		@@ -3,7 +3,7 @@
3	3	*
4	4	* Copyright (C) 2005-2012 NTT DATA CORPORATION
5	5	*
6		- * Version: 0.1.12 2015/04/08
	6	+ * Version: 0.1.13 2015/06/06
7	7	*/
8	8
9	9	#ifndef _SECURITY_CAITSITH_INTERNAL_H

--- trunk/caitsith-patch/security/caitsith/policy_io.c (revision 152)

+++ trunk/caitsith-patch/security/caitsith/policy_io.c (revision 153)

		@@ -3,7 +3,7 @@
3	3	*
4	4	* Copyright (C) 2005-2012 NTT DATA CORPORATION
5	5	*
6		- * Version: 0.1.12 2015/04/08
	6	+ * Version: 0.1.13 2015/06/06
7	7	*/
8	8
9	9	#include "internal.h"

		@@ -2197,7 +2197,7 @@
2197	2197	static void cs_check_profile(void)
2198	2198	{
2199	2199	cs_policy_loaded = true;
2200		- printk(KERN_INFO "CaitSith: 0.1.12 2015/04/08\n");
	2200	+ printk(KERN_INFO "CaitSith: 0.1.13 2015/06/06\n");
2201	2201	if (cs_policy_version == 20120401) {
2202	2202	printk(KERN_INFO "CaitSith module activated.\n");
2203	2203	return;

		@@ -3108,7 +3108,7 @@
3108	3108	{
3109	3109	if (head->r.eof)
3110	3110	return;
3111		- cs_set_string(head, "0.1.12");
	3111	+ cs_set_string(head, "0.1.13");
3112	3112	head->r.eof = true;
3113	3113	}
3114	3114

--- trunk/caitsith-patch/security/caitsith/memory.c (revision 152)

+++ trunk/caitsith-patch/security/caitsith/memory.c (revision 153)

		@@ -3,7 +3,7 @@
3	3	*
4	4	* Copyright (C) 2005-2012 NTT DATA CORPORATION
5	5	*
6		- * Version: 0.1.12 2015/04/08
	6	+ * Version: 0.1.13 2015/06/06
7	7	*/
8	8
9	9	#include "internal.h"

--- trunk/caitsith-patch/security/caitsith/permission.c (revision 152)

+++ trunk/caitsith-patch/security/caitsith/permission.c (revision 153)

		@@ -3,7 +3,7 @@
3	3	*
4	4	* Copyright (C) 2005-2012 NTT DATA CORPORATION
5	5	*
6		- * Version: 0.1.12 2015/04/08
	6	+ * Version: 0.1.13 2015/06/06
7	7	*/
8	8
9	9	#include "internal.h"

--- trunk/caitsith-patch/caitsith/lsm.c (revision 152)

+++ trunk/caitsith-patch/caitsith/lsm.c (revision 153)

		@@ -3,7 +3,7 @@
3	3	*
4	4	* Copyright (C) 2010-2013 Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
5	5	*
6		- * Version: 0.1.12 2015/04/08
	6	+ * Version: 0.1.13 2015/06/06
7	7	*/
8	8
9	9	#include <linux/version.h>

--- trunk/caitsith-patch/caitsith/lsm-4.2.c (revision 152)

+++ trunk/caitsith-patch/caitsith/lsm-4.2.c (revision 153)

		@@ -3,7 +3,7 @@
3	3	*
4	4	* Copyright (C) 2010-2013 Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
5	5	*
6		- * Version: 0.1.12 2015/04/08
	6	+ * Version: 0.1.13 2015/06/06
7	7	*/
8	8
9	9	#include "caitsith.h"

--- trunk/caitsith-patch/caitsith/realpath.c (revision 152)

+++ trunk/caitsith-patch/caitsith/realpath.c (revision 153)

		@@ -3,7 +3,7 @@
3	3	*
4	4	* Copyright (C) 2005-2012 NTT DATA CORPORATION
5	5	*
6		- * Version: 0.1.12 2015/04/08
	6	+ * Version: 0.1.13 2015/06/06
7	7	*/
8	8
9	9	#include "caitsith.h"

--- trunk/caitsith-patch/caitsith/mclsm.c (revision 152)

+++ trunk/caitsith-patch/caitsith/mclsm.c (revision 153)

		@@ -3,7 +3,7 @@
3	3	*
4	4	* Copyright (C) 2010-2013 Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
5	5	*
6		- * Version: 0.1.12 2015/04/08
	6	+ * Version: 0.1.13 2015/06/06
7	7	*/
8	8
9	9	#include "caitsith.h"

--- trunk/caitsith-patch/caitsith/caitsith.h (revision 152)

+++ trunk/caitsith-patch/caitsith/caitsith.h (revision 153)

		@@ -3,7 +3,7 @@
3	3	*
4	4	* Copyright (C) 2005-2012 NTT DATA CORPORATION
5	5	*
6		- * Version: 0.1.12 2015/04/08
	6	+ * Version: 0.1.13 2015/06/06
7	7	*/
8	8
9	9	#ifndef _SECURITY_CAITSITH_INTERNAL_H

--- trunk/caitsith-patch/caitsith/lsm-2.6.27-vfs.c (revision 152)

+++ trunk/caitsith-patch/caitsith/lsm-2.6.27-vfs.c (revision 153)

		@@ -3,7 +3,7 @@
3	3	*
4	4	* Copyright (C) 2010-2013 Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
5	5	*
6		- * Version: 0.1.12 2015/04/08
	6	+ * Version: 0.1.13 2015/06/06
7	7	*/
8	8
9	9	#include "caitsith.h"

--- trunk/caitsith-patch/caitsith/lsm-2.6.27.c (revision 152)

+++ trunk/caitsith-patch/caitsith/lsm-2.6.27.c (revision 153)

		@@ -3,7 +3,7 @@
3	3	*
4	4	* Copyright (C) 2010-2013 Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
5	5	*
6		- * Version: 0.1.12 2015/04/08
	6	+ * Version: 0.1.13 2015/06/06
7	7	*/
8	8
9	9	#include "caitsith.h"

--- trunk/caitsith-patch/caitsith/policy_io.c (revision 152)

+++ trunk/caitsith-patch/caitsith/policy_io.c (revision 153)

		@@ -3,7 +3,7 @@
3	3	*
4	4	* Copyright (C) 2005-2012 NTT DATA CORPORATION
5	5	*
6		- * Version: 0.1.12 2015/04/08
	6	+ * Version: 0.1.13 2015/06/06
7	7	*/
8	8
9	9	#include "caitsith.h"

		@@ -2154,7 +2154,7 @@
2154	2154	void cs_check_profile(void)
2155	2155	{
2156	2156	cs_policy_loaded = true;
2157		- printk(KERN_INFO "CaitSith (LSM): 0.1.12 2015/04/08\n");
	2157	+ printk(KERN_INFO "CaitSith (LSM): 0.1.13 2015/06/06\n");
2158	2158	if (cs_policy_version == 20120401) {
2159	2159	printk(KERN_INFO "CaitSith module activated.\n");
2160	2160	return;

		@@ -3065,7 +3065,7 @@
3065	3065	{
3066	3066	if (head->r.eof)
3067	3067	return;
3068		- cs_set_string(head, "0.1.12");
	3068	+ cs_set_string(head, "0.1.13");
3069	3069	head->r.eof = true;
3070	3070	}
3071	3071

--- trunk/caitsith-patch/caitsith/lsm-2.6.29.c (revision 152)

+++ trunk/caitsith-patch/caitsith/lsm-2.6.29.c (revision 153)

		@@ -3,7 +3,7 @@
3	3	*
4	4	* Copyright (C) 2010-2013 Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
5	5	*
6		- * Version: 0.1.12 2015/04/08
	6	+ * Version: 0.1.13 2015/06/06
7	7	*/
8	8
9	9	#include "caitsith.h"

--- trunk/caitsith-patch/caitsith/permission.c (revision 152)

+++ trunk/caitsith-patch/caitsith/permission.c (revision 153)

		@@ -3,7 +3,7 @@
3	3	*
4	4	* Copyright (C) 2005-2012 NTT DATA CORPORATION
5	5	*
6		- * Version: 0.1.12 2015/04/08
	6	+ * Version: 0.1.13 2015/06/06
7	7	*/
8	8
9	9	#include "caitsith.h"

--- trunk/caitsith-patch/caitsith/gc.c (revision 152)

+++ trunk/caitsith-patch/caitsith/gc.c (revision 153)

		@@ -3,7 +3,7 @@
3	3	*
4	4	* Copyright (C) 2005-2012 NTT DATA CORPORATION
5	5	*
6		- * Version: 0.1.12 2015/04/08
	6	+ * Version: 0.1.13 2015/06/06
7	7	*/
8	8
9	9	#include "caitsith.h"

Show on old repository browser