Diff of /trunk/1.8.x/ccs-patch/patches/ccs-patch-2.6.25.diff

TOMOYO

 Subversion リポジトリの参照



/[tomoyo]/trunk/1.8.x/ccs-patch/patches/ccs-patch-2.6.25.diff




Diff of /trunk/1.8.x/ccs-patch/patches/ccs-patch-2.6.25.diff



 Parent Directory

|  Revision Log



|  Patch














revision 4048 by kumaneko,
Mon Aug 23 08:15:53 2010 UTC




revision 4049 by kumaneko,
Thu Oct  7 07:14:01 2010 UTC






#

Line 9 
 Source code for this patch is http://www


Line 9 
 Source code for this patch is http://www












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

















10
  fs/compat_ioctl.c               |    3 +++
  fs/compat_ioctl.c               |    3 +++

















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















12


  fs/fcntl.c                      |    4 ++++


  fs/fcntl.c                      |    5 +++++















13
  fs/ioctl.c                      |    3 +++
  fs/ioctl.c                      |    3 +++

















14
  fs/namei.c                      |   34 +++++++++++++++++++++++++++++++++-
  fs/namei.c                      |   34 +++++++++++++++++++++++++++++++++-

















15
  fs/namespace.c                  |    9 +++++++++
  fs/namespace.c                  |    9 +++++++++











#

Line 38 
 Source code for this patch is http://www


Line 38 
 Source code for this patch is http://www












38
  net/unix/af_unix.c              |    9 +++++++++
  net/unix/af_unix.c              |    9 +++++++++

















39
  security/Kconfig                |    2 ++
  security/Kconfig                |    2 ++

















40
  security/Makefile               |    3 +++
  security/Makefile               |    3 +++















41


  36 files changed, 256 insertions(+), 11 deletions(-)


  36 files changed, 257 insertions(+), 11 deletions(-)















42
 
 

















43
 --- linux-2.6.25.20.orig/arch/ia64/ia32/sys_ia32.c
 --- linux-2.6.25.20.orig/arch/ia64/ia32/sys_ia32.c

















44
 +++ linux-2.6.25.20/arch/ia64/ia32/sys_ia32.c
 +++ linux-2.6.25.20/arch/ia64/ia32/sys_ia32.c











#

Line 206 
 Source code for this patch is http://www


Line 206 
 Source code for this patch is http://www












206
  
  

















207
  void set_close_on_exec(unsigned int fd, int flag)
  void set_close_on_exec(unsigned int fd, int flag)

















208
  {
  {















209


 @@ -217,6 +218,9 @@ static int setfl(int fd, struct file * f


 @@ -397,6 +398,8 @@ asmlinkage long sys_fcntl(unsigned int f













210


         if (((arg ^ filp->f_flags) & O_APPEND) && IS_APPEND(inode))


                 goto out;
















                 return -EPERM;


 















211
  
  















212


 +       if (((arg ^ filp->f_flags) & O_APPEND) && ccs_rewrite_permission(filp))


         err = security_file_fcntl(filp, cmd, arg);













213


 +               return -EPERM;


 +       if (!err)













214


 +


 +               err = ccs_fcntl_permission(filp, cmd, arg);













215


         /* O_NOATIME can only be set by the owner or superuser */


         if (err) {













216


         if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))


                 fput(filp);













217


                 if (!is_owner_or_cap(inode))


                 return err;













218


 


 @@ -421,6 +424,8 @@ asmlinkage long sys_fcntl64(unsigned int













219


 


                 goto out;













220


 


  













221


 


         err = security_file_fcntl(filp, cmd, arg);













222


 


 +       if (!err)













223


 


 +               err = ccs_fcntl_permission(filp, cmd, arg);













224


 


         if (err) {













225


 


                 fput(filp);













226


 


                 return err;















227
 --- linux-2.6.25.20.orig/fs/ioctl.c
 --- linux-2.6.25.20.orig/fs/ioctl.c

















228
 +++ linux-2.6.25.20/fs/ioctl.c
 +++ linux-2.6.25.20/fs/ioctl.c

















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





























Legend:



Removed from v.4048
 


changed lines


 
Added in v.4049













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[tomoyo]/trunk/1.8.x/ccs-patch/patches/ccs-patch-2.6.25.diff
-revision 4048 by kumaneko,
Mon Aug 23 08:15:53 2010 UTC
+revision 4049 by kumaneko,
Thu Oct  7 07:14:01 2010 UTC
 Line 9 
 Source code for this patch is http://www
   fs/compat.c                     |    3 ++-
   fs/compat_ioctl.c               |    3 +++
   fs/exec.c                       |   12 +++++++++++-
-  fs/fcntl.c                      |    4 ++++
+  fs/fcntl.c                      |    5 +++++
   fs/ioctl.c                      |    3 +++
   fs/namei.c                      |   34 +++++++++++++++++++++++++++++++++-
   fs/namespace.c                  |    9 +++++++++
 Line 38 
 Source code for this patch is http://www
   net/unix/af_unix.c              |    9 +++++++++
   security/Kconfig                |    2 ++
   security/Makefile               |    3 +++
-files changed, 256 insertions(+), 11 deletions(-)
+files changed, 257 insertions(+), 11 deletions(-)
  --- linux-2.6.25.20.orig/arch/ia64/ia32/sys_ia32.c
  +++ linux-2.6.25.20/arch/ia64/ia32/sys_ia32.c
 Line 206 
 Source code for this patch is http://www
   void set_close_on_exec(unsigned int fd, int flag)
   {
- @@ -217,6 +218,9 @@ static int setfl(int fd, struct file * f
+ @@ -397,6 +398,8 @@ asmlinkage long sys_fcntl(unsigned int f
-         if (((arg ^ filp->f_flags) & O_APPEND) && IS_APPEND(inode))
+                 goto out;
-                 return -EPERM;
- +       if (((arg ^ filp->f_flags) & O_APPEND) && ccs_rewrite_permission(filp))
+         err = security_file_fcntl(filp, cmd, arg);
- +               return -EPERM;
+ +       if (!err)
- +
+ +               err = ccs_fcntl_permission(filp, cmd, arg);
-         /* O_NOATIME can only be set by the owner or superuser */
+         if (err) {
-         if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))
+                 fput(filp);
-                 if (!is_owner_or_cap(inode))
+                 return err;
+ @@ -421,6 +424,8 @@ asmlinkage long sys_fcntl64(unsigned int
+                 goto out;
+         err = security_file_fcntl(filp, cmd, arg);
+ +       if (!err)
+ +               err = ccs_fcntl_permission(filp, cmd, arg);
+         if (err) {
+                 fput(filp);
+                 return err;
  --- linux-2.6.25.20.orig/fs/ioctl.c
  +++ linux-2.6.25.20/fs/ioctl.c
  @@ -15,6 +15,7 @@
 Legend:



Removed from v.4048
 


changed lines


 
Added in v.4049
 Legend:



Removed from v.4048
 


changed lines


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

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

TOMOYO

Subversion リポジトリの参照