SourceForge.JP -- Develop and Download Open Source Software

tomoyo 

Commit MetaInfo

Revision6103 (tree)
Time2012-07-14 20:56:45
Authorkumaneko

Log Message

(empty log message)

Change Summary

Diff

--- trunk/1.8.x/ccs-patch/patches/ccs-patch-3.2.diff (revision 6102)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-3.2.diff (revision 6103)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 3.2.22.
1+This is TOMOYO Linux patch for kernel 3.2.23.
22
3-Source code for this patch is http://www.kernel.org/pub/linux/kernel/v3.0/linux-3.2.22.tar.bz2
3+Source code for this patch is http://www.kernel.org/pub/linux/kernel/v3.0/linux-3.2.23.tar.bz2
44 ---
55 fs/exec.c | 2
66 fs/open.c | 2
@@ -28,8 +28,8 @@
2828 security/security.c | 134 +++++++++++++++++++++++++++++++++++++---------
2929 24 files changed, 247 insertions(+), 49 deletions(-)
3030
31---- linux-3.2.22.orig/fs/exec.c
32-+++ linux-3.2.22/fs/exec.c
31+--- linux-3.2.23.orig/fs/exec.c
32++++ linux-3.2.23/fs/exec.c
3333 @@ -1535,7 +1535,7 @@ static int do_execve_common(const char *
3434 if (retval < 0)
3535 goto out;
@@ -39,8 +39,8 @@
3939 if (retval < 0)
4040 goto out;
4141
42---- linux-3.2.22.orig/fs/open.c
43-+++ linux-3.2.22/fs/open.c
42+--- linux-3.2.23.orig/fs/open.c
43++++ linux-3.2.23/fs/open.c
4444 @@ -1106,6 +1106,8 @@ EXPORT_SYMBOL(sys_close);
4545 */
4646 SYSCALL_DEFINE0(vhangup)
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-3.2.22.orig/fs/proc/version.c
54-+++ linux-3.2.22/fs/proc/version.c
53+--- linux-3.2.23.orig/fs/proc/version.c
54++++ linux-3.2.23/fs/proc/version.c
5555 @@ -32,3 +32,10 @@ static int __init proc_version_init(void
5656 return 0;
5757 }
@@ -59,12 +59,12 @@
5959 +
6060 +static int __init ccs_show_version(void)
6161 +{
62-+ printk(KERN_INFO "Hook version: 3.2.22 2012/07/06\n");
62++ printk(KERN_INFO "Hook version: 3.2.23 2012/07/14\n");
6363 + return 0;
6464 +}
6565 +module_init(ccs_show_version);
66---- linux-3.2.22.orig/include/linux/init_task.h
67-+++ linux-3.2.22/include/linux/init_task.h
66+--- linux-3.2.23.orig/include/linux/init_task.h
67++++ linux-3.2.23/include/linux/init_task.h
6868 @@ -128,6 +128,14 @@ extern struct cred init_cred;
6969
7070 #define INIT_TASK_COMM "swapper"
@@ -88,8 +88,8 @@
8888 }
8989
9090
91---- linux-3.2.22.orig/include/linux/sched.h
92-+++ linux-3.2.22/include/linux/sched.h
91+--- linux-3.2.23.orig/include/linux/sched.h
92++++ linux-3.2.23/include/linux/sched.h
9393 @@ -44,6 +44,8 @@
9494
9595 #ifdef __KERNEL__
@@ -110,8 +110,8 @@
110110 };
111111
112112 /* Future-safe accessor for struct task_struct's cpus_allowed. */
113---- linux-3.2.22.orig/include/linux/security.h
114-+++ linux-3.2.22/include/linux/security.h
113+--- linux-3.2.23.orig/include/linux/security.h
114++++ linux-3.2.23/include/linux/security.h
115115 @@ -38,6 +38,7 @@
116116 #include <linux/slab.h>
117117 #include <linux/xattr.h>
@@ -310,8 +310,8 @@
310310 }
311311 #endif /* CONFIG_SECURITY_PATH */
312312
313---- linux-3.2.22.orig/include/net/ip.h
314-+++ linux-3.2.22/include/net/ip.h
313+--- linux-3.2.23.orig/include/net/ip.h
314++++ linux-3.2.23/include/net/ip.h
315315 @@ -217,6 +217,8 @@ extern void inet_get_local_port_range(in
316316 extern unsigned long *sysctl_local_reserved_ports;
317317 static inline int inet_is_reserved_local_port(int port)
@@ -321,8 +321,8 @@
321321 return test_bit(port, sysctl_local_reserved_ports);
322322 }
323323
324---- linux-3.2.22.orig/kernel/fork.c
325-+++ linux-3.2.22/kernel/fork.c
324+--- linux-3.2.23.orig/kernel/fork.c
325++++ linux-3.2.23/kernel/fork.c
326326 @@ -195,6 +195,7 @@ void __put_task_struct(struct task_struc
327327 delayacct_tsk_free(tsk);
328328 put_signal_struct(tsk->signal);
@@ -349,8 +349,8 @@
349349 bad_fork_cleanup_policy:
350350 perf_event_free_task(p);
351351 #ifdef CONFIG_NUMA
352---- linux-3.2.22.orig/kernel/kexec.c
353-+++ linux-3.2.22/kernel/kexec.c
352+--- linux-3.2.23.orig/kernel/kexec.c
353++++ linux-3.2.23/kernel/kexec.c
354354 @@ -40,6 +40,7 @@
355355 #include <asm/io.h>
356356 #include <asm/system.h>
@@ -368,8 +368,8 @@
368368
369369 /*
370370 * Verify we have a legal set of flags
371---- linux-3.2.22.orig/kernel/module.c
372-+++ linux-3.2.22/kernel/module.c
371+--- linux-3.2.23.orig/kernel/module.c
372++++ linux-3.2.23/kernel/module.c
373373 @@ -58,6 +58,7 @@
374374 #include <linux/jump_label.h>
375375 #include <linux/pfn.h>
@@ -396,8 +396,8 @@
396396
397397 /* Do all the hard work */
398398 mod = load_module(umod, len, uargs);
399---- linux-3.2.22.orig/kernel/ptrace.c
400-+++ linux-3.2.22/kernel/ptrace.c
399+--- linux-3.2.23.orig/kernel/ptrace.c
400++++ linux-3.2.23/kernel/ptrace.c
401401 @@ -868,6 +868,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
402402 {
403403 struct task_struct *child;
@@ -422,8 +422,8 @@
422422
423423 if (request == PTRACE_TRACEME) {
424424 ret = ptrace_traceme();
425---- linux-3.2.22.orig/kernel/sched.c
426-+++ linux-3.2.22/kernel/sched.c
425+--- linux-3.2.23.orig/kernel/sched.c
426++++ linux-3.2.23/kernel/sched.c
427427 @@ -5113,6 +5113,8 @@ int can_nice(const struct task_struct *p
428428 SYSCALL_DEFINE1(nice, int, increment)
429429 {
@@ -433,8 +433,8 @@
433433
434434 /*
435435 * Setpriority might change our priority at the same moment.
436---- linux-3.2.22.orig/kernel/signal.c
437-+++ linux-3.2.22/kernel/signal.c
436+--- linux-3.2.23.orig/kernel/signal.c
437++++ linux-3.2.23/kernel/signal.c
438438 @@ -2746,6 +2746,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
439439 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
440440 {
@@ -480,8 +480,8 @@
480480
481481 return do_send_specific(tgid, pid, sig, info);
482482 }
483---- linux-3.2.22.orig/kernel/sys.c
484-+++ linux-3.2.22/kernel/sys.c
483+--- linux-3.2.23.orig/kernel/sys.c
484++++ linux-3.2.23/kernel/sys.c
485485 @@ -180,6 +180,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
486486
487487 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -520,8 +520,8 @@
520520
521521 down_write(&uts_sem);
522522 errno = -EFAULT;
523---- linux-3.2.22.orig/kernel/time/ntp.c
524-+++ linux-3.2.22/kernel/time/ntp.c
523+--- linux-3.2.23.orig/kernel/time/ntp.c
524++++ linux-3.2.23/kernel/time/ntp.c
525525 @@ -15,6 +15,7 @@
526526 #include <linux/time.h>
527527 #include <linux/mm.h>
@@ -555,8 +555,8 @@
555555 if (!(txc->modes & ADJ_NANO))
556556 delta.tv_nsec *= 1000;
557557 result = timekeeping_inject_offset(&delta);
558---- linux-3.2.22.orig/net/ipv4/raw.c
559-+++ linux-3.2.22/net/ipv4/raw.c
558+--- linux-3.2.23.orig/net/ipv4/raw.c
559++++ linux-3.2.23/net/ipv4/raw.c
560560 @@ -695,6 +695,10 @@ static int raw_recvmsg(struct kiocb *ioc
561561 skb = skb_recv_datagram(sk, flags, noblock, &err);
562562 if (!skb)
@@ -568,8 +568,8 @@
568568
569569 copied = skb->len;
570570 if (len < copied) {
571---- linux-3.2.22.orig/net/ipv4/udp.c
572-+++ linux-3.2.22/net/ipv4/udp.c
571+--- linux-3.2.23.orig/net/ipv4/udp.c
572++++ linux-3.2.23/net/ipv4/udp.c
573573 @@ -1184,6 +1184,10 @@ try_again:
574574 &peeked, &err);
575575 if (!skb)
@@ -581,8 +581,8 @@
581581
582582 ulen = skb->len - sizeof(struct udphdr);
583583 copied = len;
584---- linux-3.2.22.orig/net/ipv6/raw.c
585-+++ linux-3.2.22/net/ipv6/raw.c
584+--- linux-3.2.23.orig/net/ipv6/raw.c
585++++ linux-3.2.23/net/ipv6/raw.c
586586 @@ -469,6 +469,10 @@ static int rawv6_recvmsg(struct kiocb *i
587587 skb = skb_recv_datagram(sk, flags, noblock, &err);
588588 if (!skb)
@@ -594,8 +594,8 @@
594594
595595 copied = skb->len;
596596 if (copied > len) {
597---- linux-3.2.22.orig/net/ipv6/udp.c
598-+++ linux-3.2.22/net/ipv6/udp.c
597+--- linux-3.2.23.orig/net/ipv6/udp.c
598++++ linux-3.2.23/net/ipv6/udp.c
599599 @@ -361,6 +361,10 @@ try_again:
600600 &peeked, &err);
601601 if (!skb)
@@ -607,8 +607,8 @@
607607
608608 ulen = skb->len - sizeof(struct udphdr);
609609 copied = len;
610---- linux-3.2.22.orig/net/socket.c
611-+++ linux-3.2.22/net/socket.c
610+--- linux-3.2.23.orig/net/socket.c
611++++ linux-3.2.23/net/socket.c
612612 @@ -1530,6 +1530,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
613613 if (err < 0)
614614 goto out_fd;
@@ -620,8 +620,8 @@
620620 if (upeer_sockaddr) {
621621 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
622622 &len, 2) < 0) {
623---- linux-3.2.22.orig/net/unix/af_unix.c
624-+++ linux-3.2.22/net/unix/af_unix.c
623+--- linux-3.2.23.orig/net/unix/af_unix.c
624++++ linux-3.2.23/net/unix/af_unix.c
625625 @@ -1780,6 +1780,10 @@ static int unix_dgram_recvmsg(struct kio
626626 wake_up_interruptible_sync_poll(&u->peer_wait,
627627 POLLOUT | POLLWRNORM | POLLWRBAND);
@@ -633,8 +633,8 @@
633633 if (msg->msg_name)
634634 unix_copy_addr(msg, skb->sk);
635635
636---- linux-3.2.22.orig/security/Kconfig
637-+++ linux-3.2.22/security/Kconfig
636+--- linux-3.2.23.orig/security/Kconfig
637++++ linux-3.2.23/security/Kconfig
638638 @@ -227,5 +227,7 @@ config DEFAULT_SECURITY
639639 default "apparmor" if DEFAULT_SECURITY_APPARMOR
640640 default "" if DEFAULT_SECURITY_DAC
@@ -643,8 +643,8 @@
643643 +
644644 endmenu
645645
646---- linux-3.2.22.orig/security/Makefile
647-+++ linux-3.2.22/security/Makefile
646+--- linux-3.2.23.orig/security/Makefile
647++++ linux-3.2.23/security/Makefile
648648 @@ -26,3 +26,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
649649 # Object integrity file lists
650650 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -652,8 +652,8 @@
652652 +
653653 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
654654 +obj-$(CONFIG_CCSECURITY) += ccsecurity/built-in.o
655---- linux-3.2.22.orig/security/security.c
656-+++ linux-3.2.22/security/security.c
655+--- linux-3.2.23.orig/security/security.c
656++++ linux-3.2.23/security/security.c
657657 @@ -203,7 +203,10 @@ int security_syslog(int type)
658658
659659 int security_settime(const struct timespec *ts, const struct timezone *tz)
旧リポジトリブラウザで表示