Develop and Download Open Source Software

CaitSith

Browse Subversion Repository

/[caitsith]/trunk/caitsith-patch/patches/ccs-patch-3.10-centos-7.diff

Diff of /trunk/caitsith-patch/patches/ccs-patch-3.10-centos-7.diff

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 278 by kumaneko, Mon May 6 10:56:51 2019 UTC revision 279 by kumaneko, Sun Jun 30 06:41:45 2019 UTC
# Line 1  Line 1 
1  This is TOMOYO Linux patch for CentOS 7.  This is TOMOYO Linux patch for CentOS 7.
2    
3  Source code for this patch is http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-957.12.1.el7.src.rpm  Source code for this patch is http://vault.centos.org/centos/7/updates/Source/SPackages/kernel-3.10.0-957.21.3.el7.src.rpm
4  ---  ---
5   fs/exec.c                 |    2   fs/exec.c                 |    2
6   fs/open.c                 |    2   fs/open.c                 |    2
# Line 28  Source code for this patch is http://vau Line 28  Source code for this patch is http://vau
28   security/security.c       |  111 +++++++++++++++++++++++++++++++++++++++++-----   security/security.c       |  111 +++++++++++++++++++++++++++++++++++++++++-----
29   24 files changed, 248 insertions(+), 37 deletions(-)   24 files changed, 248 insertions(+), 37 deletions(-)
30    
31  --- linux-3.10.0-957.12.1.el7.orig/fs/exec.c  --- linux-3.10.0-957.21.3.el7.orig/fs/exec.c
32  +++ linux-3.10.0-957.12.1.el7/fs/exec.c  +++ linux-3.10.0-957.21.3.el7/fs/exec.c
33  @@ -1507,7 +1507,7 @@ static int exec_binprm(struct linux_binp  @@ -1507,7 +1507,7 @@ static int exec_binprm(struct linux_binp
34          old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));          old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
35          rcu_read_unlock();          rcu_read_unlock();
# Line 39  Source code for this patch is http://vau Line 39  Source code for this patch is http://vau
39          if (ret >= 0) {          if (ret >= 0) {
40                  audit_bprm(bprm);                  audit_bprm(bprm);
41                  trace_sched_process_exec(current, old_pid, bprm);                  trace_sched_process_exec(current, old_pid, bprm);
42  --- linux-3.10.0-957.12.1.el7.orig/fs/open.c  --- linux-3.10.0-957.21.3.el7.orig/fs/open.c
43  +++ linux-3.10.0-957.12.1.el7/fs/open.c  +++ linux-3.10.0-957.21.3.el7/fs/open.c
44  @@ -1142,6 +1142,8 @@ EXPORT_SYMBOL(sys_close);  @@ -1142,6 +1142,8 @@ EXPORT_SYMBOL(sys_close);
45    */    */
46   SYSCALL_DEFINE0(vhangup)   SYSCALL_DEFINE0(vhangup)
# Line 50  Source code for this patch is http://vau Line 50  Source code for this patch is http://vau
50          if (capable(CAP_SYS_TTY_CONFIG)) {          if (capable(CAP_SYS_TTY_CONFIG)) {
51                  tty_vhangup_self();                  tty_vhangup_self();
52                  return 0;                  return 0;
53  --- linux-3.10.0-957.12.1.el7.orig/fs/proc/version.c  --- linux-3.10.0-957.21.3.el7.orig/fs/proc/version.c
54  +++ linux-3.10.0-957.12.1.el7/fs/proc/version.c  +++ linux-3.10.0-957.21.3.el7/fs/proc/version.c
55  @@ -32,3 +32,10 @@ static int __init proc_version_init(void  @@ -32,3 +32,10 @@ static int __init proc_version_init(void
56          return 0;          return 0;
57   }   }
# Line 59  Source code for this patch is http://vau Line 59  Source code for this patch is http://vau
59  +  +
60  +static int __init ccs_show_version(void)  +static int __init ccs_show_version(void)
61  +{  +{
62  +       printk(KERN_INFO "Hook version: 3.10.0-957.12.1.el7 2019/04/30\n");  +       printk(KERN_INFO "Hook version: 3.10.0-957.21.3.el7 2019/06/19\n");
63  +       return 0;  +       return 0;
64  +}  +}
65  +module_init(ccs_show_version);  +module_init(ccs_show_version);
66  --- linux-3.10.0-957.12.1.el7.orig/include/linux/init_task.h  --- linux-3.10.0-957.21.3.el7.orig/include/linux/init_task.h
67  +++ linux-3.10.0-957.12.1.el7/include/linux/init_task.h  +++ linux-3.10.0-957.21.3.el7/include/linux/init_task.h
68  @@ -173,6 +173,14 @@ extern struct task_group root_task_group  @@ -173,6 +173,14 @@ extern struct task_group root_task_group
69   # define INIT_RT_MUTEXES(tsk)   # define INIT_RT_MUTEXES(tsk)
70   #endif   #endif
# Line 88  Source code for this patch is http://vau Line 88  Source code for this patch is http://vau
88   }   }
89    
90    
91  --- linux-3.10.0-957.12.1.el7.orig/include/linux/sched.h  --- linux-3.10.0-957.21.3.el7.orig/include/linux/sched.h
92  +++ linux-3.10.0-957.12.1.el7/include/linux/sched.h  +++ linux-3.10.0-957.21.3.el7/include/linux/sched.h
93  @@ -4,6 +4,8 @@  @@ -4,6 +4,8 @@
94   #include <uapi/linux/sched.h>   #include <uapi/linux/sched.h>
95   #include <linux/rh_kabi.h>   #include <linux/rh_kabi.h>
# Line 110  Source code for this patch is http://vau Line 110  Source code for this patch is http://vau
110   };   };
111    
112   /* Future-safe accessor for struct task_struct's cpus_allowed. */   /* Future-safe accessor for struct task_struct's cpus_allowed. */
113  --- linux-3.10.0-957.12.1.el7.orig/include/linux/security.h  --- linux-3.10.0-957.21.3.el7.orig/include/linux/security.h
114  +++ linux-3.10.0-957.12.1.el7/include/linux/security.h  +++ linux-3.10.0-957.21.3.el7/include/linux/security.h
115  @@ -56,6 +56,7 @@ struct msg_queue;  @@ -56,6 +56,7 @@ struct msg_queue;
116   struct xattr;   struct xattr;
117   struct xfrm_sec_ctx;   struct xfrm_sec_ctx;
# Line 323  Source code for this patch is http://vau Line 323  Source code for this patch is http://vau
323   }   }
324   #endif /* CONFIG_SECURITY_PATH */   #endif /* CONFIG_SECURITY_PATH */
325    
326  --- linux-3.10.0-957.12.1.el7.orig/include/net/ip.h  --- linux-3.10.0-957.21.3.el7.orig/include/net/ip.h
327  +++ linux-3.10.0-957.12.1.el7/include/net/ip.h  +++ linux-3.10.0-957.21.3.el7/include/net/ip.h
328  @@ -232,6 +232,8 @@ void inet_get_local_port_range(struct ne  @@ -232,6 +232,8 @@ void inet_get_local_port_range(struct ne
329   extern unsigned long *sysctl_local_reserved_ports;   extern unsigned long *sysctl_local_reserved_ports;
330   static inline int inet_is_reserved_local_port(int port)   static inline int inet_is_reserved_local_port(int port)
# Line 334  Source code for this patch is http://vau Line 334  Source code for this patch is http://vau
334          return test_bit(port, sysctl_local_reserved_ports);          return test_bit(port, sysctl_local_reserved_ports);
335   }   }
336    
337  --- linux-3.10.0-957.12.1.el7.orig/kernel/fork.c  --- linux-3.10.0-957.21.3.el7.orig/kernel/fork.c
338  +++ linux-3.10.0-957.12.1.el7/kernel/fork.c  +++ linux-3.10.0-957.21.3.el7/kernel/fork.c
339  @@ -278,6 +278,7 @@ void __put_task_struct(struct task_struc  @@ -278,6 +278,7 @@ void __put_task_struct(struct task_struc
340          delayacct_tsk_free(tsk);          delayacct_tsk_free(tsk);
341          put_signal_struct(tsk->signal);          put_signal_struct(tsk->signal);
# Line 362  Source code for this patch is http://vau Line 362  Source code for this patch is http://vau
362   bad_fork_cleanup_perf:   bad_fork_cleanup_perf:
363          perf_event_free_task(p);          perf_event_free_task(p);
364   bad_fork_cleanup_policy:   bad_fork_cleanup_policy:
365  --- linux-3.10.0-957.12.1.el7.orig/kernel/kexec.c  --- linux-3.10.0-957.21.3.el7.orig/kernel/kexec.c
366  +++ linux-3.10.0-957.12.1.el7/kernel/kexec.c  +++ linux-3.10.0-957.21.3.el7/kernel/kexec.c
367  @@ -190,6 +190,8 @@ SYSCALL_DEFINE4(kexec_load, unsigned lon  @@ -190,6 +190,8 @@ SYSCALL_DEFINE4(kexec_load, unsigned lon
368          /* We only trust the superuser with rebooting the system. */          /* We only trust the superuser with rebooting the system. */
369          if (!capable(CAP_SYS_BOOT) || kexec_load_disabled)          if (!capable(CAP_SYS_BOOT) || kexec_load_disabled)
# Line 373  Source code for this patch is http://vau Line 373  Source code for this patch is http://vau
373    
374          if (get_securelevel() > 0)          if (get_securelevel() > 0)
375                  return -EPERM;                  return -EPERM;
376  --- linux-3.10.0-957.12.1.el7.orig/kernel/module.c  --- linux-3.10.0-957.21.3.el7.orig/kernel/module.c
377  +++ linux-3.10.0-957.12.1.el7/kernel/module.c  +++ linux-3.10.0-957.21.3.el7/kernel/module.c
378  @@ -66,6 +66,7 @@  @@ -66,6 +66,7 @@
379   #endif /* __GENKSYMS__ */   #endif /* __GENKSYMS__ */
380   #include <uapi/linux/module.h>   #include <uapi/linux/module.h>
# Line 401  Source code for this patch is http://vau Line 401  Source code for this patch is http://vau
401    
402          return 0;          return 0;
403   }   }
404  --- linux-3.10.0-957.12.1.el7.orig/kernel/ptrace.c  --- linux-3.10.0-957.21.3.el7.orig/kernel/ptrace.c
405  +++ linux-3.10.0-957.12.1.el7/kernel/ptrace.c  +++ linux-3.10.0-957.21.3.el7/kernel/ptrace.c
406  @@ -1082,6 +1082,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l  @@ -1082,6 +1082,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
407   {   {
408          struct task_struct *child;          struct task_struct *child;
# Line 427  Source code for this patch is http://vau Line 427  Source code for this patch is http://vau
427    
428          if (request == PTRACE_TRACEME) {          if (request == PTRACE_TRACEME) {
429                  ret = ptrace_traceme();                  ret = ptrace_traceme();
430  --- linux-3.10.0-957.12.1.el7.orig/kernel/sched/core.c  --- linux-3.10.0-957.21.3.el7.orig/kernel/sched/core.c
431  +++ linux-3.10.0-957.12.1.el7/kernel/sched/core.c  +++ linux-3.10.0-957.21.3.el7/kernel/sched/core.c
432  @@ -4355,6 +4355,8 @@ int can_nice(const struct task_struct *p  @@ -4355,6 +4355,8 @@ int can_nice(const struct task_struct *p
433   SYSCALL_DEFINE1(nice, int, increment)   SYSCALL_DEFINE1(nice, int, increment)
434   {   {
# Line 438  Source code for this patch is http://vau Line 438  Source code for this patch is http://vau
438    
439          /*          /*
440           * Setpriority might change our priority at the same moment.           * Setpriority might change our priority at the same moment.
441  --- linux-3.10.0-957.12.1.el7.orig/kernel/signal.c  --- linux-3.10.0-957.21.3.el7.orig/kernel/signal.c
442  +++ linux-3.10.0-957.12.1.el7/kernel/signal.c  +++ linux-3.10.0-957.21.3.el7/kernel/signal.c
443  @@ -2942,6 +2942,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s  @@ -2942,6 +2942,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
444   SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)   SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
445   {   {
# Line 485  Source code for this patch is http://vau Line 485  Source code for this patch is http://vau
485    
486          return do_send_specific(tgid, pid, sig, info);          return do_send_specific(tgid, pid, sig, info);
487   }   }
488  --- linux-3.10.0-957.12.1.el7.orig/kernel/sys.c  --- linux-3.10.0-957.21.3.el7.orig/kernel/sys.c
489  +++ linux-3.10.0-957.12.1.el7/kernel/sys.c  +++ linux-3.10.0-957.21.3.el7/kernel/sys.c
490  @@ -197,6 +197,10 @@ SYSCALL_DEFINE3(setpriority, int, which,  @@ -197,6 +197,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
491    
492          if (which > PRIO_USER || which < PRIO_PROCESS)          if (which > PRIO_USER || which < PRIO_PROCESS)
# Line 525  Source code for this patch is http://vau Line 525  Source code for this patch is http://vau
525    
526          down_write(&uts_sem);          down_write(&uts_sem);
527          errno = -EFAULT;          errno = -EFAULT;
528  --- linux-3.10.0-957.12.1.el7.orig/kernel/time/ntp.c  --- linux-3.10.0-957.21.3.el7.orig/kernel/time/ntp.c
529  +++ linux-3.10.0-957.12.1.el7/kernel/time/ntp.c  +++ linux-3.10.0-957.21.3.el7/kernel/time/ntp.c
530  @@ -16,6 +16,7 @@  @@ -16,6 +16,7 @@
531   #include <linux/mm.h>   #include <linux/mm.h>
532   #include <linux/module.h>   #include <linux/module.h>
# Line 560  Source code for this patch is http://vau Line 560  Source code for this patch is http://vau
560    
561          return 0;          return 0;
562   }   }
563  --- linux-3.10.0-957.12.1.el7.orig/net/ipv4/raw.c  --- linux-3.10.0-957.21.3.el7.orig/net/ipv4/raw.c
564  +++ linux-3.10.0-957.12.1.el7/net/ipv4/raw.c  +++ linux-3.10.0-957.21.3.el7/net/ipv4/raw.c
565  @@ -706,6 +706,10 @@ static int raw_recvmsg(struct kiocb *ioc  @@ -706,6 +706,10 @@ static int raw_recvmsg(struct kiocb *ioc
566          skb = skb_recv_datagram(sk, flags, noblock, &err);          skb = skb_recv_datagram(sk, flags, noblock, &err);
567          if (!skb)          if (!skb)
# Line 573  Source code for this patch is http://vau Line 573  Source code for this patch is http://vau
573    
574          copied = skb->len;          copied = skb->len;
575          if (len < copied) {          if (len < copied) {
576  --- linux-3.10.0-957.12.1.el7.orig/net/ipv4/udp.c  --- linux-3.10.0-957.21.3.el7.orig/net/ipv4/udp.c
577  +++ linux-3.10.0-957.12.1.el7/net/ipv4/udp.c  +++ linux-3.10.0-957.21.3.el7/net/ipv4/udp.c
578  @@ -1393,6 +1393,10 @@ try_again:  @@ -1393,6 +1393,10 @@ try_again:
579          skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);          skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
580          if (!skb)          if (!skb)
# Line 586  Source code for this patch is http://vau Line 586  Source code for this patch is http://vau
586    
587          ulen = skb->len - sizeof(struct udphdr);          ulen = skb->len - sizeof(struct udphdr);
588          copied = len;          copied = len;
589  --- linux-3.10.0-957.12.1.el7.orig/net/ipv6/raw.c  --- linux-3.10.0-957.21.3.el7.orig/net/ipv6/raw.c
590  +++ linux-3.10.0-957.12.1.el7/net/ipv6/raw.c  +++ linux-3.10.0-957.21.3.el7/net/ipv6/raw.c
591  @@ -468,6 +468,10 @@ static int rawv6_recvmsg(struct kiocb *i  @@ -468,6 +468,10 @@ static int rawv6_recvmsg(struct kiocb *i
592          skb = skb_recv_datagram(sk, flags, noblock, &err);          skb = skb_recv_datagram(sk, flags, noblock, &err);
593          if (!skb)          if (!skb)
# Line 599  Source code for this patch is http://vau Line 599  Source code for this patch is http://vau
599    
600          copied = skb->len;          copied = skb->len;
601          if (copied > len) {          if (copied > len) {
602  --- linux-3.10.0-957.12.1.el7.orig/net/ipv6/udp.c  --- linux-3.10.0-957.21.3.el7.orig/net/ipv6/udp.c
603  +++ linux-3.10.0-957.12.1.el7/net/ipv6/udp.c  +++ linux-3.10.0-957.21.3.el7/net/ipv6/udp.c
604  @@ -384,6 +384,10 @@ try_again:  @@ -384,6 +384,10 @@ try_again:
605          skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);          skb = __skb_recv_udp(sk, flags, noblock, &peeked, &off, &err);
606          if (!skb)          if (!skb)
# Line 612  Source code for this patch is http://vau Line 612  Source code for this patch is http://vau
612    
613          ulen = skb->len - sizeof(struct udphdr);          ulen = skb->len - sizeof(struct udphdr);
614          copied = len;          copied = len;
615  --- linux-3.10.0-957.12.1.el7.orig/net/socket.c  --- linux-3.10.0-957.21.3.el7.orig/net/socket.c
616  +++ linux-3.10.0-957.12.1.el7/net/socket.c  +++ linux-3.10.0-957.21.3.el7/net/socket.c
617  @@ -1660,6 +1660,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct  @@ -1660,6 +1660,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
618          if (err < 0)          if (err < 0)
619                  goto out_fd;                  goto out_fd;
# Line 625  Source code for this patch is http://vau Line 625  Source code for this patch is http://vau
625          if (upeer_sockaddr) {          if (upeer_sockaddr) {
626                  if (newsock->ops->getname(newsock, (struct sockaddr *)&address,                  if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
627                                            &len, 2) < 0) {                                            &len, 2) < 0) {
628  --- linux-3.10.0-957.12.1.el7.orig/net/unix/af_unix.c  --- linux-3.10.0-957.21.3.el7.orig/net/unix/af_unix.c
629  +++ linux-3.10.0-957.12.1.el7/net/unix/af_unix.c  +++ linux-3.10.0-957.21.3.el7/net/unix/af_unix.c
630  @@ -2137,6 +2137,10 @@ static int unix_dgram_recvmsg(struct kio  @@ -2137,6 +2137,10 @@ static int unix_dgram_recvmsg(struct kio
631          wake_up_interruptible_sync_poll(&u->peer_wait,          wake_up_interruptible_sync_poll(&u->peer_wait,
632                                          POLLOUT | POLLWRNORM | POLLWRBAND);                                          POLLOUT | POLLWRNORM | POLLWRBAND);
# Line 638  Source code for this patch is http://vau Line 638  Source code for this patch is http://vau
638          if (msg->msg_name)          if (msg->msg_name)
639                  unix_copy_addr(msg, skb->sk);                  unix_copy_addr(msg, skb->sk);
640    
641  --- linux-3.10.0-957.12.1.el7.orig/security/Kconfig  --- linux-3.10.0-957.21.3.el7.orig/security/Kconfig
642  +++ linux-3.10.0-957.12.1.el7/security/Kconfig  +++ linux-3.10.0-957.21.3.el7/security/Kconfig
643  @@ -226,5 +226,7 @@ config DEFAULT_SECURITY  @@ -226,5 +226,7 @@ config DEFAULT_SECURITY
644          default "yama" if DEFAULT_SECURITY_YAMA          default "yama" if DEFAULT_SECURITY_YAMA
645          default "" if DEFAULT_SECURITY_DAC          default "" if DEFAULT_SECURITY_DAC
# Line 648  Source code for this patch is http://vau Line 648  Source code for this patch is http://vau
648  +  +
649   endmenu   endmenu
650    
651  --- linux-3.10.0-957.12.1.el7.orig/security/Makefile  --- linux-3.10.0-957.21.3.el7.orig/security/Makefile
652  +++ linux-3.10.0-957.12.1.el7/security/Makefile  +++ linux-3.10.0-957.21.3.el7/security/Makefile
653  @@ -29,3 +29,6 @@ obj-$(CONFIG_CGROUP_DEVICE)           += device_c  @@ -29,3 +29,6 @@ obj-$(CONFIG_CGROUP_DEVICE)           += device_c
654   # Object integrity file lists   # Object integrity file lists
655   subdir-$(CONFIG_INTEGRITY)             += integrity   subdir-$(CONFIG_INTEGRITY)             += integrity
# Line 657  Source code for this patch is http://vau Line 657  Source code for this patch is http://vau
657  +  +
658  +subdir-$(CONFIG_CCSECURITY)            += ccsecurity  +subdir-$(CONFIG_CCSECURITY)            += ccsecurity
659  +obj-$(CONFIG_CCSECURITY)               += ccsecurity/built-in.o  +obj-$(CONFIG_CCSECURITY)               += ccsecurity/built-in.o
660  --- linux-3.10.0-957.12.1.el7.orig/security/security.c  --- linux-3.10.0-957.21.3.el7.orig/security/security.c
661  +++ linux-3.10.0-957.12.1.el7/security/security.c  +++ linux-3.10.0-957.21.3.el7/security/security.c
662  @@ -229,7 +229,10 @@ int security_syslog(int type)  @@ -229,7 +229,10 @@ int security_syslog(int type)
663    
664   int security_settime(const struct timespec *ts, const struct timezone *tz)   int security_settime(const struct timespec *ts, const struct timezone *tz)
# Line 702  Source code for this patch is http://vau Line 702  Source code for this patch is http://vau
702   }   }
703    
704   int security_sb_set_mnt_opts(struct super_block *sb,   int security_sb_set_mnt_opts(struct super_block *sb,
705  @@ -427,31 +440,47 @@ EXPORT_SYMBOL(security_old_inode_init_se  @@ -425,31 +438,47 @@ EXPORT_SYMBOL(security_old_inode_init_se
706   int security_path_mknod(struct path *dir, struct dentry *dentry, umode_t mode,   int security_path_mknod(struct path *dir, struct dentry *dentry, umode_t mode,
707                          unsigned int dev)                          unsigned int dev)
708   {   {
# Line 750  Source code for this patch is http://vau Line 750  Source code for this patch is http://vau
750          return security_ops->path_unlink(dir, dentry);          return security_ops->path_unlink(dir, dentry);
751   }   }
752   EXPORT_SYMBOL(security_path_unlink);   EXPORT_SYMBOL(security_path_unlink);
753  @@ -459,16 +488,24 @@ EXPORT_SYMBOL(security_path_unlink);  @@ -457,16 +486,24 @@ EXPORT_SYMBOL(security_path_unlink);
754   int security_path_symlink(struct path *dir, struct dentry *dentry,   int security_path_symlink(struct path *dir, struct dentry *dentry,
755                            const char *old_name)                            const char *old_name)
756   {   {
# Line 775  Source code for this patch is http://vau Line 775  Source code for this patch is http://vau
775          return security_ops->path_link(old_dentry, new_dir, new_dentry);          return security_ops->path_link(old_dentry, new_dir, new_dentry);
776   }   }
777    
778  @@ -476,6 +513,7 @@ int security_path_rename(struct path *ol  @@ -474,6 +511,7 @@ int security_path_rename(struct path *ol
779                           struct path *new_dir, struct dentry *new_dentry,                           struct path *new_dir, struct dentry *new_dentry,
780                           unsigned int flags)                           unsigned int flags)
781   {   {
# Line 783  Source code for this patch is http://vau Line 783  Source code for this patch is http://vau
783          if (unlikely(IS_PRIVATE(old_dentry->d_inode) ||          if (unlikely(IS_PRIVATE(old_dentry->d_inode) ||
784                       (new_dentry->d_inode && IS_PRIVATE(new_dentry->d_inode))))                       (new_dentry->d_inode && IS_PRIVATE(new_dentry->d_inode))))
785                  return 0;                  return 0;
786  @@ -485,8 +523,15 @@ int security_path_rename(struct path *ol  @@ -483,8 +521,15 @@ int security_path_rename(struct path *ol
787                                                      old_dir, old_dentry);                                                      old_dir, old_dentry);
788                  if (err)                  if (err)
789                          return err;                          return err;
# Line 799  Source code for this patch is http://vau Line 799  Source code for this patch is http://vau
799          return security_ops->path_rename(old_dir, old_dentry, new_dir,          return security_ops->path_rename(old_dir, old_dentry, new_dir,
800                                           new_dentry);                                           new_dentry);
801   }   }
802  @@ -494,27 +539,42 @@ EXPORT_SYMBOL(security_path_rename);  @@ -492,27 +537,42 @@ EXPORT_SYMBOL(security_path_rename);
803    
804   int security_path_truncate(struct path *path)   int security_path_truncate(struct path *path)
805   {   {
# Line 842  Source code for this patch is http://vau Line 842  Source code for this patch is http://vau
842          return security_ops->path_chroot(path);          return security_ops->path_chroot(path);
843   }   }
844   #endif   #endif
845  @@ -627,9 +687,13 @@ EXPORT_SYMBOL_GPL(security_inode_setattr  @@ -625,9 +685,13 @@ EXPORT_SYMBOL_GPL(security_inode_setattr
846    
847   int security_inode_getattr(struct vfsmount *mnt, struct dentry *dentry)   int security_inode_getattr(struct vfsmount *mnt, struct dentry *dentry)
848   {   {
# Line 857  Source code for this patch is http://vau Line 857  Source code for this patch is http://vau
857   }   }
858    
859   int security_inode_setxattr(struct dentry *dentry, const char *name,   int security_inode_setxattr(struct dentry *dentry, const char *name,
860  @@ -758,7 +822,10 @@ void security_file_free(struct file *fil  @@ -756,7 +820,10 @@ void security_file_free(struct file *fil
861    
862   int security_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg)   int security_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
863   {   {
# Line 869  Source code for this patch is http://vau Line 869  Source code for this patch is http://vau
869   }   }
870    
871   static inline unsigned long mmap_prot(struct file *file, unsigned long prot)   static inline unsigned long mmap_prot(struct file *file, unsigned long prot)
872  @@ -824,7 +891,10 @@ int security_file_lock(struct file *file  @@ -822,7 +889,10 @@ int security_file_lock(struct file *file
873    
874   int security_file_fcntl(struct file *file, unsigned int cmd, unsigned long arg)   int security_file_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
875   {   {
# Line 881  Source code for this patch is http://vau Line 881  Source code for this patch is http://vau
881   }   }
882    
883   int security_file_set_fowner(struct file *file)   int security_file_set_fowner(struct file *file)
884  @@ -848,6 +918,8 @@ int security_file_open(struct file *file  @@ -846,6 +916,8 @@ int security_file_open(struct file *file
885          int ret;          int ret;
886    
887          ret = security_ops->file_open(file, cred);          ret = security_ops->file_open(file, cred);
# Line 890  Source code for this patch is http://vau Line 890  Source code for this patch is http://vau
890          if (ret)          if (ret)
891                  return ret;                  return ret;
892    
893  @@ -1193,7 +1265,10 @@ EXPORT_SYMBOL(security_unix_may_send);  @@ -1191,7 +1263,10 @@ EXPORT_SYMBOL(security_unix_may_send);
894    
895   int security_socket_create(int family, int type, int protocol, int kern)   int security_socket_create(int family, int type, int protocol, int kern)
896   {   {
# Line 902  Source code for this patch is http://vau Line 902  Source code for this patch is http://vau
902   }   }
903    
904   int security_socket_post_create(struct socket *sock, int family,   int security_socket_post_create(struct socket *sock, int family,
905  @@ -1205,17 +1280,26 @@ int security_socket_post_create(struct s  @@ -1203,17 +1278,26 @@ int security_socket_post_create(struct s
906    
907   int security_socket_bind(struct socket *sock, struct sockaddr *address, int addrlen)   int security_socket_bind(struct socket *sock, struct sockaddr *address, int addrlen)
908   {   {
# Line 932  Source code for this patch is http://vau Line 932  Source code for this patch is http://vau
932   }   }
933    
934   int security_socket_accept(struct socket *sock, struct socket *newsock)   int security_socket_accept(struct socket *sock, struct socket *newsock)
935  @@ -1225,7 +1309,10 @@ int security_socket_accept(struct socket  @@ -1223,7 +1307,10 @@ int security_socket_accept(struct socket
936    
937   int security_socket_sendmsg(struct socket *sock, struct msghdr *msg, int size)   int security_socket_sendmsg(struct socket *sock, struct msghdr *msg, int size)
938   {   {
Legend:
Removed from v.278  
changed lines
  Added in v.279
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
About OSDN
Find Software
Develop Software
Help