OSDN > ソフトウェアを探す > システム > オペレーティングシステムカーネル > Linux > TOMOYO > SCM > SVN > コミット

TOMOYO
Fork

R/O
SSH
HTTPS

tomoyo: コミット

コミットメタ情報

リビジョン	6644 (tree)
日時	2018-04-30 19:30:30
作者	kumaneko

ログメッセージ

(メッセージはありません)

変更サマリ

modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-3.10-centos-7.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-3.18.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-4.14.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-4.16.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-4.17.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-4.4.diff (diff)
modified: trunk/1.8.x/ccs-patch/patches/ccs-patch-4.9.diff (diff)
modified: trunk/1.8.x/ccs-patch/specs/build-c7-3.10.sh (diff)

差分

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-3.10-centos-7.diff (revision 6643)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-3.10-centos-7.diff (revision 6644)

		@@ -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-693.21.1.el7.src.rpm
	3	+Source code for this patch is http://vault.centos.org/centos/7/os/Source/SPackages/kernel-3.10.0-862.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-693.21.1.el7.orig/fs/exec.c
32		-+++ linux-3.10.0-693.21.1.el7/fs/exec.c
33		-@@ -1580,7 +1580,7 @@ static int do_execve_common(struct filen
	31	+--- linux-3.10.0-862.el7.orig/fs/exec.c
	32	++++ linux-3.10.0-862.el7/fs/exec.c
	33	+@@ -1592,7 +1592,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-693.21.1.el7.orig/fs/open.c
43		-+++ linux-3.10.0-693.21.1.el7/fs/open.c
44		-@@ -1131,6 +1131,8 @@ EXPORT_SYMBOL(sys_close);
	42	+--- linux-3.10.0-862.el7.orig/fs/open.c
	43	++++ linux-3.10.0-862.el7/fs/open.c
	44	+@@ -1142,6 +1142,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-693.21.1.el7.orig/fs/proc/version.c
54		-+++ linux-3.10.0-693.21.1.el7/fs/proc/version.c
	53	+--- linux-3.10.0-862.el7.orig/fs/proc/version.c
	54	++++ linux-3.10.0-862.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-693.21.1.el7 2018/03/12\n");
	62	++ printk(KERN_INFO "Hook version: 3.10.0-862.el7 2018/04/30\n");
63	63	+ return 0;
64	64	+}
65	65	+module_init(ccs_show_version);
66		---- linux-3.10.0-693.21.1.el7.orig/include/linux/init_task.h
67		-+++ linux-3.10.0-693.21.1.el7/include/linux/init_task.h
	66	+--- linux-3.10.0-862.el7.orig/include/linux/init_task.h
	67	++++ linux-3.10.0-862.el7/include/linux/init_task.h
68	68	@@ -173,6 +173,14 @@ extern struct task_group root_task_group
69	69	# define INIT_RT_MUTEXES(tsk)
70	70	#endif

		@@ -88,8 +88,8 @@
88	88	}
89	89
90	90
91		---- linux-3.10.0-693.21.1.el7.orig/include/linux/sched.h
92		-+++ linux-3.10.0-693.21.1.el7/include/linux/sched.h
	91	+--- linux-3.10.0-862.el7.orig/include/linux/sched.h
	92	++++ linux-3.10.0-862.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		-@@ -1806,6 +1808,10 @@ struct task_struct {
	102	+@@ -1818,6 +1820,10 @@ struct task_struct {
103	103	struct wake_q_node wake_q;
104	104	struct prev_cputime prev_cputime;
105	105	#endif /* __GENKSYMS__ */

		@@ -110,9 +110,9 @@
110	110	};
111	111
112	112	/* Future-safe accessor for struct task_struct's cpus_allowed. */
113		---- linux-3.10.0-693.21.1.el7.orig/include/linux/security.h
114		-+++ linux-3.10.0-693.21.1.el7/include/linux/security.h
115		-@@ -54,6 +54,7 @@ struct msg_queue;
	113	+--- linux-3.10.0-862.el7.orig/include/linux/security.h
	114	++++ linux-3.10.0-862.el7/include/linux/security.h
	115	+@@ -55,6 +55,7 @@ struct msg_queue;
116	116	struct xattr;
117	117	struct xfrm_sec_ctx;
118	118	struct mm_struct;

		@@ -120,7 +120,7 @@
120	120
121	121	/* Maximum number of letters for an LSM name string */
122	122	#define SECURITY_NAME_MAX 10
123		-@@ -2012,7 +2013,10 @@ static inline int security_syslog(int ty
	123	+@@ -2060,7 +2061,10 @@ static inline int security_syslog(int ty
124	124	static inline int security_settime(const struct timespec *ts,
125	125	const struct timezone *tz)
126	126	{

		@@ -132,7 +132,7 @@
132	132	}
133	133
134	134	static inline int security_vm_enough_memory_mm(struct mm_struct *mm, long pages)
135		-@@ -2081,18 +2085,18 @@ static inline int security_sb_mount(cons
	135	+@@ -2129,18 +2133,18 @@ static inline int security_sb_mount(cons
136	136	const char *type, unsigned long flags,
137	137	void *data)
138	138	{

		@@ -154,7 +154,7 @@
154	154	}
155	155
156	156	static inline int security_sb_set_mnt_opts(struct super_block *sb,
157		-@@ -2241,7 +2245,7 @@ static inline int security_inode_setattr
	157	+@@ -2289,7 +2293,7 @@ static inline int security_inode_setattr
158	158	static inline int security_inode_getattr(struct vfsmount *mnt,
159	159	struct dentry *dentry)
160	160	{

		@@ -163,7 +163,7 @@
163	163	}
164	164
165	165	static inline int security_inode_setxattr(struct dentry *dentry,
166		-@@ -2327,7 +2331,7 @@ static inline void security_file_free(st
	166	+@@ -2375,7 +2379,7 @@ static inline void security_file_free(st
167	167	static inline int security_file_ioctl(struct file *file, unsigned int cmd,
168	168	unsigned long arg)
169	169	{

		@@ -172,7 +172,7 @@
172	172	}
173	173
174	174	static inline int security_mmap_file(struct file *file, unsigned long prot,
175		-@@ -2356,7 +2360,7 @@ static inline int security_file_lock(str
	175	+@@ -2404,7 +2408,7 @@ static inline int security_file_lock(str
176	176	static inline int security_file_fcntl(struct file *file, unsigned int cmd,
177	177	unsigned long arg)
178	178	{

		@@ -181,7 +181,7 @@
181	181	}
182	182
183	183	static inline int security_file_set_fowner(struct file *file)
184		-@@ -2379,7 +2383,7 @@ static inline int security_file_receive(
	184	+@@ -2427,7 +2431,7 @@ static inline int security_file_receive(
185	185	static inline int security_file_open(struct file *file,
186	186	const struct cred *cred)
187	187	{

		@@ -190,7 +190,7 @@
190	190	}
191	191
192	192	static inline int security_task_create(unsigned long clone_flags)
193		-@@ -2741,7 +2745,7 @@ static inline int security_unix_may_send
	193	+@@ -2789,7 +2793,7 @@ static inline int security_unix_may_send
194	194	static inline int security_socket_create(int family, int type,
195	195	int protocol, int kern)
196	196	{

		@@ -199,7 +199,7 @@
199	199	}
200	200
201	201	static inline int security_socket_post_create(struct socket *sock,
202		-@@ -2756,19 +2760,19 @@ static inline int security_socket_bind(s
	202	+@@ -2804,19 +2808,19 @@ static inline int security_socket_bind(s
203	203	struct sockaddr *address,
204	204	int addrlen)
205	205	{

		@@ -222,7 +222,7 @@
222	222	}
223	223
224	224	static inline int security_socket_accept(struct socket *sock,
225		-@@ -2780,7 +2784,7 @@ static inline int security_socket_accept
	225	+@@ -2828,7 +2832,7 @@ static inline int security_socket_accept
226	226	static inline int security_socket_sendmsg(struct socket *sock,
227	227	struct msghdr *msg, int size)
228	228	{

		@@ -231,7 +231,7 @@
231	231	}
232	232
233	233	static inline int security_socket_recvmsg(struct socket *sock,
234		-@@ -3022,44 +3026,47 @@ int security_path_chmod(struct path *pat
	234	+@@ -3096,44 +3100,47 @@ int security_path_chmod(struct path *pat
235	235	int security_path_chown(struct path *path, kuid_t uid, kgid_t gid);
236	236	int security_path_chroot(struct path *path);
237	237	#else /* CONFIG_SECURITY_PATH */

		@@ -286,7 +286,7 @@
286	286	}
287	287
288	288	static inline int security_path_rename(struct path *old_dir,
289		-@@ -3068,22 +3075,32 @@ static inline int security_path_rename(s
	289	+@@ -3142,22 +3149,32 @@ static inline int security_path_rename(s
290	290	struct dentry *new_dentry,
291	291	unsigned int flags)
292	292	{

		@@ -323,8 +323,8 @@
323	323	}
324	324	#endif /* CONFIG_SECURITY_PATH */
325	325
326		---- linux-3.10.0-693.21.1.el7.orig/include/net/ip.h
327		-+++ linux-3.10.0-693.21.1.el7/include/net/ip.h
	326	+--- linux-3.10.0-862.el7.orig/include/net/ip.h
	327	++++ linux-3.10.0-862.el7/include/net/ip.h
328	328	@@ -230,6 +230,8 @@ void inet_get_local_port_range(struct ne
329	329	extern unsigned long *sysctl_local_reserved_ports;
330	330	static inline int inet_is_reserved_local_port(int port)

		@@ -334,9 +334,9 @@
334	334	return test_bit(port, sysctl_local_reserved_ports);
335	335	}
336	336
337		---- linux-3.10.0-693.21.1.el7.orig/kernel/fork.c
338		-+++ linux-3.10.0-693.21.1.el7/kernel/fork.c
339		-@@ -277,6 +277,7 @@ void __put_task_struct(struct task_struc
	337	+--- linux-3.10.0-862.el7.orig/kernel/fork.c
	338	++++ linux-3.10.0-862.el7/kernel/fork.c
	339	+@@ -278,6 +278,7 @@ void __put_task_struct(struct task_struc
340	340	delayacct_tsk_free(tsk);
341	341	put_signal_struct(tsk->signal);
342	342

		@@ -344,7 +344,7 @@
344	344	if (!profile_handoff_task(tsk))
345	345	free_task(tsk);
346	346	}
347		-@@ -1441,6 +1442,9 @@ static struct task_struct *copy_process(
	347	+@@ -1483,6 +1484,9 @@ static struct task_struct *copy_process(
348	348	retval = audit_alloc(p);
349	349	if (retval)
350	350	goto bad_fork_cleanup_perf;

		@@ -354,7 +354,7 @@
354	354	/* copy all the process information */
355	355	retval = copy_semundo(clone_flags, p);
356	356	if (retval)
357		-@@ -1651,6 +1655,7 @@ bad_fork_cleanup_semundo:
	357	+@@ -1701,6 +1705,7 @@ bad_fork_cleanup_semundo:
358	358	exit_sem(p);
359	359	bad_fork_cleanup_audit:
360	360	audit_free(p);

		@@ -362,9 +362,9 @@
362	362	bad_fork_cleanup_perf:
363	363	perf_event_free_task(p);
364	364	bad_fork_cleanup_policy:
365		---- linux-3.10.0-693.21.1.el7.orig/kernel/kexec.c
366		-+++ linux-3.10.0-693.21.1.el7/kernel/kexec.c
367		-@@ -132,6 +132,8 @@ SYSCALL_DEFINE4(kexec_load, unsigned lon
	365	+--- linux-3.10.0-862.el7.orig/kernel/kexec.c
	366	++++ linux-3.10.0-862.el7/kernel/kexec.c
	367	+@@ -190,6 +190,8 @@ SYSCALL_DEFINE4(kexec_load, unsigned lon
368	368	/* We only trust the superuser with rebooting the system. */
369	369	if (!capable(CAP_SYS_BOOT) \|\| kexec_load_disabled)
370	370	return -EPERM;

		@@ -373,9 +373,9 @@
373	373
374	374	if (get_securelevel() > 0)
375	375	return -EPERM;
376		---- linux-3.10.0-693.21.1.el7.orig/kernel/module.c
377		-+++ linux-3.10.0-693.21.1.el7/kernel/module.c
378		-@@ -65,6 +65,7 @@
	376	+--- linux-3.10.0-862.el7.orig/kernel/module.c
	377	++++ linux-3.10.0-862.el7/kernel/module.c
	378	+@@ -66,6 +66,7 @@
379	379	#endif /* __GENKSYMS__ */
380	380	#include <uapi/linux/module.h>
381	381	#include "module-internal.h"

		@@ -383,7 +383,7 @@
383	383
384	384	#define CREATE_TRACE_POINTS
385	385	#include <trace/events/module.h>
386		-@@ -908,6 +909,8 @@ SYSCALL_DEFINE2(delete_module, const cha
	386	+@@ -914,6 +915,8 @@ SYSCALL_DEFINE2(delete_module, const cha
387	387
388	388	if (!capable(CAP_SYS_MODULE) \|\| modules_disabled)
389	389	return -EPERM;

		@@ -392,7 +392,7 @@
392	392
393	393	if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0)
394	394	return -EFAULT;
395		-@@ -3280,6 +3283,8 @@ static int may_init_module(void)
	395	+@@ -3439,6 +3442,8 @@ static int may_init_module(void)
396	396	{
397	397	if (!capable(CAP_SYS_MODULE) \|\| modules_disabled)
398	398	return -EPERM;

		@@ -401,9 +401,9 @@
401	401
402	402	return 0;
403	403	}
404		---- linux-3.10.0-693.21.1.el7.orig/kernel/ptrace.c
405		-+++ linux-3.10.0-693.21.1.el7/kernel/ptrace.c
406		-@@ -1049,6 +1049,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
	404	+--- linux-3.10.0-862.el7.orig/kernel/ptrace.c
	405	++++ linux-3.10.0-862.el7/kernel/ptrace.c
	406	+@@ -1082,6 +1082,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
407	407	{
408	408	struct task_struct *child;
409	409	long ret;

		@@ -415,7 +415,7 @@
415	415
416	416	if (request == PTRACE_TRACEME) {
417	417	ret = ptrace_traceme();
418		-@@ -1196,6 +1201,11 @@ asmlinkage long compat_sys_ptrace(compat
	418	+@@ -1229,6 +1234,11 @@ asmlinkage long compat_sys_ptrace(compat
419	419	{
420	420	struct task_struct *child;
421	421	long ret;

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

		@@ -438,9 +438,9 @@
438	438
439	439	/*
440	440	* Setpriority might change our priority at the same moment.
441		---- linux-3.10.0-693.21.1.el7.orig/kernel/signal.c
442		-+++ linux-3.10.0-693.21.1.el7/kernel/signal.c
443		-@@ -2923,6 +2923,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
	441	+--- linux-3.10.0-862.el7.orig/kernel/signal.c
	442	++++ linux-3.10.0-862.el7/kernel/signal.c
	443	+@@ -2946,6 +2946,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
444	444	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
445	445	{
446	446	struct siginfo info;

		@@ -449,7 +449,7 @@
449	449
450	450	info.si_signo = sig;
451	451	info.si_errno = 0;
452		-@@ -2991,6 +2993,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
	452	+@@ -3014,6 +3016,8 @@ SYSCALL_DEFINE3(tgkill, pid_t, tgid, pid
453	453	/* This is only valid for single tasks */
454	454	if (pid <= 0 \|\| tgid <= 0)
455	455	return -EINVAL;

		@@ -458,7 +458,7 @@
458	458
459	459	return do_tkill(tgid, pid, sig);
460	460	}
461		-@@ -3007,6 +3011,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
	461	+@@ -3030,6 +3034,8 @@ SYSCALL_DEFINE2(tkill, pid_t, pid, int,
462	462	/* This is only valid for single tasks */
463	463	if (pid <= 0)
464	464	return -EINVAL;

		@@ -467,7 +467,7 @@
467	467
468	468	return do_tkill(0, pid, sig);
469	469	}
470		-@@ -3021,6 +3027,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
	470	+@@ -3044,6 +3050,8 @@ static int do_rt_sigqueueinfo(pid_t pid,
471	471	return -EPERM;
472	472
473	473	info->si_signo = sig;

		@@ -476,7 +476,7 @@
476	476
477	477	/* POSIX.1b doesn't mention process groups. */
478	478	return kill_proc_info(sig, info, pid);
479		-@@ -3069,6 +3077,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
	479	+@@ -3092,6 +3100,8 @@ static int do_rt_tgsigqueueinfo(pid_t tg
480	480	return -EPERM;
481	481
482	482	info->si_signo = sig;

		@@ -485,8 +485,8 @@
485	485
486	486	return do_send_specific(tgid, pid, sig, info);
487	487	}
488		---- linux-3.10.0-693.21.1.el7.orig/kernel/sys.c
489		-+++ linux-3.10.0-693.21.1.el7/kernel/sys.c
	488	+--- linux-3.10.0-862.el7.orig/kernel/sys.c
	489	++++ linux-3.10.0-862.el7/kernel/sys.c
490	490	@@ -192,6 +192,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-693.21.1.el7.orig/kernel/time/ntp.c
529		-+++ linux-3.10.0-693.21.1.el7/kernel/time/ntp.c
	528	+--- linux-3.10.0-862.el7.orig/kernel/time/ntp.c
	529	++++ linux-3.10.0-862.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-693.21.1.el7.orig/net/ipv4/raw.c
564		-+++ linux-3.10.0-693.21.1.el7/net/ipv4/raw.c
	563	+--- linux-3.10.0-862.el7.orig/net/ipv4/raw.c
	564	++++ linux-3.10.0-862.el7/net/ipv4/raw.c
565	565	@@ -706,6 +706,10 @@ static int raw_recvmsg(struct kiocb *ioc
566	566	skb = skb_recv_datagram(sk, flags, noblock, &err);
567	567	if (!skb)

		@@ -573,9 +573,9 @@
573	573
574	574	copied = skb->len;
575	575	if (len < copied) {
576		---- linux-3.10.0-693.21.1.el7.orig/net/ipv4/udp.c
577		-+++ linux-3.10.0-693.21.1.el7/net/ipv4/udp.c
578		-@@ -1364,6 +1364,10 @@ try_again:
	576	+--- linux-3.10.0-862.el7.orig/net/ipv4/udp.c
	577	++++ linux-3.10.0-862.el7/net/ipv4/udp.c
	578	+@@ -1392,6 +1392,10 @@ try_again:
579	579	skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
580	580	if (!skb)
581	581	goto out;

		@@ -586,8 +586,8 @@
586	586
587	587	ulen = skb->len - sizeof(struct udphdr);
588	588	copied = len;
589		---- linux-3.10.0-693.21.1.el7.orig/net/ipv6/raw.c
590		-+++ linux-3.10.0-693.21.1.el7/net/ipv6/raw.c
	589	+--- linux-3.10.0-862.el7.orig/net/ipv6/raw.c
	590	++++ linux-3.10.0-862.el7/net/ipv6/raw.c
591	591	@@ -468,6 +468,10 @@ static int rawv6_recvmsg(struct kiocb *i
592	592	skb = skb_recv_datagram(sk, flags, noblock, &err);
593	593	if (!skb)

		@@ -599,9 +599,9 @@
599	599
600	600	copied = skb->len;
601	601	if (copied > len) {
602		---- linux-3.10.0-693.21.1.el7.orig/net/ipv6/udp.c
603		-+++ linux-3.10.0-693.21.1.el7/net/ipv6/udp.c
604		-@@ -414,6 +414,10 @@ try_again:
	602	+--- linux-3.10.0-862.el7.orig/net/ipv6/udp.c
	603	++++ linux-3.10.0-862.el7/net/ipv6/udp.c
	604	+@@ -384,6 +384,10 @@ try_again:
605	605	skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
606	606	if (!skb)
607	607	goto out;

		@@ -612,9 +612,9 @@
612	612
613	613	ulen = skb->len - sizeof(struct udphdr);
614	614	copied = len;
615		---- linux-3.10.0-693.21.1.el7.orig/net/socket.c
616		-+++ linux-3.10.0-693.21.1.el7/net/socket.c
617		-@@ -1609,6 +1609,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
	615	+--- linux-3.10.0-862.el7.orig/net/socket.c
	616	++++ linux-3.10.0-862.el7/net/socket.c
	617	+@@ -1660,6 +1660,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
618	618	if (err < 0)
619	619	goto out_fd;
620	620

		@@ -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-693.21.1.el7.orig/net/unix/af_unix.c
629		-+++ linux-3.10.0-693.21.1.el7/net/unix/af_unix.c
	628	+--- linux-3.10.0-862.el7.orig/net/unix/af_unix.c
	629	++++ linux-3.10.0-862.el7/net/unix/af_unix.c
630	630	@@ -2137,6 +2137,10 @@ static int unix_dgram_recvmsg(struct kio
631	631	wake_up_interruptible_sync_poll(&u->peer_wait,
632	632	POLLOUT \| POLLWRNORM \| POLLWRBAND);

		@@ -638,9 +638,9 @@
638	638	if (msg->msg_name)
639	639	unix_copy_addr(msg, skb->sk);
640	640
641		---- linux-3.10.0-693.21.1.el7.orig/security/Kconfig
642		-+++ linux-3.10.0-693.21.1.el7/security/Kconfig
643		-@@ -185,5 +185,7 @@ config DEFAULT_SECURITY
	641	+--- linux-3.10.0-862.el7.orig/security/Kconfig
	642	++++ linux-3.10.0-862.el7/security/Kconfig
	643	+@@ -194,5 +194,7 @@ config DEFAULT_SECURITY
644	644	default "yama" if DEFAULT_SECURITY_YAMA
645	645	default "" if DEFAULT_SECURITY_DAC
646	646

		@@ -648,8 +648,8 @@
648	648	+
649	649	endmenu
650	650
651		---- linux-3.10.0-693.21.1.el7.orig/security/Makefile
652		-+++ linux-3.10.0-693.21.1.el7/security/Makefile
	651	+--- linux-3.10.0-862.el7.orig/security/Makefile
	652	++++ linux-3.10.0-862.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,9 +657,9 @@
657	657	+
658	658	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
659	659	+obj-$(CONFIG_CCSECURITY) += ccsecurity/built-in.o
660		---- linux-3.10.0-693.21.1.el7.orig/security/security.c
661		-+++ linux-3.10.0-693.21.1.el7/security/security.c
662		-@@ -203,7 +203,10 @@ int security_syslog(int type)
	660	+--- linux-3.10.0-862.el7.orig/security/security.c
	661	++++ linux-3.10.0-862.el7/security/security.c
	662	+@@ -224,7 +224,10 @@ int security_syslog(int type)
663	663
664	664	int security_settime(const struct timespec ts, const struct timezone tz)
665	665	{

		@@ -671,7 +671,7 @@
671	671	}
672	672
673	673	int security_vm_enough_memory_mm(struct mm_struct *mm, long pages)
674		-@@ -280,17 +283,27 @@ int security_sb_statfs(struct dentry *de
	674	+@@ -301,17 +304,27 @@ int security_sb_statfs(struct dentry *de
675	675	int security_sb_mount(const char dev_name, struct path path,
676	676	const char type, unsigned long flags, void data)
677	677	{

		@@ -702,7 +702,7 @@
702	702	}
703	703
704	704	int security_sb_set_mnt_opts(struct super_block *sb,
705		-@@ -401,31 +414,47 @@ EXPORT_SYMBOL(security_old_inode_init_se
	705	+@@ -422,31 +435,47 @@ EXPORT_SYMBOL(security_old_inode_init_se
706	706	int security_path_mknod(struct path dir, struct dentry dentry, umode_t mode,
707	707	unsigned int dev)
708	708	{

		@@ -750,7 +750,7 @@
750	750	return security_ops->path_unlink(dir, dentry);
751	751	}
752	752	EXPORT_SYMBOL(security_path_unlink);
753		-@@ -433,16 +462,24 @@ EXPORT_SYMBOL(security_path_unlink);
	753	+@@ -454,16 +483,24 @@ EXPORT_SYMBOL(security_path_unlink);
754	754	int security_path_symlink(struct path dir, struct dentry dentry,
755	755	const char *old_name)
756	756	{

		@@ -775,7 +775,7 @@
775	775	return security_ops->path_link(old_dentry, new_dir, new_dentry);
776	776	}
777	777
778		-@@ -450,6 +487,7 @@ int security_path_rename(struct path *ol
	778	+@@ -471,6 +508,7 @@ int security_path_rename(struct path *ol
779	779	struct path new_dir, struct dentry new_dentry,
780	780	unsigned int flags)
781	781	{

		@@ -783,7 +783,7 @@
783	783	if (unlikely(IS_PRIVATE(old_dentry->d_inode) \|\|
784	784	(new_dentry->d_inode && IS_PRIVATE(new_dentry->d_inode))))
785	785	return 0;
786		-@@ -459,8 +497,15 @@ int security_path_rename(struct path *ol
	786	+@@ -480,8 +518,15 @@ int security_path_rename(struct path *ol
787	787	old_dir, old_dentry);
788	788	if (err)
789	789	return err;

		@@ -799,7 +799,7 @@
799	799	return security_ops->path_rename(old_dir, old_dentry, new_dir,
800	800	new_dentry);
801	801	}
802		-@@ -468,27 +513,42 @@ EXPORT_SYMBOL(security_path_rename);
	802	+@@ -489,27 +534,42 @@ EXPORT_SYMBOL(security_path_rename);
803	803
804	804	int security_path_truncate(struct path *path)
805	805	{

		@@ -842,7 +842,7 @@
842	842	return security_ops->path_chroot(path);
843	843	}
844	844	#endif
845		-@@ -601,9 +661,13 @@ EXPORT_SYMBOL_GPL(security_inode_setattr
	845	+@@ -622,9 +682,13 @@ EXPORT_SYMBOL_GPL(security_inode_setattr
846	846
847	847	int security_inode_getattr(struct vfsmount mnt, struct dentry dentry)
848	848	{

		@@ -857,7 +857,7 @@
857	857	}
858	858
859	859	int security_inode_setxattr(struct dentry dentry, const char name,
860		-@@ -732,7 +796,10 @@ void security_file_free(struct file *fil
	860	+@@ -753,7 +817,10 @@ void security_file_free(struct file *fil
861	861
862	862	int security_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
863	863	{

		@@ -869,7 +869,7 @@
869	869	}
870	870
871	871	static inline unsigned long mmap_prot(struct file *file, unsigned long prot)
872		-@@ -798,7 +865,10 @@ int security_file_lock(struct file *file
	872	+@@ -819,7 +886,10 @@ int security_file_lock(struct file *file
873	873
874	874	int security_file_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
875	875	{

		@@ -881,7 +881,7 @@
881	881	}
882	882
883	883	int security_file_set_fowner(struct file *file)
884		-@@ -822,6 +892,8 @@ int security_file_open(struct file *file
	884	+@@ -843,6 +913,8 @@ int security_file_open(struct file *file
885	885	int ret;
886	886
887	887	ret = security_ops->file_open(file, cred);

		@@ -890,7 +890,7 @@
890	890	if (ret)
891	891	return ret;
892	892
893		-@@ -1167,7 +1239,10 @@ EXPORT_SYMBOL(security_unix_may_send);
	893	+@@ -1188,7 +1260,10 @@ EXPORT_SYMBOL(security_unix_may_send);
894	894
895	895	int security_socket_create(int family, int type, int protocol, int kern)
896	896	{

		@@ -902,7 +902,7 @@
902	902	}
903	903
904	904	int security_socket_post_create(struct socket *sock, int family,
905		-@@ -1179,17 +1254,26 @@ int security_socket_post_create(struct s
	905	+@@ -1200,17 +1275,26 @@ int security_socket_post_create(struct s
906	906
907	907	int security_socket_bind(struct socket sock, struct sockaddr address, int addrlen)
908	908	{

		@@ -932,7 +932,7 @@
932	932	}
933	933
934	934	int security_socket_accept(struct socket sock, struct socket newsock)
935		-@@ -1199,7 +1283,10 @@ int security_socket_accept(struct socket
	935	+@@ -1220,7 +1304,10 @@ int security_socket_accept(struct socket
936	936
937	937	int security_socket_sendmsg(struct socket sock, struct msghdr msg, int size)
938	938	{

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-3.18.diff (revision 6643)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-3.18.diff (revision 6644)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 3.18.106.
	1	+This is TOMOYO Linux patch for kernel 3.18.107.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.106.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.107.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.106.orig/fs/exec.c
33		-+++ linux-3.18.106/fs/exec.c
	32	+--- linux-3.18.107.orig/fs/exec.c
	33	++++ linux-3.18.107/fs/exec.c
34	34	@@ -1463,7 +1463,7 @@ static int exec_binprm(struct linux_binp
35	35	old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
36	36	rcu_read_unlock();

		@@ -40,8 +40,8 @@
40	40	if (ret >= 0) {
41	41	audit_bprm(bprm);
42	42	trace_sched_process_exec(current, old_pid, bprm);
43		---- linux-3.18.106.orig/fs/open.c
44		-+++ linux-3.18.106/fs/open.c
	43	+--- linux-3.18.107.orig/fs/open.c
	44	++++ linux-3.18.107/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.106.orig/fs/proc/version.c
55		-+++ linux-3.18.106/fs/proc/version.c
	54	+--- linux-3.18.107.orig/fs/proc/version.c
	55	++++ linux-3.18.107/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.106 2018/04/24\n");
	63	++ printk(KERN_INFO "Hook version: 3.18.107 2018/04/30\n");
64	64	+ return 0;
65	65	+}
66	66	+fs_initcall(ccs_show_version);
67		---- linux-3.18.106.orig/include/linux/init_task.h
68		-+++ linux-3.18.106/include/linux/init_task.h
	67	+--- linux-3.18.107.orig/include/linux/init_task.h
	68	++++ linux-3.18.107/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.106.orig/include/linux/sched.h
93		-+++ linux-3.18.106/include/linux/sched.h
	92	+--- linux-3.18.107.orig/include/linux/sched.h
	93	++++ linux-3.18.107/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.106.orig/include/linux/security.h
115		-+++ linux-3.18.106/include/linux/security.h
	114	+--- linux-3.18.107.orig/include/linux/security.h
	115	++++ linux-3.18.107/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.106.orig/include/net/ip.h
328		-+++ linux-3.18.106/include/net/ip.h
	327	+--- linux-3.18.107.orig/include/net/ip.h
	328	++++ linux-3.18.107/include/net/ip.h
329	329	@@ -218,6 +218,8 @@ void inet_get_local_port_range(struct ne
330	330	#ifdef CONFIG_SYSCTL
331	331	static inline int inet_is_local_reserved_port(struct net *net, int port)

		@@ -344,8 +344,8 @@
344	344	return 0;
345	345	}
346	346	#endif
347		---- linux-3.18.106.orig/kernel/fork.c
348		-+++ linux-3.18.106/kernel/fork.c
	347	+--- linux-3.18.107.orig/kernel/fork.c
	348	++++ linux-3.18.107/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.106.orig/kernel/kexec.c
376		-+++ linux-3.18.106/kernel/kexec.c
	375	+--- linux-3.18.107.orig/kernel/kexec.c
	376	++++ linux-3.18.107/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.106.orig/kernel/module.c
395		-+++ linux-3.18.106/kernel/module.c
	394	+--- linux-3.18.107.orig/kernel/module.c
	395	++++ linux-3.18.107/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.106.orig/kernel/ptrace.c
423		-+++ linux-3.18.106/kernel/ptrace.c
	422	+--- linux-3.18.107.orig/kernel/ptrace.c
	423	++++ linux-3.18.107/kernel/ptrace.c
424	424	@@ -1081,6 +1081,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
425	425	{
426	426	struct task_struct *child;

		@@ -445,8 +445,8 @@
445	445
446	446	if (request == PTRACE_TRACEME) {
447	447	ret = ptrace_traceme();
448		---- linux-3.18.106.orig/kernel/reboot.c
449		-+++ linux-3.18.106/kernel/reboot.c
	448	+--- linux-3.18.107.orig/kernel/reboot.c
	449	++++ linux-3.18.107/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.106.orig/kernel/sched/core.c
468		-+++ linux-3.18.106/kernel/sched/core.c
	467	+--- linux-3.18.107.orig/kernel/sched/core.c
	468	++++ linux-3.18.107/kernel/sched/core.c
469	469	@@ -3218,6 +3218,8 @@ int can_nice(const struct task_struct *p
470	470	SYSCALL_DEFINE1(nice, int, increment)
471	471	{

		@@ -475,8 +475,8 @@
475	475
476	476	/*
477	477	* Setpriority might change our priority at the same moment.
478		---- linux-3.18.106.orig/kernel/signal.c
479		-+++ linux-3.18.106/kernel/signal.c
	478	+--- linux-3.18.107.orig/kernel/signal.c
	479	++++ linux-3.18.107/kernel/signal.c
480	480	@@ -2897,6 +2897,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.106.orig/kernel/sys.c
526		-+++ linux-3.18.106/kernel/sys.c
	525	+--- linux-3.18.107.orig/kernel/sys.c
	526	++++ linux-3.18.107/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.106.orig/kernel/time/ntp.c
557		-+++ linux-3.18.106/kernel/time/ntp.c
	556	+--- linux-3.18.107.orig/kernel/time/ntp.c
	557	++++ linux-3.18.107/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.106.orig/net/ipv4/raw.c
592		-+++ linux-3.18.106/net/ipv4/raw.c
	591	+--- linux-3.18.107.orig/net/ipv4/raw.c
	592	++++ linux-3.18.107/net/ipv4/raw.c
593	593	@@ -719,6 +719,10 @@ static int raw_recvmsg(struct kiocb *ioc
594	594	skb = skb_recv_datagram(sk, flags, noblock, &err);
595	595	if (!skb)

		@@ -601,8 +601,8 @@
601	601
602	602	copied = skb->len;
603	603	if (len < copied) {
604		---- linux-3.18.106.orig/net/ipv4/udp.c
605		-+++ linux-3.18.106/net/ipv4/udp.c
	604	+--- linux-3.18.107.orig/net/ipv4/udp.c
	605	++++ linux-3.18.107/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.106.orig/net/ipv6/raw.c
618		-+++ linux-3.18.106/net/ipv6/raw.c
	617	+--- linux-3.18.107.orig/net/ipv6/raw.c
	618	++++ linux-3.18.107/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.106.orig/net/ipv6/udp.c
631		-+++ linux-3.18.106/net/ipv6/udp.c
	630	+--- linux-3.18.107.orig/net/ipv6/udp.c
	631	++++ linux-3.18.107/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.106.orig/net/socket.c
644		-+++ linux-3.18.106/net/socket.c
	643	+--- linux-3.18.107.orig/net/socket.c
	644	++++ linux-3.18.107/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.106.orig/net/unix/af_unix.c
657		-+++ linux-3.18.106/net/unix/af_unix.c
	656	+--- linux-3.18.107.orig/net/unix/af_unix.c
	657	++++ linux-3.18.107/net/unix/af_unix.c
658	658	@@ -1981,6 +1981,10 @@ static int unix_dgram_recvmsg(struct kio
659	659	wake_up_interruptible_sync_poll(&u->peer_wait,
660	660	POLLOUT \| POLLWRNORM \| POLLWRBAND);

		@@ -666,8 +666,8 @@
666	666	if (msg->msg_name)
667	667	unix_copy_addr(msg, skb->sk);
668	668
669		---- linux-3.18.106.orig/security/Kconfig
670		-+++ linux-3.18.106/security/Kconfig
	669	+--- linux-3.18.107.orig/security/Kconfig
	670	++++ linux-3.18.107/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.106.orig/security/Makefile
680		-+++ linux-3.18.106/security/Makefile
	679	+--- linux-3.18.107.orig/security/Makefile
	680	++++ linux-3.18.107/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.106.orig/security/security.c
689		-+++ linux-3.18.106/security/security.c
	688	+--- linux-3.18.107.orig/security/security.c
	689	++++ linux-3.18.107/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/1.8.x/ccs-patch/patches/ccs-patch-4.14.diff (revision 6643)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.14.diff (revision 6644)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 4.14.36.
	1	+This is TOMOYO Linux patch for kernel 4.14.38.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.36.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.38.tar.xz
4	4	---
5	5	fs/exec.c \| 2 -
6	6	fs/open.c \| 2 +

		@@ -28,8 +28,8 @@
28	28	security/security.c \| 9 +++++-
29	29	24 files changed, 153 insertions(+), 29 deletions(-)
30	30
31		---- linux-4.14.36.orig/fs/exec.c
32		-+++ linux-4.14.36/fs/exec.c
	31	+--- linux-4.14.38.orig/fs/exec.c
	32	++++ linux-4.14.38/fs/exec.c
33	33	@@ -1677,7 +1677,7 @@ static int exec_binprm(struct linux_binp
34	34	old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
35	35	rcu_read_unlock();

		@@ -39,8 +39,8 @@
39	39	if (ret >= 0) {
40	40	audit_bprm(bprm);
41	41	trace_sched_process_exec(current, old_pid, bprm);
42		---- linux-4.14.36.orig/fs/open.c
43		-+++ linux-4.14.36/fs/open.c
	42	+--- linux-4.14.38.orig/fs/open.c
	43	++++ linux-4.14.38/fs/open.c
44	44	@@ -1171,6 +1171,8 @@ EXPORT_SYMBOL(sys_close);
45	45	*/
46	46	SYSCALL_DEFINE0(vhangup)

		@@ -50,8 +50,8 @@
50	50	if (capable(CAP_SYS_TTY_CONFIG)) {
51	51	tty_vhangup_self();
52	52	return 0;
53		---- linux-4.14.36.orig/fs/proc/version.c
54		-+++ linux-4.14.36/fs/proc/version.c
	53	+--- linux-4.14.38.orig/fs/proc/version.c
	54	++++ linux-4.14.38/fs/proc/version.c
55	55	@@ -33,3 +33,10 @@ static int __init proc_version_init(void
56	56	return 0;
57	57	}

		@@ -59,12 +59,12 @@
59	59	+
60	60	+static int __init ccs_show_version(void)
61	61	+{
62		-+ printk(KERN_INFO "Hook version: 4.14.36 2018/04/24\n");
	62	++ printk(KERN_INFO "Hook version: 4.14.38 2018/04/30\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-4.14.36.orig/include/linux/init_task.h
67		-+++ linux-4.14.36/include/linux/init_task.h
	66	+--- linux-4.14.38.orig/include/linux/init_task.h
	67	++++ linux-4.14.38/include/linux/init_task.h
68	68	@@ -219,6 +219,14 @@ extern struct cred init_cred;
69	69	#define INIT_TASK_SECURITY
70	70	#endif

		@@ -88,8 +88,8 @@
88	88	}
89	89
90	90
91		---- linux-4.14.36.orig/include/linux/sched.h
92		-+++ linux-4.14.36/include/linux/sched.h
	91	+--- linux-4.14.38.orig/include/linux/sched.h
	92	++++ linux-4.14.38/include/linux/sched.h
93	93	@@ -33,6 +33,7 @@ struct audit_context;
94	94	struct backing_dev_info;
95	95	struct bio_list;

		@@ -109,8 +109,8 @@
109	109
110	110	/*
111	111	* New fields for task_struct should be added above here, so that
112		---- linux-4.14.36.orig/include/linux/security.h
113		-+++ linux-4.14.36/include/linux/security.h
	112	+--- linux-4.14.38.orig/include/linux/security.h
	113	++++ linux-4.14.38/include/linux/security.h
114	114	@@ -56,6 +56,7 @@ struct msg_queue;
115	115	struct xattr;
116	116	struct xfrm_sec_ctx;

		@@ -331,8 +331,8 @@
331	331	}
332	332	#endif /* CONFIG_SECURITY_PATH */
333	333
334		---- linux-4.14.36.orig/include/net/ip.h
335		-+++ linux-4.14.36/include/net/ip.h
	334	+--- linux-4.14.38.orig/include/net/ip.h
	335	++++ linux-4.14.38/include/net/ip.h
336	336	@@ -266,6 +266,8 @@ void inet_get_local_port_range(struct ne
337	337	#ifdef CONFIG_SYSCTL
338	338	static inline int inet_is_local_reserved_port(struct net *net, int port)

		@@ -351,8 +351,8 @@
351	351	return 0;
352	352	}
353	353
354		---- linux-4.14.36.orig/kernel/kexec.c
355		-+++ linux-4.14.36/kernel/kexec.c
	354	+--- linux-4.14.38.orig/kernel/kexec.c
	355	++++ linux-4.14.38/kernel/kexec.c
356	356	@@ -17,7 +17,7 @@
357	357	#include <linux/syscalls.h>
358	358	#include <linux/vmalloc.h>

		@@ -371,8 +371,8 @@
371	371
372	372	/*
373	373	* Verify we have a legal set of flags
374		---- linux-4.14.36.orig/kernel/module.c
375		-+++ linux-4.14.36/kernel/module.c
	374	+--- linux-4.14.38.orig/kernel/module.c
	375	++++ linux-4.14.38/kernel/module.c
376	376	@@ -66,6 +66,7 @@
377	377	#include <linux/audit.h>
378	378	#include <uapi/linux/module.h>

		@@ -399,8 +399,8 @@
399	399
400	400	return 0;
401	401	}
402		---- linux-4.14.36.orig/kernel/ptrace.c
403		-+++ linux-4.14.36/kernel/ptrace.c
	402	+--- linux-4.14.38.orig/kernel/ptrace.c
	403	++++ linux-4.14.38/kernel/ptrace.c
404	404	@@ -1123,6 +1123,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
405	405	{
406	406	struct task_struct *child;

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

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

		@@ -455,8 +455,8 @@
455	455
456	456	/*
457	457	* Setpriority might change our priority at the same moment.
458		---- linux-4.14.36.orig/kernel/signal.c
459		-+++ linux-4.14.36/kernel/signal.c
	458	+--- linux-4.14.38.orig/kernel/signal.c
	459	++++ linux-4.14.38/kernel/signal.c
460	460	@@ -2954,6 +2954,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait,
461	461	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
462	462	{

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

		@@ -533,8 +533,8 @@
533	533
534	534	down_write(&uts_sem);
535	535	errno = -EFAULT;
536		---- linux-4.14.36.orig/kernel/time/ntp.c
537		-+++ linux-4.14.36/kernel/time/ntp.c
	536	+--- linux-4.14.38.orig/kernel/time/ntp.c
	537	++++ linux-4.14.38/kernel/time/ntp.c
538	538	@@ -18,6 +18,7 @@
539	539	#include <linux/module.h>
540	540	#include <linux/rtc.h>

		@@ -568,8 +568,8 @@
568	568
569	569	if (txc->modes & ADJ_NANO) {
570	570	struct timespec ts;
571		---- linux-4.14.36.orig/net/ipv4/raw.c
572		-+++ linux-4.14.36/net/ipv4/raw.c
	571	+--- linux-4.14.38.orig/net/ipv4/raw.c
	572	++++ linux-4.14.38/net/ipv4/raw.c
573	573	@@ -766,6 +766,10 @@ static int raw_recvmsg(struct sock *sk,
574	574	skb = skb_recv_datagram(sk, flags, noblock, &err);
575	575	if (!skb)

		@@ -581,8 +581,8 @@
581	581
582	582	copied = skb->len;
583	583	if (len < copied) {
584		---- linux-4.14.36.orig/net/ipv4/udp.c
585		-+++ linux-4.14.36/net/ipv4/udp.c
	584	+--- linux-4.14.38.orig/net/ipv4/udp.c
	585	++++ linux-4.14.38/net/ipv4/udp.c
586	586	@@ -1590,6 +1590,8 @@ try_again:
587	587	skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
588	588	if (!skb)

		@@ -592,8 +592,8 @@
592	592
593	593	ulen = udp_skb_len(skb);
594	594	copied = len;
595		---- linux-4.14.36.orig/net/ipv6/raw.c
596		-+++ linux-4.14.36/net/ipv6/raw.c
	595	+--- linux-4.14.38.orig/net/ipv6/raw.c
	596	++++ linux-4.14.38/net/ipv6/raw.c
597	597	@@ -483,6 +483,10 @@ static int rawv6_recvmsg(struct sock *sk
598	598	skb = skb_recv_datagram(sk, flags, noblock, &err);
599	599	if (!skb)

		@@ -605,8 +605,8 @@
605	605
606	606	copied = skb->len;
607	607	if (copied > len) {
608		---- linux-4.14.36.orig/net/ipv6/udp.c
609		-+++ linux-4.14.36/net/ipv6/udp.c
	608	+--- linux-4.14.38.orig/net/ipv6/udp.c
	609	++++ linux-4.14.38/net/ipv6/udp.c
610	610	@@ -371,6 +371,8 @@ try_again:
611	611	skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
612	612	if (!skb)

		@@ -616,8 +616,8 @@
616	616
617	617	ulen = udp6_skb_len(skb);
618	618	copied = len;
619		---- linux-4.14.36.orig/net/socket.c
620		-+++ linux-4.14.36/net/socket.c
	619	+--- linux-4.14.38.orig/net/socket.c
	620	++++ linux-4.14.38/net/socket.c
621	621	@@ -1574,6 +1574,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
622	622	if (err < 0)
623	623	goto out_fd;

		@@ -629,8 +629,8 @@
629	629	if (upeer_sockaddr) {
630	630	if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
631	631	&len, 2) < 0) {
632		---- linux-4.14.36.orig/net/unix/af_unix.c
633		-+++ linux-4.14.36/net/unix/af_unix.c
	632	+--- linux-4.14.38.orig/net/unix/af_unix.c
	633	++++ linux-4.14.38/net/unix/af_unix.c
634	634	@@ -2131,6 +2131,10 @@ static int unix_dgram_recvmsg(struct soc
635	635	POLLOUT \| POLLWRNORM \|
636	636	POLLWRBAND);

		@@ -650,8 +650,8 @@
650	650	mutex_unlock(&u->iolock);
651	651	out:
652	652	return err;
653		---- linux-4.14.36.orig/security/Kconfig
654		-+++ linux-4.14.36/security/Kconfig
	653	+--- linux-4.14.38.orig/security/Kconfig
	654	++++ linux-4.14.38/security/Kconfig
655	655	@@ -263,5 +263,7 @@ config DEFAULT_SECURITY
656	656	default "apparmor" if DEFAULT_SECURITY_APPARMOR
657	657	default "" if DEFAULT_SECURITY_DAC

		@@ -660,8 +660,8 @@
660	660	+
661	661	endmenu
662	662
663		---- linux-4.14.36.orig/security/Makefile
664		-+++ linux-4.14.36/security/Makefile
	663	+--- linux-4.14.38.orig/security/Makefile
	664	++++ linux-4.14.38/security/Makefile
665	665	@@ -30,3 +30,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
666	666	# Object integrity file lists
667	667	subdir-$(CONFIG_INTEGRITY) += integrity

		@@ -669,8 +669,8 @@
669	669	+
670	670	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
671	671	+obj-$(CONFIG_CCSECURITY) += ccsecurity/
672		---- linux-4.14.36.orig/security/security.c
673		-+++ linux-4.14.36/security/security.c
	672	+--- linux-4.14.38.orig/security/security.c
	673	++++ linux-4.14.38/security/security.c
674	674	@@ -976,12 +976,19 @@ int security_file_open(struct file *file
675	675
676	676	int security_task_alloc(struct task_struct *task, unsigned long clone_flags)

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.16.diff (revision 6643)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.16.diff (revision 6644)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 4.16.4.
	1	+This is TOMOYO Linux patch for kernel 4.16.6.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.4.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.6.tar.xz
4	4	---
5	5	fs/exec.c \| 2 -
6	6	fs/open.c \| 2 +

		@@ -28,8 +28,8 @@
28	28	security/security.c \| 9 +++++-
29	29	24 files changed, 148 insertions(+), 29 deletions(-)
30	30
31		---- linux-4.16.4.orig/fs/exec.c
32		-+++ linux-4.16.4/fs/exec.c
	31	+--- linux-4.16.6.orig/fs/exec.c
	32	++++ linux-4.16.6/fs/exec.c
33	33	@@ -1677,7 +1677,7 @@ static int exec_binprm(struct linux_binp
34	34	old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
35	35	rcu_read_unlock();

		@@ -39,8 +39,8 @@
39	39	if (ret >= 0) {
40	40	audit_bprm(bprm);
41	41	trace_sched_process_exec(current, old_pid, bprm);
42		---- linux-4.16.4.orig/fs/open.c
43		-+++ linux-4.16.4/fs/open.c
	42	+--- linux-4.16.6.orig/fs/open.c
	43	++++ linux-4.16.6/fs/open.c
44	44	@@ -1171,6 +1171,8 @@ EXPORT_SYMBOL(sys_close);
45	45	*/
46	46	SYSCALL_DEFINE0(vhangup)

		@@ -50,8 +50,8 @@
50	50	if (capable(CAP_SYS_TTY_CONFIG)) {
51	51	tty_vhangup_self();
52	52	return 0;
53		---- linux-4.16.4.orig/fs/proc/version.c
54		-+++ linux-4.16.4/fs/proc/version.c
	53	+--- linux-4.16.6.orig/fs/proc/version.c
	54	++++ linux-4.16.6/fs/proc/version.c
55	55	@@ -33,3 +33,10 @@ static int __init proc_version_init(void
56	56	return 0;
57	57	}

		@@ -59,12 +59,12 @@
59	59	+
60	60	+static int __init ccs_show_version(void)
61	61	+{
62		-+ printk(KERN_INFO "Hook version: 4.16.4 2018/04/24\n");
	62	++ printk(KERN_INFO "Hook version: 4.16.6 2018/04/30\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-4.16.4.orig/include/linux/sched.h
67		-+++ linux-4.16.4/include/linux/sched.h
	66	+--- linux-4.16.6.orig/include/linux/sched.h
	67	++++ linux-4.16.6/include/linux/sched.h
68	68	@@ -33,6 +33,7 @@ struct audit_context;
69	69	struct backing_dev_info;
70	70	struct bio_list;

		@@ -84,8 +84,8 @@
84	84
85	85	/*
86	86	* New fields for task_struct should be added above here, so that
87		---- linux-4.16.4.orig/include/linux/security.h
88		-+++ linux-4.16.4/include/linux/security.h
	87	+--- linux-4.16.6.orig/include/linux/security.h
	88	++++ linux-4.16.6/include/linux/security.h
89	89	@@ -56,6 +56,7 @@ struct msg_queue;
90	90	struct xattr;
91	91	struct xfrm_sec_ctx;

		@@ -306,8 +306,8 @@
306	306	}
307	307	#endif /* CONFIG_SECURITY_PATH */
308	308
309		---- linux-4.16.4.orig/include/net/ip.h
310		-+++ linux-4.16.4/include/net/ip.h
	309	+--- linux-4.16.6.orig/include/net/ip.h
	310	++++ linux-4.16.6/include/net/ip.h
311	311	@@ -268,6 +268,8 @@ void inet_get_local_port_range(struct ne
312	312	#ifdef CONFIG_SYSCTL
313	313	static inline int inet_is_local_reserved_port(struct net *net, int port)

		@@ -326,8 +326,8 @@
326	326	return 0;
327	327	}
328	328
329		---- linux-4.16.4.orig/init/init_task.c
330		-+++ linux-4.16.4/init/init_task.c
	329	+--- linux-4.16.6.orig/init/init_task.c
	330	++++ linux-4.16.6/init/init_task.c
331	331	@@ -175,6 +175,10 @@ struct task_struct init_task
332	332	#ifdef CONFIG_SECURITY
333	333	.security = NULL,

		@@ -339,8 +339,8 @@
339	339	};
340	340	EXPORT_SYMBOL(init_task);
341	341
342		---- linux-4.16.4.orig/kernel/kexec.c
343		-+++ linux-4.16.4/kernel/kexec.c
	342	+--- linux-4.16.6.orig/kernel/kexec.c
	343	++++ linux-4.16.6/kernel/kexec.c
344	344	@@ -17,7 +17,7 @@
345	345	#include <linux/syscalls.h>
346	346	#include <linux/vmalloc.h>

		@@ -359,8 +359,8 @@
359	359
360	360	/*
361	361	* Verify we have a legal set of flags
362		---- linux-4.16.4.orig/kernel/module.c
363		-+++ linux-4.16.4/kernel/module.c
	362	+--- linux-4.16.6.orig/kernel/module.c
	363	++++ linux-4.16.6/kernel/module.c
364	364	@@ -66,6 +66,7 @@
365	365	#include <linux/audit.h>
366	366	#include <uapi/linux/module.h>

		@@ -387,8 +387,8 @@
387	387
388	388	return 0;
389	389	}
390		---- linux-4.16.4.orig/kernel/ptrace.c
391		-+++ linux-4.16.4/kernel/ptrace.c
	390	+--- linux-4.16.6.orig/kernel/ptrace.c
	391	++++ linux-4.16.6/kernel/ptrace.c
392	392	@@ -1112,6 +1112,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
393	393	{
394	394	struct task_struct *child;

		@@ -413,8 +413,8 @@
413	413
414	414	if (request == PTRACE_TRACEME) {
415	415	ret = ptrace_traceme();
416		---- linux-4.16.4.orig/kernel/reboot.c
417		-+++ linux-4.16.4/kernel/reboot.c
	416	+--- linux-4.16.6.orig/kernel/reboot.c
	417	++++ linux-4.16.6/kernel/reboot.c
418	418	@@ -16,6 +16,7 @@
419	419	#include <linux/syscalls.h>
420	420	#include <linux/syscore_ops.h>

		@@ -432,8 +432,8 @@
432	432
433	433	/*
434	434	* If pid namespaces are enabled and the current task is in a child
435		---- linux-4.16.4.orig/kernel/sched/core.c
436		-+++ linux-4.16.4/kernel/sched/core.c
	435	+--- linux-4.16.6.orig/kernel/sched/core.c
	436	++++ linux-4.16.6/kernel/sched/core.c
437	437	@@ -3926,6 +3926,8 @@ int can_nice(const struct task_struct *p
438	438	SYSCALL_DEFINE1(nice, int, increment)
439	439	{

		@@ -443,8 +443,8 @@
443	443
444	444	/*
445	445	* Setpriority might change our priority at the same moment.
446		---- linux-4.16.4.orig/kernel/signal.c
447		-+++ linux-4.16.4/kernel/signal.c
	446	+--- linux-4.16.6.orig/kernel/signal.c
	447	++++ linux-4.16.6/kernel/signal.c
448	448	@@ -3245,6 +3245,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait,
449	449	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
450	450	{

		@@ -490,8 +490,8 @@
490	490
491	491	return do_send_specific(tgid, pid, sig, info);
492	492	}
493		---- linux-4.16.4.orig/kernel/sys.c
494		-+++ linux-4.16.4/kernel/sys.c
	493	+--- linux-4.16.6.orig/kernel/sys.c
	494	++++ linux-4.16.6/kernel/sys.c
495	495	@@ -197,6 +197,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
496	496
497	497	if (which > PRIO_USER \|\| which < PRIO_PROCESS)

		@@ -521,8 +521,8 @@
521	521
522	522	down_write(&uts_sem);
523	523	errno = -EFAULT;
524		---- linux-4.16.4.orig/kernel/time/timekeeping.c
525		-+++ linux-4.16.4/kernel/time/timekeeping.c
	524	+--- linux-4.16.6.orig/kernel/time/timekeeping.c
	525	++++ linux-4.16.6/kernel/time/timekeeping.c
526	526	@@ -25,6 +25,7 @@
527	527	#include <linux/stop_machine.h>
528	528	#include <linux/pvclock_gtod.h>

		@@ -556,8 +556,8 @@
556	556
557	557	/*
558	558	* Validate if a timespec/timeval used to inject a time
559		---- linux-4.16.4.orig/net/ipv4/raw.c
560		-+++ linux-4.16.4/net/ipv4/raw.c
	559	+--- linux-4.16.6.orig/net/ipv4/raw.c
	560	++++ linux-4.16.6/net/ipv4/raw.c
561	561	@@ -781,6 +781,10 @@ static int raw_recvmsg(struct sock *sk,
562	562	skb = skb_recv_datagram(sk, flags, noblock, &err);
563	563	if (!skb)

		@@ -569,8 +569,8 @@
569	569
570	570	copied = skb->len;
571	571	if (len < copied) {
572		---- linux-4.16.4.orig/net/ipv4/udp.c
573		-+++ linux-4.16.4/net/ipv4/udp.c
	572	+--- linux-4.16.6.orig/net/ipv4/udp.c
	573	++++ linux-4.16.6/net/ipv4/udp.c
574	574	@@ -1582,6 +1582,8 @@ try_again:
575	575	skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
576	576	if (!skb)

		@@ -580,8 +580,8 @@
580	580
581	581	ulen = udp_skb_len(skb);
582	582	copied = len;
583		---- linux-4.16.4.orig/net/ipv6/raw.c
584		-+++ linux-4.16.4/net/ipv6/raw.c
	583	+--- linux-4.16.6.orig/net/ipv6/raw.c
	584	++++ linux-4.16.6/net/ipv6/raw.c
585	585	@@ -483,6 +483,10 @@ static int rawv6_recvmsg(struct sock *sk
586	586	skb = skb_recv_datagram(sk, flags, noblock, &err);
587	587	if (!skb)

		@@ -593,8 +593,8 @@
593	593
594	594	copied = skb->len;
595	595	if (copied > len) {
596		---- linux-4.16.4.orig/net/ipv6/udp.c
597		-+++ linux-4.16.4/net/ipv6/udp.c
	596	+--- linux-4.16.6.orig/net/ipv6/udp.c
	597	++++ linux-4.16.6/net/ipv6/udp.c
598	598	@@ -341,6 +341,8 @@ try_again:
599	599	skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
600	600	if (!skb)

		@@ -604,8 +604,8 @@
604	604
605	605	ulen = udp6_skb_len(skb);
606	606	copied = len;
607		---- linux-4.16.4.orig/net/socket.c
608		-+++ linux-4.16.4/net/socket.c
	607	+--- linux-4.16.6.orig/net/socket.c
	608	++++ linux-4.16.6/net/socket.c
609	609	@@ -1572,6 +1572,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
610	610	if (err < 0)
611	611	goto out_fd;

		@@ -617,8 +617,8 @@
617	617	if (upeer_sockaddr) {
618	618	if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
619	619	&len, 2) < 0) {
620		---- linux-4.16.4.orig/net/unix/af_unix.c
621		-+++ linux-4.16.4/net/unix/af_unix.c
	620	+--- linux-4.16.6.orig/net/unix/af_unix.c
	621	++++ linux-4.16.6/net/unix/af_unix.c
622	622	@@ -2132,6 +2132,10 @@ static int unix_dgram_recvmsg(struct soc
623	623	EPOLLOUT \| EPOLLWRNORM \|
624	624	EPOLLWRBAND);

		@@ -638,8 +638,8 @@
638	638	mutex_unlock(&u->iolock);
639	639	out:
640	640	return err;
641		---- linux-4.16.4.orig/security/Kconfig
642		-+++ linux-4.16.4/security/Kconfig
	641	+--- linux-4.16.6.orig/security/Kconfig
	642	++++ linux-4.16.6/security/Kconfig
643	643	@@ -277,5 +277,7 @@ config DEFAULT_SECURITY
644	644	default "apparmor" if DEFAULT_SECURITY_APPARMOR
645	645	default "" if DEFAULT_SECURITY_DAC

		@@ -648,8 +648,8 @@
648	648	+
649	649	endmenu
650	650
651		---- linux-4.16.4.orig/security/Makefile
652		-+++ linux-4.16.4/security/Makefile
	651	+--- linux-4.16.6.orig/security/Makefile
	652	++++ linux-4.16.6/security/Makefile
653	653	@@ -30,3 +30,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
654	654	# Object integrity file lists
655	655	subdir-$(CONFIG_INTEGRITY) += integrity

		@@ -657,8 +657,8 @@
657	657	+
658	658	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
659	659	+obj-$(CONFIG_CCSECURITY) += ccsecurity/
660		---- linux-4.16.4.orig/security/security.c
661		-+++ linux-4.16.4/security/security.c
	660	+--- linux-4.16.6.orig/security/security.c
	661	++++ linux-4.16.6/security/security.c
662	662	@@ -977,12 +977,19 @@ int security_file_open(struct file *file
663	663
664	664	int security_task_alloc(struct task_struct *task, unsigned long clone_flags)

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.17.diff (revision 6643)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.17.diff (revision 6644)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 4.17-rc2.
	1	+This is TOMOYO Linux patch for kernel 4.17-rc3.
2	2
3		-Source code for this patch is https://git.kernel.org/torvalds/t/linux-4.17-rc2.tar.gz
	3	+Source code for this patch is https://git.kernel.org/torvalds/t/linux-4.17-rc3.tar.gz
4	4	---
5	5	fs/exec.c \| 2 -
6	6	fs/open.c \| 2 +

		@@ -28,8 +28,8 @@
28	28	security/security.c \| 9 +++++-
29	29	24 files changed, 148 insertions(+), 29 deletions(-)
30	30
31		---- linux-4.17-rc2.orig/fs/exec.c
32		-+++ linux-4.17-rc2/fs/exec.c
	31	+--- linux-4.17-rc3.orig/fs/exec.c
	32	++++ linux-4.17-rc3/fs/exec.c
33	33	@@ -1692,7 +1692,7 @@ static int exec_binprm(struct linux_binp
34	34	old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
35	35	rcu_read_unlock();

		@@ -39,8 +39,8 @@
39	39	if (ret >= 0) {
40	40	audit_bprm(bprm);
41	41	trace_sched_process_exec(current, old_pid, bprm);
42		---- linux-4.17-rc2.orig/fs/open.c
43		-+++ linux-4.17-rc2/fs/open.c
	42	+--- linux-4.17-rc3.orig/fs/open.c
	43	++++ linux-4.17-rc3/fs/open.c
44	44	@@ -1204,6 +1204,8 @@ SYSCALL_DEFINE1(close, unsigned int, fd)
45	45	*/
46	46	SYSCALL_DEFINE0(vhangup)

		@@ -50,8 +50,8 @@
50	50	if (capable(CAP_SYS_TTY_CONFIG)) {
51	51	tty_vhangup_self();
52	52	return 0;
53		---- linux-4.17-rc2.orig/fs/proc/version.c
54		-+++ linux-4.17-rc2/fs/proc/version.c
	53	+--- linux-4.17-rc3.orig/fs/proc/version.c
	54	++++ linux-4.17-rc3/fs/proc/version.c
55	55	@@ -33,3 +33,10 @@ static int __init proc_version_init(void
56	56	return 0;
57	57	}

		@@ -59,12 +59,12 @@
59	59	+
60	60	+static int __init ccs_show_version(void)
61	61	+{
62		-+ printk(KERN_INFO "Hook version: 4.17-rc2 2018/04/24\n");
	62	++ printk(KERN_INFO "Hook version: 4.17-rc3 2018/04/30\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-4.17-rc2.orig/include/linux/sched.h
67		-+++ linux-4.17-rc2/include/linux/sched.h
	66	+--- linux-4.17-rc3.orig/include/linux/sched.h
	67	++++ linux-4.17-rc3/include/linux/sched.h
68	68	@@ -33,6 +33,7 @@ struct audit_context;
69	69	struct backing_dev_info;
70	70	struct bio_list;

		@@ -84,8 +84,8 @@
84	84
85	85	/*
86	86	* New fields for task_struct should be added above here, so that
87		---- linux-4.17-rc2.orig/include/linux/security.h
88		-+++ linux-4.17-rc2/include/linux/security.h
	87	+--- linux-4.17-rc3.orig/include/linux/security.h
	88	++++ linux-4.17-rc3/include/linux/security.h
89	89	@@ -53,6 +53,7 @@ struct msg_msg;
90	90	struct xattr;
91	91	struct xfrm_sec_ctx;

		@@ -306,8 +306,8 @@
306	306	}
307	307	#endif /* CONFIG_SECURITY_PATH */
308	308
309		---- linux-4.17-rc2.orig/include/net/ip.h
310		-+++ linux-4.17-rc2/include/net/ip.h
	309	+--- linux-4.17-rc3.orig/include/net/ip.h
	310	++++ linux-4.17-rc3/include/net/ip.h
311	311	@@ -277,6 +277,8 @@ void inet_get_local_port_range(struct ne
312	312	#ifdef CONFIG_SYSCTL
313	313	static inline int inet_is_local_reserved_port(struct net *net, int port)

		@@ -326,8 +326,8 @@
326	326	return 0;
327	327	}
328	328
329		---- linux-4.17-rc2.orig/init/init_task.c
330		-+++ linux-4.17-rc2/init/init_task.c
	329	+--- linux-4.17-rc3.orig/init/init_task.c
	330	++++ linux-4.17-rc3/init/init_task.c
331	331	@@ -175,6 +175,10 @@ struct task_struct init_task
332	332	#ifdef CONFIG_SECURITY
333	333	.security = NULL,

		@@ -339,8 +339,8 @@
339	339	};
340	340	EXPORT_SYMBOL(init_task);
341	341
342		---- linux-4.17-rc2.orig/kernel/kexec.c
343		-+++ linux-4.17-rc2/kernel/kexec.c
	342	+--- linux-4.17-rc3.orig/kernel/kexec.c
	343	++++ linux-4.17-rc3/kernel/kexec.c
344	344	@@ -17,7 +17,7 @@
345	345	#include <linux/syscalls.h>
346	346	#include <linux/vmalloc.h>

		@@ -359,8 +359,8 @@
359	359
360	360	/*
361	361	* Verify we have a legal set of flags
362		---- linux-4.17-rc2.orig/kernel/module.c
363		-+++ linux-4.17-rc2/kernel/module.c
	362	+--- linux-4.17-rc3.orig/kernel/module.c
	363	++++ linux-4.17-rc3/kernel/module.c
364	364	@@ -66,6 +66,7 @@
365	365	#include <linux/audit.h>
366	366	#include <uapi/linux/module.h>

		@@ -378,7 +378,7 @@
378	378
379	379	if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0)
380	380	return -EFAULT;
381		-@@ -3543,6 +3546,8 @@ static int may_init_module(void)
	381	+@@ -3544,6 +3547,8 @@ static int may_init_module(void)
382	382	{
383	383	if (!capable(CAP_SYS_MODULE) \|\| modules_disabled)
384	384	return -EPERM;

		@@ -387,8 +387,8 @@
387	387
388	388	return 0;
389	389	}
390		---- linux-4.17-rc2.orig/kernel/ptrace.c
391		-+++ linux-4.17-rc2/kernel/ptrace.c
	390	+--- linux-4.17-rc3.orig/kernel/ptrace.c
	391	++++ linux-4.17-rc3/kernel/ptrace.c
392	392	@@ -1112,6 +1112,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
393	393	{
394	394	struct task_struct *child;

		@@ -413,8 +413,8 @@
413	413
414	414	if (request == PTRACE_TRACEME) {
415	415	ret = ptrace_traceme();
416		---- linux-4.17-rc2.orig/kernel/reboot.c
417		-+++ linux-4.17-rc2/kernel/reboot.c
	416	+--- linux-4.17-rc3.orig/kernel/reboot.c
	417	++++ linux-4.17-rc3/kernel/reboot.c
418	418	@@ -16,6 +16,7 @@
419	419	#include <linux/syscalls.h>
420	420	#include <linux/syscore_ops.h>

		@@ -432,8 +432,8 @@
432	432
433	433	/*
434	434	* If pid namespaces are enabled and the current task is in a child
435		---- linux-4.17-rc2.orig/kernel/sched/core.c
436		-+++ linux-4.17-rc2/kernel/sched/core.c
	435	+--- linux-4.17-rc3.orig/kernel/sched/core.c
	436	++++ linux-4.17-rc3/kernel/sched/core.c
437	437	@@ -3976,6 +3976,8 @@ int can_nice(const struct task_struct *p
438	438	SYSCALL_DEFINE1(nice, int, increment)
439	439	{

		@@ -443,8 +443,8 @@
443	443
444	444	/*
445	445	* Setpriority might change our priority at the same moment.
446		---- linux-4.17-rc2.orig/kernel/signal.c
447		-+++ linux-4.17-rc2/kernel/signal.c
	446	+--- linux-4.17-rc3.orig/kernel/signal.c
	447	++++ linux-4.17-rc3/kernel/signal.c
448	448	@@ -3241,6 +3241,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait,
449	449	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
450	450	{

		@@ -490,8 +490,8 @@
490	490
491	491	return do_send_specific(tgid, pid, sig, info);
492	492	}
493		---- linux-4.17-rc2.orig/kernel/sys.c
494		-+++ linux-4.17-rc2/kernel/sys.c
	493	+--- linux-4.17-rc3.orig/kernel/sys.c
	494	++++ linux-4.17-rc3/kernel/sys.c
495	495	@@ -199,6 +199,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
496	496
497	497	if (which > PRIO_USER \|\| which < PRIO_PROCESS)

		@@ -521,8 +521,8 @@
521	521
522	522	down_write(&uts_sem);
523	523	errno = -EFAULT;
524		---- linux-4.17-rc2.orig/kernel/time/timekeeping.c
525		-+++ linux-4.17-rc2/kernel/time/timekeeping.c
	524	+--- linux-4.17-rc3.orig/kernel/time/timekeeping.c
	525	++++ linux-4.17-rc3/kernel/time/timekeeping.c
526	526	@@ -25,6 +25,7 @@
527	527	#include <linux/stop_machine.h>
528	528	#include <linux/pvclock_gtod.h>

		@@ -531,7 +531,7 @@
531	531
532	532	#include "tick-internal.h"
533	533	#include "ntp_internal.h"
534		-@@ -2238,10 +2239,15 @@ static int timekeeping_validate_timex(st
	534	+@@ -2234,10 +2235,15 @@ static int timekeeping_validate_timex(st
535	535	if (!(txc->modes & ADJ_OFFSET_READONLY) &&
536	536	!capable(CAP_SYS_TIME))
537	537	return -EPERM;

		@@ -547,7 +547,7 @@
547	547	/*
548	548	* if the quartz is off by more than 10% then
549	549	* something is VERY wrong!
550		-@@ -2256,6 +2262,8 @@ static int timekeeping_validate_timex(st
	550	+@@ -2252,6 +2258,8 @@ static int timekeeping_validate_timex(st
551	551	/* In order to inject time, you gotta be super-user! */
552	552	if (!capable(CAP_SYS_TIME))
553	553	return -EPERM;

		@@ -556,8 +556,8 @@
556	556
557	557	/*
558	558	* Validate if a timespec/timeval used to inject a time
559		---- linux-4.17-rc2.orig/net/ipv4/raw.c
560		-+++ linux-4.17-rc2/net/ipv4/raw.c
	559	+--- linux-4.17-rc3.orig/net/ipv4/raw.c
	560	++++ linux-4.17-rc3/net/ipv4/raw.c
561	561	@@ -779,6 +779,10 @@ static int raw_recvmsg(struct sock *sk,
562	562	skb = skb_recv_datagram(sk, flags, noblock, &err);
563	563	if (!skb)

		@@ -569,8 +569,8 @@
569	569
570	570	copied = skb->len;
571	571	if (len < copied) {
572		---- linux-4.17-rc2.orig/net/ipv4/udp.c
573		-+++ linux-4.17-rc2/net/ipv4/udp.c
	572	+--- linux-4.17-rc3.orig/net/ipv4/udp.c
	573	++++ linux-4.17-rc3/net/ipv4/udp.c
574	574	@@ -1576,6 +1576,8 @@ try_again:
575	575	skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
576	576	if (!skb)

		@@ -580,8 +580,8 @@
580	580
581	581	ulen = udp_skb_len(skb);
582	582	copied = len;
583		---- linux-4.17-rc2.orig/net/ipv6/raw.c
584		-+++ linux-4.17-rc2/net/ipv6/raw.c
	583	+--- linux-4.17-rc3.orig/net/ipv6/raw.c
	584	++++ linux-4.17-rc3/net/ipv6/raw.c
585	585	@@ -483,6 +483,10 @@ static int rawv6_recvmsg(struct sock *sk
586	586	skb = skb_recv_datagram(sk, flags, noblock, &err);
587	587	if (!skb)

		@@ -593,8 +593,8 @@
593	593
594	594	copied = skb->len;
595	595	if (copied > len) {
596		---- linux-4.17-rc2.orig/net/ipv6/udp.c
597		-+++ linux-4.17-rc2/net/ipv6/udp.c
	596	+--- linux-4.17-rc3.orig/net/ipv6/udp.c
	597	++++ linux-4.17-rc3/net/ipv6/udp.c
598	598	@@ -341,6 +341,8 @@ try_again:
599	599	skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
600	600	if (!skb)

		@@ -604,8 +604,8 @@
604	604
605	605	ulen = udp6_skb_len(skb);
606	606	copied = len;
607		---- linux-4.17-rc2.orig/net/socket.c
608		-+++ linux-4.17-rc2/net/socket.c
	607	+--- linux-4.17-rc3.orig/net/socket.c
	608	++++ linux-4.17-rc3/net/socket.c
609	609	@@ -1592,6 +1592,10 @@ int __sys_accept4(int fd, struct sockadd
610	610	if (err < 0)
611	611	goto out_fd;

		@@ -617,8 +617,8 @@
617	617	if (upeer_sockaddr) {
618	618	len = newsock->ops->getname(newsock,
619	619	(struct sockaddr *)&address, 2);
620		---- linux-4.17-rc2.orig/net/unix/af_unix.c
621		-+++ linux-4.17-rc2/net/unix/af_unix.c
	620	+--- linux-4.17-rc3.orig/net/unix/af_unix.c
	621	++++ linux-4.17-rc3/net/unix/af_unix.c
622	622	@@ -2122,6 +2122,10 @@ static int unix_dgram_recvmsg(struct soc
623	623	EPOLLOUT \| EPOLLWRNORM \|
624	624	EPOLLWRBAND);

		@@ -638,8 +638,8 @@
638	638	mutex_unlock(&u->iolock);
639	639	out:
640	640	return err;
641		---- linux-4.17-rc2.orig/security/Kconfig
642		-+++ linux-4.17-rc2/security/Kconfig
	641	+--- linux-4.17-rc3.orig/security/Kconfig
	642	++++ linux-4.17-rc3/security/Kconfig
643	643	@@ -277,5 +277,7 @@ config DEFAULT_SECURITY
644	644	default "apparmor" if DEFAULT_SECURITY_APPARMOR
645	645	default "" if DEFAULT_SECURITY_DAC

		@@ -648,8 +648,8 @@
648	648	+
649	649	endmenu
650	650
651		---- linux-4.17-rc2.orig/security/Makefile
652		-+++ linux-4.17-rc2/security/Makefile
	651	+--- linux-4.17-rc3.orig/security/Makefile
	652	++++ linux-4.17-rc3/security/Makefile
653	653	@@ -30,3 +30,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
654	654	# Object integrity file lists
655	655	subdir-$(CONFIG_INTEGRITY) += integrity

		@@ -657,8 +657,8 @@
657	657	+
658	658	+subdir-$(CONFIG_CCSECURITY) += ccsecurity
659	659	+obj-$(CONFIG_CCSECURITY) += ccsecurity/
660		---- linux-4.17-rc2.orig/security/security.c
661		-+++ linux-4.17-rc2/security/security.c
	660	+--- linux-4.17-rc3.orig/security/security.c
	661	++++ linux-4.17-rc3/security/security.c
662	662	@@ -983,12 +983,19 @@ int security_file_open(struct file *file
663	663
664	664	int security_task_alloc(struct task_struct *task, unsigned long clone_flags)

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.4.diff (revision 6643)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.4.diff (revision 6644)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 4.4.129.
	1	+This is TOMOYO Linux patch for kernel 4.4.130.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.129.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.130.tar.xz
4	4	---
5	5	fs/exec.c \| 2 -
6	6	fs/open.c \| 2 +

		@@ -28,8 +28,8 @@
28	28	security/Makefile \| 3 ++
29	29	24 files changed, 150 insertions(+), 26 deletions(-)
30	30
31		---- linux-4.4.129.orig/fs/exec.c
32		-+++ linux-4.4.129/fs/exec.c
	31	+--- linux-4.4.130.orig/fs/exec.c
	32	++++ linux-4.4.130/fs/exec.c
33	33	@@ -1508,7 +1508,7 @@ static int exec_binprm(struct linux_binp
34	34	old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
35	35	rcu_read_unlock();

		@@ -39,8 +39,8 @@
39	39	if (ret >= 0) {
40	40	audit_bprm(bprm);
41	41	trace_sched_process_exec(current, old_pid, bprm);
42		---- linux-4.4.129.orig/fs/open.c
43		-+++ linux-4.4.129/fs/open.c
	42	+--- linux-4.4.130.orig/fs/open.c
	43	++++ linux-4.4.130/fs/open.c
44	44	@@ -1117,6 +1117,8 @@ EXPORT_SYMBOL(sys_close);
45	45	*/
46	46	SYSCALL_DEFINE0(vhangup)

		@@ -50,8 +50,8 @@
50	50	if (capable(CAP_SYS_TTY_CONFIG)) {
51	51	tty_vhangup_self();
52	52	return 0;
53		---- linux-4.4.129.orig/fs/proc/version.c
54		-+++ linux-4.4.129/fs/proc/version.c
	53	+--- linux-4.4.130.orig/fs/proc/version.c
	54	++++ linux-4.4.130/fs/proc/version.c
55	55	@@ -32,3 +32,10 @@ static int __init proc_version_init(void
56	56	return 0;
57	57	}

		@@ -59,12 +59,12 @@
59	59	+
60	60	+static int __init ccs_show_version(void)
61	61	+{
62		-+ printk(KERN_INFO "Hook version: 4.4.129 2018/04/24\n");
	62	++ printk(KERN_INFO "Hook version: 4.4.130 2018/04/30\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-4.4.129.orig/include/linux/init_task.h
67		-+++ linux-4.4.129/include/linux/init_task.h
	66	+--- linux-4.4.130.orig/include/linux/init_task.h
	67	++++ linux-4.4.130/include/linux/init_task.h
68	68	@@ -183,6 +183,14 @@ extern struct task_group root_task_group
69	69	# define INIT_KASAN(tsk)
70	70	#endif

		@@ -88,8 +88,8 @@
88	88	}
89	89
90	90
91		---- linux-4.4.129.orig/include/linux/sched.h
92		-+++ linux-4.4.129/include/linux/sched.h
	91	+--- linux-4.4.130.orig/include/linux/sched.h
	92	++++ linux-4.4.130/include/linux/sched.h
93	93	@@ -6,6 +6,8 @@
94	94	#include <linux/sched/prio.h>
95	95

		@@ -110,8 +110,8 @@
110	110	/* CPU-specific state of this task */
111	111	struct thread_struct thread;
112	112	/*
113		---- linux-4.4.129.orig/include/linux/security.h
114		-+++ linux-4.4.129/include/linux/security.h
	113	+--- linux-4.4.130.orig/include/linux/security.h
	114	++++ linux-4.4.130/include/linux/security.h
115	115	@@ -53,6 +53,7 @@ struct msg_queue;
116	116	struct xattr;
117	117	struct xfrm_sec_ctx;

		@@ -318,8 +318,8 @@
318	318	}
319	319	#endif /* CONFIG_SECURITY_PATH */
320	320
321		---- linux-4.4.129.orig/include/net/ip.h
322		-+++ linux-4.4.129/include/net/ip.h
	321	+--- linux-4.4.130.orig/include/net/ip.h
	322	++++ linux-4.4.130/include/net/ip.h
323	323	@@ -225,6 +225,8 @@ void inet_get_local_port_range(struct ne
324	324	#ifdef CONFIG_SYSCTL
325	325	static inline int inet_is_local_reserved_port(struct net *net, int port)

		@@ -338,8 +338,8 @@
338	338	return 0;
339	339	}
340	340	#endif
341		---- linux-4.4.129.orig/kernel/fork.c
342		-+++ linux-4.4.129/kernel/fork.c
	341	+--- linux-4.4.130.orig/kernel/fork.c
	342	++++ linux-4.4.130/kernel/fork.c
343	343	@@ -260,6 +260,7 @@ void __put_task_struct(struct task_struc
344	344	delayacct_tsk_free(tsk);
345	345	put_signal_struct(tsk->signal);

		@@ -366,8 +366,8 @@
366	366	bad_fork_cleanup_perf:
367	367	perf_event_free_task(p);
368	368	bad_fork_cleanup_policy:
369		---- linux-4.4.129.orig/kernel/kexec.c
370		-+++ linux-4.4.129/kernel/kexec.c
	369	+--- linux-4.4.130.orig/kernel/kexec.c
	370	++++ linux-4.4.130/kernel/kexec.c
371	371	@@ -17,7 +17,7 @@
372	372	#include <linux/syscalls.h>
373	373	#include <linux/vmalloc.h>

		@@ -386,8 +386,8 @@
386	386
387	387	/*
388	388	* Verify we have a legal set of flags
389		---- linux-4.4.129.orig/kernel/module.c
390		-+++ linux-4.4.129/kernel/module.c
	389	+--- linux-4.4.130.orig/kernel/module.c
	390	++++ linux-4.4.130/kernel/module.c
391	391	@@ -61,6 +61,7 @@
392	392	#include <linux/bsearch.h>
393	393	#include <uapi/linux/module.h>

		@@ -414,8 +414,8 @@
414	414
415	415	return 0;
416	416	}
417		---- linux-4.4.129.orig/kernel/ptrace.c
418		-+++ linux-4.4.129/kernel/ptrace.c
	417	+--- linux-4.4.130.orig/kernel/ptrace.c
	418	++++ linux-4.4.130/kernel/ptrace.c
419	419	@@ -1085,6 +1085,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
420	420	{
421	421	struct task_struct *child;

		@@ -440,8 +440,8 @@
440	440
441	441	if (request == PTRACE_TRACEME) {
442	442	ret = ptrace_traceme();
443		---- linux-4.4.129.orig/kernel/reboot.c
444		-+++ linux-4.4.129/kernel/reboot.c
	443	+--- linux-4.4.130.orig/kernel/reboot.c
	444	++++ linux-4.4.130/kernel/reboot.c
445	445	@@ -16,6 +16,7 @@
446	446	#include <linux/syscalls.h>
447	447	#include <linux/syscore_ops.h>

		@@ -459,8 +459,8 @@
459	459
460	460	/*
461	461	* If pid namespaces are enabled and the current task is in a child
462		---- linux-4.4.129.orig/kernel/sched/core.c
463		-+++ linux-4.4.129/kernel/sched/core.c
	462	+--- linux-4.4.130.orig/kernel/sched/core.c
	463	++++ linux-4.4.130/kernel/sched/core.c
464	464	@@ -3549,6 +3549,8 @@ int can_nice(const struct task_struct *p
465	465	SYSCALL_DEFINE1(nice, int, increment)
466	466	{

		@@ -470,8 +470,8 @@
470	470
471	471	/*
472	472	* Setpriority might change our priority at the same moment.
473		---- linux-4.4.129.orig/kernel/signal.c
474		-+++ linux-4.4.129/kernel/signal.c
	473	+--- linux-4.4.130.orig/kernel/signal.c
	474	++++ linux-4.4.130/kernel/signal.c
475	475	@@ -2857,6 +2857,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
476	476	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
477	477	{

		@@ -517,8 +517,8 @@
517	517
518	518	return do_send_specific(tgid, pid, sig, info);
519	519	}
520		---- linux-4.4.129.orig/kernel/sys.c
521		-+++ linux-4.4.129/kernel/sys.c
	520	+--- linux-4.4.130.orig/kernel/sys.c
	521	++++ linux-4.4.130/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.4.129.orig/kernel/time/ntp.c
552		-+++ linux-4.4.129/kernel/time/ntp.c
	551	+--- linux-4.4.130.orig/kernel/time/ntp.c
	552	++++ linux-4.4.130/kernel/time/ntp.c
553	553	@@ -16,6 +16,7 @@
554	554	#include <linux/mm.h>
555	555	#include <linux/module.h>

		@@ -583,8 +583,8 @@
583	583
584	584	if (txc->modes & ADJ_NANO) {
585	585	struct timespec ts;
586		---- linux-4.4.129.orig/net/ipv4/raw.c
587		-+++ linux-4.4.129/net/ipv4/raw.c
	586	+--- linux-4.4.130.orig/net/ipv4/raw.c
	587	++++ linux-4.4.130/net/ipv4/raw.c
588	588	@@ -747,6 +747,10 @@ static int raw_recvmsg(struct sock *sk,
589	589	skb = skb_recv_datagram(sk, flags, noblock, &err);
590	590	if (!skb)

		@@ -596,8 +596,8 @@
596	596
597	597	copied = skb->len;
598	598	if (len < copied) {
599		---- linux-4.4.129.orig/net/ipv4/udp.c
600		-+++ linux-4.4.129/net/ipv4/udp.c
	599	+--- linux-4.4.130.orig/net/ipv4/udp.c
	600	++++ linux-4.4.130/net/ipv4/udp.c
601	601	@@ -1286,6 +1286,10 @@ try_again:
602	602	&peeked, &off, &err);
603	603	if (!skb)

		@@ -609,8 +609,8 @@
609	609
610	610	ulen = skb->len - sizeof(struct udphdr);
611	611	copied = len;
612		---- linux-4.4.129.orig/net/ipv6/raw.c
613		-+++ linux-4.4.129/net/ipv6/raw.c
	612	+--- linux-4.4.130.orig/net/ipv6/raw.c
	613	++++ linux-4.4.130/net/ipv6/raw.c
614	614	@@ -478,6 +478,10 @@ static int rawv6_recvmsg(struct sock *sk
615	615	skb = skb_recv_datagram(sk, flags, noblock, &err);
616	616	if (!skb)

		@@ -622,8 +622,8 @@
622	622
623	623	copied = skb->len;
624	624	if (copied > len) {
625		---- linux-4.4.129.orig/net/ipv6/udp.c
626		-+++ linux-4.4.129/net/ipv6/udp.c
	625	+--- linux-4.4.130.orig/net/ipv6/udp.c
	626	++++ linux-4.4.130/net/ipv6/udp.c
627	627	@@ -417,6 +417,10 @@ try_again:
628	628	&peeked, &off, &err);
629	629	if (!skb)

		@@ -635,8 +635,8 @@
635	635
636	636	ulen = skb->len - sizeof(struct udphdr);
637	637	copied = len;
638		---- linux-4.4.129.orig/net/socket.c
639		-+++ linux-4.4.129/net/socket.c
	638	+--- linux-4.4.130.orig/net/socket.c
	639	++++ linux-4.4.130/net/socket.c
640	640	@@ -1476,6 +1476,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
641	641	if (err < 0)
642	642	goto out_fd;

		@@ -648,8 +648,8 @@
648	648	if (upeer_sockaddr) {
649	649	if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
650	650	&len, 2) < 0) {
651		---- linux-4.4.129.orig/net/unix/af_unix.c
652		-+++ linux-4.4.129/net/unix/af_unix.c
	651	+--- linux-4.4.130.orig/net/unix/af_unix.c
	652	++++ linux-4.4.130/net/unix/af_unix.c
653	653	@@ -2144,6 +2144,10 @@ static int unix_dgram_recvmsg(struct soc
654	654	wake_up_interruptible_sync_poll(&u->peer_wait,
655	655	POLLOUT \| POLLWRNORM \| POLLWRBAND);

		@@ -661,8 +661,8 @@
661	661	if (msg->msg_name)
662	662	unix_copy_addr(msg, skb->sk);
663	663
664		---- linux-4.4.129.orig/security/Kconfig
665		-+++ linux-4.4.129/security/Kconfig
	664	+--- linux-4.4.130.orig/security/Kconfig
	665	++++ linux-4.4.130/security/Kconfig
666	666	@@ -173,5 +173,7 @@ config DEFAULT_SECURITY
667	667	default "apparmor" if DEFAULT_SECURITY_APPARMOR
668	668	default "" if DEFAULT_SECURITY_DAC

		@@ -671,8 +671,8 @@
671	671	+
672	672	endmenu
673	673
674		---- linux-4.4.129.orig/security/Makefile
675		-+++ linux-4.4.129/security/Makefile
	674	+--- linux-4.4.130.orig/security/Makefile
	675	++++ linux-4.4.130/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

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-4.9.diff (revision 6643)

+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-4.9.diff (revision 6644)

		@@ -1,6 +1,6 @@
1		-This is TOMOYO Linux patch for kernel 4.9.96.
	1	+This is TOMOYO Linux patch for kernel 4.9.97.
2	2
3		-Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.96.tar.xz
	3	+Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.97.tar.xz
4	4	---
5	5	fs/exec.c \| 2 -
6	6	fs/open.c \| 2 +

		@@ -28,8 +28,8 @@
28	28	security/Makefile \| 3 ++
29	29	24 files changed, 147 insertions(+), 26 deletions(-)
30	30
31		---- linux-4.9.96.orig/fs/exec.c
32		-+++ linux-4.9.96/fs/exec.c
	31	+--- linux-4.9.97.orig/fs/exec.c
	32	++++ linux-4.9.97/fs/exec.c
33	33	@@ -1661,7 +1661,7 @@ static int exec_binprm(struct linux_binp
34	34	old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
35	35	rcu_read_unlock();

		@@ -39,8 +39,8 @@
39	39	if (ret >= 0) {
40	40	audit_bprm(bprm);
41	41	trace_sched_process_exec(current, old_pid, bprm);
42		---- linux-4.9.96.orig/fs/open.c
43		-+++ linux-4.9.96/fs/open.c
	42	+--- linux-4.9.97.orig/fs/open.c
	43	++++ linux-4.9.97/fs/open.c
44	44	@@ -1151,6 +1151,8 @@ EXPORT_SYMBOL(sys_close);
45	45	*/
46	46	SYSCALL_DEFINE0(vhangup)

		@@ -50,8 +50,8 @@
50	50	if (capable(CAP_SYS_TTY_CONFIG)) {
51	51	tty_vhangup_self();
52	52	return 0;
53		---- linux-4.9.96.orig/fs/proc/version.c
54		-+++ linux-4.9.96/fs/proc/version.c
	53	+--- linux-4.9.97.orig/fs/proc/version.c
	54	++++ linux-4.9.97/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.96 2018/04/24\n");
	62	++ printk(KERN_INFO "Hook version: 4.9.97 2018/04/30\n");
63	63	+ return 0;
64	64	+}
65	65	+fs_initcall(ccs_show_version);
66		---- linux-4.9.96.orig/include/linux/init_task.h
67		-+++ linux-4.9.96/include/linux/init_task.h
	66	+--- linux-4.9.97.orig/include/linux/init_task.h
	67	++++ linux-4.9.97/include/linux/init_task.h
68	68	@@ -193,6 +193,14 @@ extern struct task_group root_task_group
69	69	# define INIT_TASK_TI(tsk)
70	70	#endif

		@@ -88,8 +88,8 @@
88	88	}
89	89
90	90
91		---- linux-4.9.96.orig/include/linux/sched.h
92		-+++ linux-4.9.96/include/linux/sched.h
	91	+--- linux-4.9.97.orig/include/linux/sched.h
	92	++++ linux-4.9.97/include/linux/sched.h
93	93	@@ -6,6 +6,8 @@
94	94	#include <linux/sched/prio.h>
95	95

		@@ -110,8 +110,8 @@
110	110	/* CPU-specific state of this task */
111	111	struct thread_struct thread;
112	112	/*
113		---- linux-4.9.96.orig/include/linux/security.h
114		-+++ linux-4.9.96/include/linux/security.h
	113	+--- linux-4.9.97.orig/include/linux/security.h
	114	++++ linux-4.9.97/include/linux/security.h
115	115	@@ -55,6 +55,7 @@ struct msg_queue;
116	116	struct xattr;
117	117	struct xfrm_sec_ctx;

		@@ -318,8 +318,8 @@
318	318	}
319	319	#endif /* CONFIG_SECURITY_PATH */
320	320
321		---- linux-4.9.96.orig/include/net/ip.h
322		-+++ linux-4.9.96/include/net/ip.h
	321	+--- linux-4.9.97.orig/include/net/ip.h
	322	++++ linux-4.9.97/include/net/ip.h
323	323	@@ -254,6 +254,8 @@ void inet_get_local_port_range(struct ne
324	324	#ifdef CONFIG_SYSCTL
325	325	static inline int inet_is_local_reserved_port(struct net *net, int port)

		@@ -338,8 +338,8 @@
338	338	return 0;
339	339	}
340	340	#endif
341		---- linux-4.9.96.orig/kernel/fork.c
342		-+++ linux-4.9.96/kernel/fork.c
	341	+--- linux-4.9.97.orig/kernel/fork.c
	342	++++ linux-4.9.97/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-4.9.96.orig/kernel/kexec.c
370		-+++ linux-4.9.96/kernel/kexec.c
	369	+--- linux-4.9.97.orig/kernel/kexec.c
	370	++++ linux-4.9.97/kernel/kexec.c
371	371	@@ -17,7 +17,7 @@
372	372	#include <linux/syscalls.h>
373	373	#include <linux/vmalloc.h>

		@@ -386,8 +386,8 @@
386	386
387	387	/*
388	388	* Verify we have a legal set of flags
389		---- linux-4.9.96.orig/kernel/module.c
390		-+++ linux-4.9.96/kernel/module.c
	389	+--- linux-4.9.97.orig/kernel/module.c
	390	++++ linux-4.9.97/kernel/module.c
391	391	@@ -63,6 +63,7 @@
392	392	#include <linux/dynamic_debug.h>
393	393	#include <uapi/linux/module.h>

		@@ -414,8 +414,8 @@
414	414
415	415	return 0;
416	416	}
417		---- linux-4.9.96.orig/kernel/ptrace.c
418		-+++ linux-4.9.96/kernel/ptrace.c
	417	+--- linux-4.9.97.orig/kernel/ptrace.c
	418	++++ linux-4.9.97/kernel/ptrace.c
419	419	@@ -1122,6 +1122,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
420	420	{
421	421	struct task_struct *child;

		@@ -440,8 +440,8 @@
440	440
441	441	if (request == PTRACE_TRACEME) {
442	442	ret = ptrace_traceme();
443		---- linux-4.9.96.orig/kernel/reboot.c
444		-+++ linux-4.9.96/kernel/reboot.c
	443	+--- linux-4.9.97.orig/kernel/reboot.c
	444	++++ linux-4.9.97/kernel/reboot.c
445	445	@@ -16,6 +16,7 @@
446	446	#include <linux/syscalls.h>
447	447	#include <linux/syscore_ops.h>

		@@ -459,8 +459,8 @@
459	459
460	460	/*
461	461	* If pid namespaces are enabled and the current task is in a child
462		---- linux-4.9.96.orig/kernel/sched/core.c
463		-+++ linux-4.9.96/kernel/sched/core.c
	462	+--- linux-4.9.97.orig/kernel/sched/core.c
	463	++++ linux-4.9.97/kernel/sched/core.c
464	464	@@ -3813,6 +3813,8 @@ int can_nice(const struct task_struct *p
465	465	SYSCALL_DEFINE1(nice, int, increment)
466	466	{

		@@ -470,8 +470,8 @@
470	470
471	471	/*
472	472	* Setpriority might change our priority at the same moment.
473		---- linux-4.9.96.orig/kernel/signal.c
474		-+++ linux-4.9.96/kernel/signal.c
	473	+--- linux-4.9.97.orig/kernel/signal.c
	474	++++ linux-4.9.97/kernel/signal.c
475	475	@@ -2857,6 +2857,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
476	476	SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
477	477	{

		@@ -517,8 +517,8 @@
517	517
518	518	return do_send_specific(tgid, pid, sig, info);
519	519	}
520		---- linux-4.9.96.orig/kernel/sys.c
521		-+++ linux-4.9.96/kernel/sys.c
	520	+--- linux-4.9.97.orig/kernel/sys.c
	521	++++ linux-4.9.97/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.9.96.orig/kernel/time/ntp.c
552		-+++ linux-4.9.96/kernel/time/ntp.c
	551	+--- linux-4.9.97.orig/kernel/time/ntp.c
	552	++++ linux-4.9.97/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-4.9.96.orig/net/ipv4/raw.c
587		-+++ linux-4.9.96/net/ipv4/raw.c
	586	+--- linux-4.9.97.orig/net/ipv4/raw.c
	587	++++ linux-4.9.97/net/ipv4/raw.c
588	588	@@ -744,6 +744,10 @@ static int raw_recvmsg(struct sock *sk,
589	589	skb = skb_recv_datagram(sk, flags, noblock, &err);
590	590	if (!skb)

		@@ -596,8 +596,8 @@
596	596
597	597	copied = skb->len;
598	598	if (len < copied) {
599		---- linux-4.9.96.orig/net/ipv4/udp.c
600		-+++ linux-4.9.96/net/ipv4/udp.c
	599	+--- linux-4.9.97.orig/net/ipv4/udp.c
	600	++++ linux-4.9.97/net/ipv4/udp.c
601	601	@@ -1264,6 +1264,8 @@ try_again:
602	602	&peeked, &off, &err);
603	603	if (!skb)

		@@ -607,8 +607,8 @@
607	607
608	608	ulen = skb->len;
609	609	copied = len;
610		---- linux-4.9.96.orig/net/ipv6/raw.c
611		-+++ linux-4.9.96/net/ipv6/raw.c
	610	+--- linux-4.9.97.orig/net/ipv6/raw.c
	611	++++ linux-4.9.97/net/ipv6/raw.c
612	612	@@ -478,6 +478,10 @@ static int rawv6_recvmsg(struct sock *sk
613	613	skb = skb_recv_datagram(sk, flags, noblock, &err);
614	614	if (!skb)

		@@ -620,8 +620,8 @@
620	620
621	621	copied = skb->len;
622	622	if (copied > len) {
623		---- linux-4.9.96.orig/net/ipv6/udp.c
624		-+++ linux-4.9.96/net/ipv6/udp.c
	623	+--- linux-4.9.97.orig/net/ipv6/udp.c
	624	++++ linux-4.9.97/net/ipv6/udp.c
625	625	@@ -348,6 +348,8 @@ try_again:
626	626	&peeked, &off, &err);
627	627	if (!skb)

		@@ -631,8 +631,8 @@
631	631
632	632	ulen = skb->len;
633	633	copied = len;
634		---- linux-4.9.96.orig/net/socket.c
635		-+++ linux-4.9.96/net/socket.c
	634	+--- linux-4.9.97.orig/net/socket.c
	635	++++ linux-4.9.97/net/socket.c
636	636	@@ -1481,6 +1481,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
637	637	if (err < 0)
638	638	goto out_fd;

		@@ -644,8 +644,8 @@
644	644	if (upeer_sockaddr) {
645	645	if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
646	646	&len, 2) < 0) {
647		---- linux-4.9.96.orig/net/unix/af_unix.c
648		-+++ linux-4.9.96/net/unix/af_unix.c
	647	+--- linux-4.9.97.orig/net/unix/af_unix.c
	648	++++ linux-4.9.97/net/unix/af_unix.c
649	649	@@ -2150,6 +2150,10 @@ static int unix_dgram_recvmsg(struct soc
650	650	POLLOUT \| POLLWRNORM \|
651	651	POLLWRBAND);

		@@ -665,8 +665,8 @@
665	665	mutex_unlock(&u->iolock);
666	666	out:
667	667	return err;
668		---- linux-4.9.96.orig/security/Kconfig
669		-+++ linux-4.9.96/security/Kconfig
	668	+--- linux-4.9.97.orig/security/Kconfig
	669	++++ linux-4.9.97/security/Kconfig
670	670	@@ -214,5 +214,7 @@ config DEFAULT_SECURITY
671	671	default "apparmor" if DEFAULT_SECURITY_APPARMOR
672	672	default "" if DEFAULT_SECURITY_DAC

		@@ -675,8 +675,8 @@
675	675	+
676	676	endmenu
677	677
678		---- linux-4.9.96.orig/security/Makefile
679		-+++ linux-4.9.96/security/Makefile
	678	+--- linux-4.9.97.orig/security/Makefile
	679	++++ linux-4.9.97/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

--- trunk/1.8.x/ccs-patch/specs/build-c7-3.10.sh (revision 6643)

+++ trunk/1.8.x/ccs-patch/specs/build-c7-3.10.sh (revision 6644)

		@@ -10,12 +10,12 @@
10	10
11	11	cd /tmp/ \|\| die "Can't chdir to /tmp/ ."
12	12
13		-if [ ! -r kernel-3.10.0-693.21.1.el7.src.rpm ]
	13	+if [ ! -r kernel-3.10.0-862.el7.src.rpm ]
14	14	then
15		- wget http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-693.21.1.el7.src.rpm \|\| die "Can't download source package."
	15	+ wget http://vault.centos.org/centos/7/os/Source/SPackages/kernel-3.10.0-862.el7.src.rpm \|\| die "Can't download source package."
16	16	fi
17		-LANG=C rpm --checksig kernel-3.10.0-693.21.1.el7.src.rpm \| grep -F ': rsa sha1 (md5) pgp md5 OK' \|\| die "Can't verify signature."
18		-rpm -ivh kernel-3.10.0-693.21.1.el7.src.rpm \|\| die "Can't install source package."
	17	+LANG=C rpm --checksig kernel-3.10.0-862.el7.src.rpm \| grep -F ': rsa sha1 (md5) pgp md5 OK' \|\| die "Can't verify signature."
	18	+rpm -ivh kernel-3.10.0-862.el7.src.rpm \|\| die "Can't install source package."
19	19
20	20	cd ~/rpmbuild/SOURCES/ \|\| die "Can't chdir to ~/rpmbuild/SOURCES/ ."
21	21	if [ ! -r ccs-patch-1.8.5-20180401.tar.gz ]

		@@ -37,7 +37,7 @@
37	37
38	38	# For a kernel released for public testing, released_kernel should be 1.
39	39	# For internal testing builds during development, it should be 0.
40		-@@ -296,7 +296,7 @@
	40	+@@ -312,7 +312,7 @@
41	41	AutoProv: yes\
42	42	%{nil}
43	43

		@@ -46,7 +46,7 @@
46	46	Group: System Environment/Kernel
47	47	License: GPLv2
48	48	URL: http://www.kernel.org/
49		-@@ -603,13 +603,13 @@
	49	+@@ -636,13 +636,13 @@
50	50	%package %{?1:%{1}-}devel\
51	51	Summary: Development package for building kernel modules to match the %{?2:%{2} }kernel\
52	52	Group: System Environment/Kernel\

		@@ -64,7 +64,7 @@
64	64	This package provides kernel headers and makefiles sufficient to build modules\
65	65	against the %{?2:%{2} }kernel package.\
66	66	%{nil}
67		-@@ -721,6 +721,10 @@
	67	+@@ -754,6 +754,10 @@
68	68	ApplyOptionalPatch debrand-rh_taint.patch
69	69	ApplyOptionalPatch debrand-rh-i686-cpu.patch
70	70

		@@ -75,7 +75,7 @@
75	75	# Any further pre-build tree manipulations happen here.
76	76
77	77	chmod +x scripts/checkpatch.pl
78		-@@ -759,6 +763,17 @@
	78	+@@ -792,6 +796,17 @@
79	79	for i in *.config
80	80	do
81	81	mv $i .config

旧リポジトリブラウザで表示

TOMOYO Fork

tomoyo: コミット

コミットメタ情報

ログメッセージ

変更サマリ

差分

TOMOYO
Fork