OSDN -- Develop and Download Open Source Software
  • R/O
  • SSH
  • HTTPS

caitsith: Commit


Commit MetaInfo

Revision157 (tree)
Time2015-07-16 11:16:38
Authorkumaneko

Log Message

(empty log message)

Change Summary

Incremental Difference

--- trunk/caitsith-patch/patches/ccs-patch-2.6.32-centos-6.diff (revision 156)
+++ trunk/caitsith-patch/patches/ccs-patch-2.6.32-centos-6.diff (revision 157)
@@ -1,6 +1,6 @@
11 This is TOMOYO Linux patch for CentOS 6.
22
3-Source code for this patch is http://vault.centos.org/6.6/updates/Source/SPackages/kernel-2.6.32-504.23.4.el6.src.rpm
3+Source code for this patch is http://vault.centos.org/6.6/updates/Source/SPackages/kernel-2.6.32-504.30.3.el6.src.rpm
44 ---
55 fs/compat.c | 2 +-
66 fs/compat_ioctl.c | 3 +++
@@ -37,8 +37,8 @@
3737 security/Makefile | 3 +++
3838 33 files changed, 201 insertions(+), 2 deletions(-)
3939
40---- linux-2.6.32-504.23.4.el6.orig/fs/compat.c
41-+++ linux-2.6.32-504.23.4.el6/fs/compat.c
40+--- linux-2.6.32-504.30.3.el6.orig/fs/compat.c
41++++ linux-2.6.32-504.30.3.el6/fs/compat.c
4242 @@ -1523,7 +1523,7 @@ int compat_do_execve(const char * filena
4343 if (retval < 0)
4444 goto out;
@@ -48,8 +48,8 @@
4848 if (retval < 0)
4949 goto out;
5050
51---- linux-2.6.32-504.23.4.el6.orig/fs/compat_ioctl.c
52-+++ linux-2.6.32-504.23.4.el6/fs/compat_ioctl.c
51+--- linux-2.6.32-504.30.3.el6.orig/fs/compat_ioctl.c
52++++ linux-2.6.32-504.30.3.el6/fs/compat_ioctl.c
5353 @@ -114,6 +114,7 @@
5454 #ifdef CONFIG_SPARC
5555 #include <asm/fbio.h>
@@ -67,8 +67,8 @@
6767 if (error)
6868 goto out_fput;
6969
70---- linux-2.6.32-504.23.4.el6.orig/fs/exec.c
71-+++ linux-2.6.32-504.23.4.el6/fs/exec.c
70+--- linux-2.6.32-504.30.3.el6.orig/fs/exec.c
71++++ linux-2.6.32-504.30.3.el6/fs/exec.c
7272 @@ -1472,7 +1472,7 @@ int do_execve(const char * filename,
7373 goto out;
7474
@@ -78,8 +78,8 @@
7878 if (retval < 0)
7979 goto out;
8080
81---- linux-2.6.32-504.23.4.el6.orig/fs/fcntl.c
82-+++ linux-2.6.32-504.23.4.el6/fs/fcntl.c
81+--- linux-2.6.32-504.30.3.el6.orig/fs/fcntl.c
82++++ linux-2.6.32-504.30.3.el6/fs/fcntl.c
8383 @@ -428,6 +428,8 @@ SYSCALL_DEFINE3(fcntl, unsigned int, fd,
8484 goto out;
8585
@@ -98,8 +98,8 @@
9898 if (err) {
9999 fput(filp);
100100 return err;
101---- linux-2.6.32-504.23.4.el6.orig/fs/ioctl.c
102-+++ linux-2.6.32-504.23.4.el6/fs/ioctl.c
101+--- linux-2.6.32-504.30.3.el6.orig/fs/ioctl.c
102++++ linux-2.6.32-504.30.3.el6/fs/ioctl.c
103103 @@ -639,6 +639,8 @@ SYSCALL_DEFINE3(ioctl, unsigned int, fd,
104104 goto out;
105105
@@ -109,8 +109,8 @@
109109 if (error)
110110 goto out_fput;
111111
112---- linux-2.6.32-504.23.4.el6.orig/fs/namei.c
113-+++ linux-2.6.32-504.23.4.el6/fs/namei.c
112+--- linux-2.6.32-504.30.3.el6.orig/fs/namei.c
113++++ linux-2.6.32-504.30.3.el6/fs/namei.c
114114 @@ -2040,6 +2040,11 @@ int may_open(struct path *path, int acc_
115115 if (flag & O_NOATIME && !is_owner_or_cap(inode))
116116 return -EPERM;
@@ -198,8 +198,8 @@
198198 if (error)
199199 goto exit5;
200200 error = vfs_rename(old_dir->d_inode, old_dentry,
201---- linux-2.6.32-504.23.4.el6.orig/fs/namespace.c
202-+++ linux-2.6.32-504.23.4.el6/fs/namespace.c
201+--- linux-2.6.32-504.30.3.el6.orig/fs/namespace.c
202++++ linux-2.6.32-504.30.3.el6/fs/namespace.c
203203 @@ -1097,6 +1097,8 @@ static int do_umount(struct vfsmount *mn
204204 LIST_HEAD(umount_list);
205205
@@ -236,8 +236,8 @@
236236 if (error) {
237237 path_put(&old);
238238 goto out1;
239---- linux-2.6.32-504.23.4.el6.orig/fs/open.c
240-+++ linux-2.6.32-504.23.4.el6/fs/open.c
239+--- linux-2.6.32-504.30.3.el6.orig/fs/open.c
240++++ linux-2.6.32-504.30.3.el6/fs/open.c
241241 @@ -102,6 +102,8 @@ long vfs_truncate(struct path *path, lof
242242 error = locks_verify_truncate(inode, NULL, length);
243243 if (!error)
@@ -328,8 +328,8 @@
328328 if (capable(CAP_SYS_TTY_CONFIG)) {
329329 tty_vhangup_self();
330330 return 0;
331---- linux-2.6.32-504.23.4.el6.orig/fs/proc/version.c
332-+++ linux-2.6.32-504.23.4.el6/fs/proc/version.c
331+--- linux-2.6.32-504.30.3.el6.orig/fs/proc/version.c
332++++ linux-2.6.32-504.30.3.el6/fs/proc/version.c
333333 @@ -32,3 +32,10 @@ static int __init proc_version_init(void
334334 return 0;
335335 }
@@ -337,12 +337,12 @@
337337 +
338338 +static int __init ccs_show_version(void)
339339 +{
340-+ printk(KERN_INFO "Hook version: 2.6.32-504.23.4.el6 2015/06/22\n");
340++ printk(KERN_INFO "Hook version: 2.6.32-504.30.3.el6 2015/07/16\n");
341341 + return 0;
342342 +}
343343 +module_init(ccs_show_version);
344---- linux-2.6.32-504.23.4.el6.orig/fs/stat.c
345-+++ linux-2.6.32-504.23.4.el6/fs/stat.c
344+--- linux-2.6.32-504.30.3.el6.orig/fs/stat.c
345++++ linux-2.6.32-504.30.3.el6/fs/stat.c
346346 @@ -43,6 +43,8 @@ int vfs_getattr(struct vfsmount *mnt, st
347347 int retval;
348348
@@ -352,8 +352,8 @@
352352 if (retval)
353353 return retval;
354354
355---- linux-2.6.32-504.23.4.el6.orig/include/linux/init_task.h
356-+++ linux-2.6.32-504.23.4.el6/include/linux/init_task.h
355+--- linux-2.6.32-504.30.3.el6.orig/include/linux/init_task.h
356++++ linux-2.6.32-504.30.3.el6/include/linux/init_task.h
357357 @@ -123,6 +123,14 @@ extern struct cred init_cred;
358358 # define INIT_PERF_EVENTS(tsk)
359359 #endif
@@ -377,8 +377,8 @@
377377 }
378378
379379
380---- linux-2.6.32-504.23.4.el6.orig/include/linux/sched.h
381-+++ linux-2.6.32-504.23.4.el6/include/linux/sched.h
380+--- linux-2.6.32-504.30.3.el6.orig/include/linux/sched.h
381++++ linux-2.6.32-504.30.3.el6/include/linux/sched.h
382382 @@ -43,6 +43,8 @@
383383
384384 #ifdef __KERNEL__
@@ -399,8 +399,8 @@
399399 };
400400
401401 /* Future-safe accessor for struct task_struct's cpus_allowed. */
402---- linux-2.6.32-504.23.4.el6.orig/include/linux/security.h
403-+++ linux-2.6.32-504.23.4.el6/include/linux/security.h
402+--- linux-2.6.32-504.30.3.el6.orig/include/linux/security.h
403++++ linux-2.6.32-504.30.3.el6/include/linux/security.h
404404 @@ -35,6 +35,7 @@
405405 #include <linux/xfrm.h>
406406 #include <linux/gfp.h>
@@ -409,8 +409,8 @@
409409
410410 /* Maximum number of letters for an LSM name string */
411411 #define SECURITY_NAME_MAX 10
412---- linux-2.6.32-504.23.4.el6.orig/include/net/ip.h
413-+++ linux-2.6.32-504.23.4.el6/include/net/ip.h
412+--- linux-2.6.32-504.30.3.el6.orig/include/net/ip.h
413++++ linux-2.6.32-504.30.3.el6/include/net/ip.h
414414 @@ -33,6 +33,7 @@
415415 #endif
416416 #include <net/snmp.h>
@@ -428,8 +428,8 @@
428428 return test_bit(port, sysctl_local_reserved_ports);
429429 }
430430
431---- linux-2.6.32-504.23.4.el6.orig/kernel/compat.c
432-+++ linux-2.6.32-504.23.4.el6/kernel/compat.c
431+--- linux-2.6.32-504.30.3.el6.orig/kernel/compat.c
432++++ linux-2.6.32-504.30.3.el6/kernel/compat.c
433433 @@ -1005,6 +1005,8 @@ asmlinkage long compat_sys_stime(compat_
434434 err = security_settime(&tv, NULL);
435435 if (err)
@@ -439,8 +439,8 @@
439439
440440 do_settimeofday(&tv);
441441 return 0;
442---- linux-2.6.32-504.23.4.el6.orig/kernel/fork.c
443-+++ linux-2.6.32-504.23.4.el6/kernel/fork.c
442+--- linux-2.6.32-504.30.3.el6.orig/kernel/fork.c
443++++ linux-2.6.32-504.30.3.el6/kernel/fork.c
444444 @@ -176,6 +176,7 @@ void __put_task_struct(struct task_struc
445445 exit_creds(tsk);
446446 delayacct_tsk_free(tsk);
@@ -467,8 +467,8 @@
467467 bad_fork_cleanup_policy:
468468 perf_event_free_task(p);
469469 #ifdef CONFIG_NUMA
470---- linux-2.6.32-504.23.4.el6.orig/kernel/kexec.c
471-+++ linux-2.6.32-504.23.4.el6/kernel/kexec.c
470+--- linux-2.6.32-504.30.3.el6.orig/kernel/kexec.c
471++++ linux-2.6.32-504.30.3.el6/kernel/kexec.c
472472 @@ -40,6 +40,7 @@
473473 #include <asm/system.h>
474474 #include <asm/sections.h>
@@ -486,8 +486,8 @@
486486
487487 if (kexec_load_disabled)
488488 return -EPERM;
489---- linux-2.6.32-504.23.4.el6.orig/kernel/module.c
490-+++ linux-2.6.32-504.23.4.el6/kernel/module.c
489+--- linux-2.6.32-504.30.3.el6.orig/kernel/module.c
490++++ linux-2.6.32-504.30.3.el6/kernel/module.c
491491 @@ -56,6 +56,7 @@
492492 #include <linux/percpu.h>
493493 #include <linux/kmemleak.h>
@@ -514,8 +514,8 @@
514514
515515 /* Only one module load at a time, please */
516516 if (mutex_lock_interruptible(&module_mutex) != 0)
517---- linux-2.6.32-504.23.4.el6.orig/kernel/ptrace.c
518-+++ linux-2.6.32-504.23.4.el6/kernel/ptrace.c
517+--- linux-2.6.32-504.30.3.el6.orig/kernel/ptrace.c
518++++ linux-2.6.32-504.30.3.el6/kernel/ptrace.c
519519 @@ -195,6 +195,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
520520 {
521521 struct task_struct *child;
@@ -540,9 +540,9 @@
540540
541541 if (request == PTRACE_TRACEME) {
542542 ret = ptrace_traceme();
543---- linux-2.6.32-504.23.4.el6.orig/kernel/sched.c
544-+++ linux-2.6.32-504.23.4.el6/kernel/sched.c
545-@@ -6819,6 +6819,8 @@ int can_nice(const struct task_struct *p
543+--- linux-2.6.32-504.30.3.el6.orig/kernel/sched.c
544++++ linux-2.6.32-504.30.3.el6/kernel/sched.c
545+@@ -6826,6 +6826,8 @@ int can_nice(const struct task_struct *p
546546 SYSCALL_DEFINE1(nice, int, increment)
547547 {
548548 long nice, retval;
@@ -551,8 +551,8 @@
551551
552552 /*
553553 * Setpriority might change our priority at the same moment.
554---- linux-2.6.32-504.23.4.el6.orig/kernel/signal.c
555-+++ linux-2.6.32-504.23.4.el6/kernel/signal.c
554+--- linux-2.6.32-504.30.3.el6.orig/kernel/signal.c
555++++ linux-2.6.32-504.30.3.el6/kernel/signal.c
556556 @@ -2312,6 +2312,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
557557 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
558558 {
@@ -598,8 +598,8 @@
598598
599599 return do_send_specific(tgid, pid, sig, info);
600600 }
601---- linux-2.6.32-504.23.4.el6.orig/kernel/sys.c
602-+++ linux-2.6.32-504.23.4.el6/kernel/sys.c
601+--- linux-2.6.32-504.30.3.el6.orig/kernel/sys.c
602++++ linux-2.6.32-504.30.3.el6/kernel/sys.c
603603 @@ -157,6 +157,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
604604
605605 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -638,8 +638,8 @@
638638
639639 down_write(&uts_sem);
640640 errno = -EFAULT;
641---- linux-2.6.32-504.23.4.el6.orig/kernel/sysctl.c
642-+++ linux-2.6.32-504.23.4.el6/kernel/sysctl.c
641+--- linux-2.6.32-504.30.3.el6.orig/kernel/sysctl.c
642++++ linux-2.6.32-504.30.3.el6/kernel/sysctl.c
643643 @@ -2073,6 +2073,9 @@ int do_sysctl(int __user *name, int nlen
644644
645645 for (head = sysctl_head_next(NULL); head;
@@ -650,8 +650,8 @@
650650 error = parse_table(name, nlen, oldval, oldlenp,
651651 newval, newlen,
652652 head->root, head->ctl_table);
653---- linux-2.6.32-504.23.4.el6.orig/kernel/time.c
654-+++ linux-2.6.32-504.23.4.el6/kernel/time.c
653+--- linux-2.6.32-504.30.3.el6.orig/kernel/time.c
654++++ linux-2.6.32-504.30.3.el6/kernel/time.c
655655 @@ -92,6 +92,8 @@ SYSCALL_DEFINE1(stime, time_t __user *,
656656 err = security_settime(&tv, NULL);
657657 if (err)
@@ -670,8 +670,8 @@
670670
671671 if (tz) {
672672 /* SMP safe, global irq locking makes it work. */
673---- linux-2.6.32-504.23.4.el6.orig/kernel/time/ntp.c
674-+++ linux-2.6.32-504.23.4.el6/kernel/time/ntp.c
673+--- linux-2.6.32-504.30.3.el6.orig/kernel/time/ntp.c
674++++ linux-2.6.32-504.30.3.el6/kernel/time/ntp.c
675675 @@ -14,6 +14,7 @@
676676 #include <linux/timex.h>
677677 #include <linux/time.h>
@@ -696,8 +696,8 @@
696696
697697 /*
698698 * if the quartz is off by more than 10% then
699---- linux-2.6.32-504.23.4.el6.orig/net/ipv4/raw.c
700-+++ linux-2.6.32-504.23.4.el6/net/ipv4/raw.c
699+--- linux-2.6.32-504.30.3.el6.orig/net/ipv4/raw.c
700++++ linux-2.6.32-504.30.3.el6/net/ipv4/raw.c
701701 @@ -77,6 +77,7 @@
702702 #include <linux/seq_file.h>
703703 #include <linux/netfilter.h>
@@ -717,8 +717,8 @@
717717
718718 copied = skb->len;
719719 if (len < copied) {
720---- linux-2.6.32-504.23.4.el6.orig/net/ipv4/udp.c
721-+++ linux-2.6.32-504.23.4.el6/net/ipv4/udp.c
720+--- linux-2.6.32-504.30.3.el6.orig/net/ipv4/udp.c
721++++ linux-2.6.32-504.30.3.el6/net/ipv4/udp.c
722722 @@ -108,6 +108,7 @@
723723 #include <trace/events/udp.h>
724724 #include <net/busy_poll.h>
@@ -738,8 +738,8 @@
738738
739739 ulen = skb->len - sizeof(struct udphdr);
740740 copied = len;
741---- linux-2.6.32-504.23.4.el6.orig/net/ipv6/raw.c
742-+++ linux-2.6.32-504.23.4.el6/net/ipv6/raw.c
741+--- linux-2.6.32-504.30.3.el6.orig/net/ipv6/raw.c
742++++ linux-2.6.32-504.30.3.el6/net/ipv6/raw.c
743743 @@ -59,6 +59,7 @@
744744
745745 #include <linux/proc_fs.h>
@@ -759,8 +759,8 @@
759759
760760 copied = skb->len;
761761 if (copied > len) {
762---- linux-2.6.32-504.23.4.el6.orig/net/ipv6/udp.c
763-+++ linux-2.6.32-504.23.4.el6/net/ipv6/udp.c
762+--- linux-2.6.32-504.30.3.el6.orig/net/ipv6/udp.c
763++++ linux-2.6.32-504.30.3.el6/net/ipv6/udp.c
764764 @@ -50,6 +50,7 @@
765765 #include <linux/proc_fs.h>
766766 #include <linux/seq_file.h>
@@ -780,8 +780,8 @@
780780
781781 ulen = skb->len - sizeof(struct udphdr);
782782 copied = len;
783---- linux-2.6.32-504.23.4.el6.orig/net/socket.c
784-+++ linux-2.6.32-504.23.4.el6/net/socket.c
783+--- linux-2.6.32-504.30.3.el6.orig/net/socket.c
784++++ linux-2.6.32-504.30.3.el6/net/socket.c
785785 @@ -578,6 +578,8 @@ static inline int __sock_sendmsg(struct
786786 struct msghdr *msg, size_t size)
787787 {
@@ -842,8 +842,8 @@
842842 if (err)
843843 goto out_put;
844844
845---- linux-2.6.32-504.23.4.el6.orig/net/unix/af_unix.c
846-+++ linux-2.6.32-504.23.4.el6/net/unix/af_unix.c
845+--- linux-2.6.32-504.30.3.el6.orig/net/unix/af_unix.c
846++++ linux-2.6.32-504.30.3.el6/net/unix/af_unix.c
847847 @@ -866,6 +866,9 @@ static int unix_bind(struct socket *sock
848848 mode = S_IFSOCK |
849849 (SOCK_INODE(sock)->i_mode & ~current_umask());
@@ -865,8 +865,8 @@
865865 if (msg->msg_name)
866866 unix_copy_addr(msg, skb->sk);
867867
868---- linux-2.6.32-504.23.4.el6.orig/security/Kconfig
869-+++ linux-2.6.32-504.23.4.el6/security/Kconfig
868+--- linux-2.6.32-504.30.3.el6.orig/security/Kconfig
869++++ linux-2.6.32-504.30.3.el6/security/Kconfig
870870 @@ -177,5 +177,7 @@ source security/tomoyo/Kconfig
871871
872872 source security/integrity/ima/Kconfig
@@ -875,8 +875,8 @@
875875 +
876876 endmenu
877877
878---- linux-2.6.32-504.23.4.el6.orig/security/Makefile
879-+++ linux-2.6.32-504.23.4.el6/security/Makefile
878+--- linux-2.6.32-504.30.3.el6.orig/security/Makefile
879++++ linux-2.6.32-504.30.3.el6/security/Makefile
880880 @@ -25,3 +25,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
881881 # Object integrity file lists
882882 subdir-$(CONFIG_IMA) += integrity/ima
--- trunk/caitsith-patch/specs/build-c6-2.6.32.sh (revision 156)
+++ trunk/caitsith-patch/specs/build-c6-2.6.32.sh (revision 157)
@@ -10,12 +10,12 @@
1010
1111 cd /tmp/ || die "Can't chdir to /tmp/ ."
1212
13-if [ ! -r kernel-2.6.32-504.23.4.el6.src.rpm ]
13+if [ ! -r kernel-2.6.32-504.30.3.el6.src.rpm ]
1414 then
15- wget http://vault.centos.org/6.6/updates/Source/SPackages/kernel-2.6.32-504.23.4.el6.src.rpm || die "Can't download source package."
15+ wget http://vault.centos.org/6.6/updates/Source/SPackages/kernel-2.6.32-504.30.3.el6.src.rpm || die "Can't download source package."
1616 fi
17-LANG=C rpm --checksig kernel-2.6.32-504.23.4.el6.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature."
18-rpm -ivh kernel-2.6.32-504.23.4.el6.src.rpm || die "Can't install source package."
17+LANG=C rpm --checksig kernel-2.6.32-504.30.3.el6.src.rpm | grep -F ': rsa sha1 (md5) pgp md5 OK' || die "Can't verify signature."
18+rpm -ivh kernel-2.6.32-504.30.3.el6.src.rpm || die "Can't install source package."
1919
2020 cd /root/rpmbuild/SOURCES/ || die "Can't chdir to /root/rpmbuild/SOURCES/ ."
2121 if [ ! -r caitsith-patch-0.1-20150606.tar.gz ]
@@ -35,7 +35,7 @@
3535 -# % define buildid .local
3636 +%define buildid _caitsith_0.1
3737
38- %define distro_build 504.23.4
38+ %define distro_build 504.30.3
3939 %define signmodules 1
4040 @@ -437,7 +437,7 @@
4141 # Packages that need to be installed before the kernel is, because the %post
@@ -44,7 +44,7 @@
4444 -%define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, grubby >= 7.0.4-1
4545 +%define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, grubby >= 7.0.4-1
4646 %if %{with_dracut}
47- %define initrd_prereq dracut-kernel >= 002-18.git413bcf78
47+ %define initrd_prereq dracut-kernel >= 004-356.el6_6.3
4848 %else
4949 @@ -473,7 +473,7 @@
5050 AutoProv: yes\
--- trunk/caitsith-tools/kernel_test/caitsith_param_test.c (revision 156)
+++ trunk/caitsith-tools/kernel_test/caitsith_param_test.c (revision 157)
@@ -1232,9 +1232,12 @@
12321232
12331233 static void detach_init(void)
12341234 {
1235- ptrace(PTRACE_DETACH, 1, NULL, NULL);
1236- kill(1, SIGCONT);
1237- sleep(1);
1235+ int i;
1236+ for (i = 0; i < 2; i++) {
1237+ ptrace(PTRACE_DETACH, 1, NULL, NULL);
1238+ kill(1, SIGCONT);
1239+ sleep(1);
1240+ }
12381241 }
12391242
12401243 static void test_ptrace(void)
Show on old repository browser