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 2278 by kumaneko,
Wed Mar 18 08:12:58 2009 UTC




revision 2279 by kumaneko,
Wed Mar 18 09:16:37 2009 UTC






#

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


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












15
  fs/Kconfig                      |    2 
  fs/Kconfig                      |    2 

















16
  fs/Makefile                     |    2 
  fs/Makefile                     |    2 

















17
  fs/attr.c                       |   19 ++++++
  fs/attr.c                       |   19 ++++++















18


  fs/compat.c                     |   11 +++


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















19
  fs/exec.c                       |   21 ++++++-
  fs/exec.c                       |   21 ++++++-

















20
  fs/fcntl.c                      |    9 +++
  fs/fcntl.c                      |    9 +++















21


  fs/ioctl.c                      |    7 ++


  fs/ioctl.c                      |   11 +++















22
  fs/namei.c                      |  118 ++++++++++++++++++++++++++++++++++++++++
  fs/namei.c                      |  118 ++++++++++++++++++++++++++++++++++++++++

















23
  fs/namespace.c                  |   50 ++++++++++++++++
  fs/namespace.c                  |   50 ++++++++++++++++

















24
  fs/open.c                       |   29 +++++++++
  fs/open.c                       |   29 +++++++++











#

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


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












44
  net/ipv6/udp.c                  |   11 +++
  net/ipv6/udp.c                  |   11 +++

















45
  net/socket.c                    |   43 +++++++++++++-
  net/socket.c                    |   43 +++++++++++++-

















46
  net/unix/af_unix.c              |   15 +++++
  net/unix/af_unix.c              |   15 +++++















47


  42 files changed, 681 insertions(+), 10 deletions(-)


  42 files changed, 689 insertions(+), 10 deletions(-)















48
 
 

















49
 --- linux-2.6.16-76.40vl4.orig/arch/alpha/kernel/ptrace.c
 --- linux-2.6.16-76.40vl4.orig/arch/alpha/kernel/ptrace.c

















50
 +++ linux-2.6.16-76.40vl4/arch/alpha/kernel/ptrace.c
 +++ linux-2.6.16-76.40vl4/arch/alpha/kernel/ptrace.c











#

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


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












351
  
  

















352
  extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat);
  extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat);

















353
  
  















354


 @@ -405,6 +408,12 @@ asmlinkage long compat_sys_ioctl(unsigne


 @@ -381,6 +384,10 @@ asmlinkage long compat_sys_ioctl(unsigne













355


 


  













356


 


         /* RED-PEN how should LSM module know it's handling 32bit? */













357


 


         error = security_file_ioctl(filp, cmd, arg);













358


 


 +       /***** TOMOYO Linux start. *****/













359


 


 +       if (!error)













360


 


 +               error = ccs_check_ioctl_permission(filp, cmd, arg);













361


 


 +       /***** TOMOYO Linux end. *****/













362


 


         if (error)













363


 


                 goto out_fput;













364


 


  













365


 


 @@ -405,6 +412,12 @@ asmlinkage long compat_sys_ioctl(unsigne















366
                 /*FALL THROUGH*/
                 /*FALL THROUGH*/

















367
  
  

















368
         default:
         default:











#

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


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












375
                 if (filp->f_op && filp->f_op->compat_ioctl) {
                 if (filp->f_op && filp->f_op->compat_ioctl) {

















376
                         error = filp->f_op->compat_ioctl(filp, cmd, arg);
                         error = filp->f_op->compat_ioctl(filp, cmd, arg);

















377
                         if (error != -ENOIOCTLCMD)
                         if (error != -ENOIOCTLCMD)















378


 @@ -1532,7 +1541,7 @@ int compat_do_execve(char * filename,


 @@ -1532,7 +1545,7 @@ int compat_do_execve(char * filename,















379
         if (retval < 0)
         if (retval < 0)

















380
                 goto out;
                 goto out;

















381
  
  











#

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


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












483
  
  

















484
         if (filp->f_op->unlocked_ioctl) {
         if (filp->f_op->unlocked_ioctl) {

















485
                 error = filp->f_op->unlocked_ioctl(filp, cmd, arg);
                 error = filp->f_op->unlocked_ioctl(filp, cmd, arg);












486
 
 @@ -168,6 +175,10 @@ asmlinkage long sys_ioctl(unsigned int f







487
 
                 goto out;







488
 
  







489
 
         error = security_file_ioctl(filp, cmd, arg);







490
 
 +       /***** TOMOYO Linux start. *****/







491
 
 +       if (!error)







492
 
 +               error = ccs_check_ioctl_permission(filp, cmd, arg);







493
 
 +       /***** TOMOYO Linux end. *****/







494
 
         if (error)







495
 
                 goto out_fput;







496
 
  












497
 --- linux-2.6.16-76.40vl4.orig/fs/namei.c
 --- linux-2.6.16-76.40vl4.orig/fs/namei.c

















498
 +++ linux-2.6.16-76.40vl4/fs/namei.c
 +++ linux-2.6.16-76.40vl4/fs/namei.c

















499
 @@ -37,6 +37,10 @@
 @@ -37,6 +37,10 @@











#

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


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












928
  #endif
  #endif

















929
 +       /***** CCS start. *****/
 +       /***** CCS start. *****/

















930
 +#if defined(CONFIG_SAKURA) || defined(CONFIG_TOMOYO)
 +#if defined(CONFIG_SAKURA) || defined(CONFIG_TOMOYO)















931


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


 +       printk(KERN_INFO "Hook version: 2.6.16-76.40vl4 2009/03/18\n");















932
 +#endif
 +#endif

















933
 +       /***** CCS end. *****/
 +       /***** CCS end. *****/

















934
  }
  }





























Legend:



Removed from v.2278
 


changed lines


 
Added in v.2279













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 2278 by kumaneko,
Wed Mar 18 08:12:58 2009 UTC
+revision 2279 by kumaneko,
Wed Mar 18 09:16:37 2009 UTC
 Line 15 
 Source code for this patch is http://upd
   fs/Kconfig                      |    2
   fs/Makefile                     |    2
   fs/attr.c                       |   19 ++++++
-  fs/compat.c                     |   11 +++
+  fs/compat.c                     |   15 ++++-
   fs/exec.c                       |   21 ++++++-
   fs/fcntl.c                      |    9 +++
-  fs/ioctl.c                      |    7 ++
+  fs/ioctl.c                      |   11 +++
   fs/namei.c                      |  118 ++++++++++++++++++++++++++++++++++++++++
   fs/namespace.c                  |   50 ++++++++++++++++
   fs/open.c                       |   29 +++++++++
 Line 44 
 Source code for this patch is http://upd
   net/ipv6/udp.c                  |   11 +++
   net/socket.c                    |   43 +++++++++++++-
   net/unix/af_unix.c              |   15 +++++
-files changed, 681 insertions(+), 10 deletions(-)
+files changed, 689 insertions(+), 10 deletions(-)
  --- linux-2.6.16-76.40vl4.orig/arch/alpha/kernel/ptrace.c
  +++ linux-2.6.16-76.40vl4/arch/alpha/kernel/ptrace.c
 Line 351 
 Source code for this patch is http://upd
   extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat);
- @@ -405,6 +408,12 @@ asmlinkage long compat_sys_ioctl(unsigne
+ @@ -381,6 +384,10 @@ asmlinkage long compat_sys_ioctl(unsigne
+         /* RED-PEN how should LSM module know it's handling 32bit? */
+         error = security_file_ioctl(filp, cmd, arg);
+ +       /***** TOMOYO Linux start. *****/
+ +       if (!error)
+ +               error = ccs_check_ioctl_permission(filp, cmd, arg);
+ +       /***** TOMOYO Linux end. *****/
+         if (error)
+                 goto out_fput;
+ @@ -405,6 +412,12 @@ asmlinkage long compat_sys_ioctl(unsigne
                  /*FALL THROUGH*/
          default:
-Line 364 
 Source code for this patch is http://upd
+Line 375 
 Source code for this patch is http://upd
                  if (filp->f_op && filp->f_op->compat_ioctl) {
                          error = filp->f_op->compat_ioctl(filp, cmd, arg);
                          if (error != -ENOIOCTLCMD)
- @@ -1532,7 +1541,7 @@ int compat_do_execve(char * filename,
+ @@ -1532,7 +1545,7 @@ int compat_do_execve(char * filename,
          if (retval < 0)
                  goto out;
-Line 472 
 Source code for this patch is http://upd
+Line 483 
 Source code for this patch is http://upd
          if (filp->f_op->unlocked_ioctl) {
                  error = filp->f_op->unlocked_ioctl(filp, cmd, arg);
+ @@ -168,6 +175,10 @@ asmlinkage long sys_ioctl(unsigned int f
+                 goto out;
+         error = security_file_ioctl(filp, cmd, arg);
+ +       /***** TOMOYO Linux start. *****/
+ +       if (!error)
+ +               error = ccs_check_ioctl_permission(filp, cmd, arg);
+ +       /***** TOMOYO Linux end. *****/
+         if (error)
+                 goto out_fput;
  --- linux-2.6.16-76.40vl4.orig/fs/namei.c
  +++ linux-2.6.16-76.40vl4/fs/namei.c
  @@ -37,6 +37,10 @@
-Line 906 
 Source code for this patch is http://upd
+Line 928 
 Source code for this patch is http://upd
   #endif
  +       /***** CCS start. *****/
  +#if defined(CONFIG_SAKURA) || defined(CONFIG_TOMOYO)
- +       printk(KERN_INFO "Hook version: 2.6.16-76.40vl4 2009/01/24\n");
+ +       printk(KERN_INFO "Hook version: 2.6.16-76.40vl4 2009/03/18\n");
  +#endif
  +       /***** CCS end. *****/
   }
 Legend:



Removed from v.2278
 


changed lines


 
Added in v.2279
 Legend:



Removed from v.2278
 


changed lines


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

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

TOMOYO

Subversion リポジトリの参照