Diff of /trunk/1.7.x/ccs-patch/patches/ccs-patch-2.6.16-vine-linux-4.2.diff

TOMOYO

 Subversion リポジトリの参照



/[tomoyo]/trunk/1.7.x/ccs-patch/patches/ccs-patch-2.6.16-vine-linux-4.2.diff




Diff of /trunk/1.7.x/ccs-patch/patches/ccs-patch-2.6.16-vine-linux-4.2.diff



 Parent Directory

|  Revision Log



|  Patch














revision 3054 by kumaneko,
Fri Sep 18 04:30:43 2009 UTC




revision 3061 by kumaneko,
Thu Sep 24 03:50:59 2009 UTC






#

Line 12 
 Source code for this patch is http://upd


Line 12 
 Source code for this patch is http://upd












12
  arch/sparc/kernel/ptrace.c      |    5 +++++
  arch/sparc/kernel/ptrace.c      |    5 +++++

















13
  arch/sparc64/kernel/ptrace.c    |    5 +++++
  arch/sparc64/kernel/ptrace.c    |    5 +++++

















14
  arch/x86_64/ia32/ptrace32.c     |    3 +++
  arch/x86_64/ia32/ptrace32.c     |    3 +++














  fs/attr.c                       |    5 +++++
 













15
  fs/compat.c                     |    9 ++++++++-
  fs/compat.c                     |    9 ++++++++-

















16
  fs/exec.c                       |   12 +++++++++++-
  fs/exec.c                       |   12 +++++++++++-

















17
  fs/fcntl.c                      |    4 ++++
  fs/fcntl.c                      |    4 ++++











#

Line 44 
 Source code for this patch is http://upd


Line 43 
 Source code for this patch is http://upd












43
  net/unix/af_unix.c              |    4 ++++
  net/unix/af_unix.c              |    4 ++++

















44
  security/Kconfig                |    2 ++
  security/Kconfig                |    2 ++

















45
  security/Makefile               |    3 +++
  security/Makefile               |    3 +++















46


  42 files changed, 295 insertions(+), 11 deletions(-)


  41 files changed, 290 insertions(+), 11 deletions(-)















47
 
 

















48
 --- linux-2.6.16-76.51vl4.orig/arch/alpha/kernel/ptrace.c
 --- linux-2.6.16-76.51vl4.orig/arch/alpha/kernel/ptrace.c

















49
 +++ linux-2.6.16-76.51vl4/arch/alpha/kernel/ptrace.c
 +++ linux-2.6.16-76.51vl4/arch/alpha/kernel/ptrace.c











#

Line 240 
 Source code for this patch is http://upd


Line 239 
 Source code for this patch is http://upd












239
  
  

















240
         switch (request) { 
         switch (request) { 

















241
         default:
         default:














 --- linux-2.6.16-76.51vl4.orig/fs/attr.c
 










 +++ linux-2.6.16-76.51vl4/fs/attr.c
 










 @@ -15,6 +15,7 @@
 










  #include <linux/fcntl.h>
 










  #include <linux/quotaops.h>
 










  #include <linux/security.h>
 










 +#include <linux/ccsecurity.h>
 










  
 










  /* Taken over from the old code... */
 










  
 










 @@ -146,11 +147,15 @@ int notify_change(struct dentry * dentry
 










         if (inode->i_op && inode->i_op->setattr) {
 










                 error = security_inode_setattr(dentry, attr);
 










                 if (!error)
 










 +                       error = ccs_setattr_permission(dentry, attr);
 










 +               if (!error)
 










                         error = inode->i_op->setattr(dentry, attr);
 










         } else {
 










                 error = inode_change_ok(inode, attr);
 










                 if (!error)
 










                         error = security_inode_setattr(dentry, attr);
 










 +               if (!error)
 










 +                       error = ccs_setattr_permission(dentry, attr);
 










                 if (!error) {
 










                         if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
 










                             (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))
 













242
 --- linux-2.6.16-76.51vl4.orig/fs/compat.c
 --- linux-2.6.16-76.51vl4.orig/fs/compat.c

















243
 +++ linux-2.6.16-76.51vl4/fs/compat.c
 +++ linux-2.6.16-76.51vl4/fs/compat.c

















244
 @@ -52,6 +52,7 @@
 @@ -52,6 +52,7 @@











#

Line 727 
 Source code for this patch is http://upd


Line 700 
 Source code for this patch is http://upd












700
         if (entry)
         if (entry)

















701
                 entry->proc_fops = &proc_sysrq_trigger_operations;
                 entry->proc_fops = &proc_sysrq_trigger_operations;

















702
  #endif
  #endif















703


 +       printk(KERN_INFO "Hook version: 2.6.16-76.51vl4 2009/09/17\n");


 +       printk(KERN_INFO "Hook version: 2.6.16-76.51vl4 2009/09/24\n");















704
  }
  }

















705
 --- linux-2.6.16-76.51vl4.orig/include/linux/init_task.h
 --- linux-2.6.16-76.51vl4.orig/include/linux/init_task.h

















706
 +++ linux-2.6.16-76.51vl4/include/linux/init_task.h
 +++ linux-2.6.16-76.51vl4/include/linux/init_task.h





























Legend:



Removed from v.3054
 


changed lines


 
Added in v.3061













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[tomoyo]/trunk/1.7.x/ccs-patch/patches/ccs-patch-2.6.16-vine-linux-4.2.diff
-revision 3054 by kumaneko,
Fri Sep 18 04:30:43 2009 UTC
+revision 3061 by kumaneko,
Thu Sep 24 03:50:59 2009 UTC
 Line 12 
 Source code for this patch is http://upd
   arch/sparc/kernel/ptrace.c      |    5 +++++
   arch/sparc64/kernel/ptrace.c    |    5 +++++
   arch/x86_64/ia32/ptrace32.c     |    3 +++
-  fs/attr.c                       |    5 +++++
   fs/compat.c                     |    9 ++++++++-
   fs/exec.c                       |   12 +++++++++++-
   fs/fcntl.c                      |    4 ++++
-Line 44 
 Source code for this patch is http://upd
+Line 43 
 Source code for this patch is http://upd
   net/unix/af_unix.c              |    4 ++++
   security/Kconfig                |    2 ++
   security/Makefile               |    3 +++
-files changed, 295 insertions(+), 11 deletions(-)
+files changed, 290 insertions(+), 11 deletions(-)
  --- linux-2.6.16-76.51vl4.orig/arch/alpha/kernel/ptrace.c
  +++ linux-2.6.16-76.51vl4/arch/alpha/kernel/ptrace.c
-Line 240 
 Source code for this patch is http://upd
+Line 239 
 Source code for this patch is http://upd
          switch (request) {
          default:
- --- linux-2.6.16-76.51vl4.orig/fs/attr.c
- +++ linux-2.6.16-76.51vl4/fs/attr.c
- @@ -15,6 +15,7 @@
-  #include <linux/fcntl.h>
-  #include <linux/quotaops.h>
-  #include <linux/security.h>
- +#include <linux/ccsecurity.h>
-  /* Taken over from the old code... */
- @@ -146,11 +147,15 @@ int notify_change(struct dentry * dentry
-         if (inode->i_op && inode->i_op->setattr) {
-                 error = security_inode_setattr(dentry, attr);
-                 if (!error)
- +                       error = ccs_setattr_permission(dentry, attr);
- +               if (!error)
-                         error = inode->i_op->setattr(dentry, attr);
-         } else {
-                 error = inode_change_ok(inode, attr);
-                 if (!error)
-                         error = security_inode_setattr(dentry, attr);
- +               if (!error)
- +                       error = ccs_setattr_permission(dentry, attr);
-                 if (!error) {
-                         if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
-                             (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))
  --- linux-2.6.16-76.51vl4.orig/fs/compat.c
  +++ linux-2.6.16-76.51vl4/fs/compat.c
  @@ -52,6 +52,7 @@
-Line 727 
 Source code for this patch is http://upd
+Line 700 
 Source code for this patch is http://upd
          if (entry)
                  entry->proc_fops = &proc_sysrq_trigger_operations;
   #endif
- +       printk(KERN_INFO "Hook version: 2.6.16-76.51vl4 2009/09/17\n");
+ +       printk(KERN_INFO "Hook version: 2.6.16-76.51vl4 2009/09/24\n");
   }
  --- linux-2.6.16-76.51vl4.orig/include/linux/init_task.h
  +++ linux-2.6.16-76.51vl4/include/linux/init_task.h
 Legend:



Removed from v.3054
 


changed lines


 
Added in v.3061
 Legend:



Removed from v.3054
 


changed lines


 
Added in v.3061
-Removed from v.3054
+Added in v.3061
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

オープンソース・ソフトウェアの開発とダウンロード

TOMOYO

Subversion リポジトリの参照