Diff of /trunk/1.8.x/ccs-patch/patches/ccs-patch-2.6.27-ubuntu-8.10.diff

TOMOYO

 Subversion リポジトリの参照



/[tomoyo]/trunk/1.8.x/ccs-patch/patches/ccs-patch-2.6.27-ubuntu-8.10.diff




Diff of /trunk/1.8.x/ccs-patch/patches/ccs-patch-2.6.27-ubuntu-8.10.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 7 
 Source code for this patch is "apt-get i


Line 7 
 Source code for this patch is "apt-get i












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

















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

















9
  fs/exec.c                       |   10 +++++++++-
  fs/exec.c                       |   10 +++++++++-















10


  fs/fcntl.c                      |    4 ++++


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















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

















12
  fs/namei.c                      |   36 ++++++++++++++++++++++++++++++++++++
  fs/namei.c                      |   36 ++++++++++++++++++++++++++++++++++++

















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











#

Line 36 
 Source code for this patch is "apt-get i


Line 36 
 Source code for this patch is "apt-get i












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

















37
  security/Kconfig                |    2 ++
  security/Kconfig                |    2 ++

















38
  security/Makefile               |    3 +++
  security/Makefile               |    3 +++















39


  34 files changed, 250 insertions(+), 10 deletions(-)


  34 files changed, 251 insertions(+), 10 deletions(-)















40
 
 

















41
 --- linux-2.6.27-17.46.orig/arch/ia64/ia32/sys_ia32.c
 --- linux-2.6.27-17.46.orig/arch/ia64/ia32/sys_ia32.c

















42
 +++ linux-2.6.27-17.46/arch/ia64/ia32/sys_ia32.c
 +++ linux-2.6.27-17.46/arch/ia64/ia32/sys_ia32.c











#

Line 164 
 Source code for this patch is "apt-get i


Line 164 
 Source code for this patch is "apt-get i












164
  
  

















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

















166
  {
  {















167


 @@ -155,6 +156,9 @@ static int setfl(int fd, struct file * f


 @@ -344,6 +345,8 @@ SYSCALL_DEFINE3(fcntl, unsigned int, fd,













168


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


                 goto out;
















                 return -EPERM;


 















169
  
  















170


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


         err = security_file_fcntl(filp, cmd, arg);













171


 +               return -EPERM;


 +       if (!err)













172


 +


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













173


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


         if (err) {













174


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


                 fput(filp);













175


                 if (!is_owner_or_cap(inode))


                 return err;













176


 


 @@ -369,6 +372,8 @@ SYSCALL_DEFINE3(fcntl64, unsigned int, f













177


 


                 goto out;













178


 


  













179


 


         err = security_file_fcntl(filp, cmd, arg);













180


 


 +       if (!err)













181


 


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













182


 


         if (err) {













183


 


                 fput(filp);













184


 


                 return err;















185
 --- linux-2.6.27-17.46.orig/fs/ioctl.c
 --- linux-2.6.27-17.46.orig/fs/ioctl.c

















186
 +++ linux-2.6.27-17.46/fs/ioctl.c
 +++ linux-2.6.27-17.46/fs/ioctl.c

















187
 @@ -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.27-ubuntu-8.10.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 7 
 Source code for this patch is "apt-get i
   fs/compat.c                     |    3 ++-
   fs/compat_ioctl.c               |    3 +++
   fs/exec.c                       |   10 +++++++++-
-  fs/fcntl.c                      |    4 ++++
+  fs/fcntl.c                      |    5 +++++
   fs/ioctl.c                      |    3 +++
   fs/namei.c                      |   36 ++++++++++++++++++++++++++++++++++++
   fs/namespace.c                  |    9 +++++++++
 Line 36 
 Source code for this patch is "apt-get i
   net/unix/af_unix.c              |    9 +++++++++
   security/Kconfig                |    2 ++
   security/Makefile               |    3 +++
-files changed, 250 insertions(+), 10 deletions(-)
+files changed, 251 insertions(+), 10 deletions(-)
  --- linux-2.6.27-17.46.orig/arch/ia64/ia32/sys_ia32.c
  +++ linux-2.6.27-17.46/arch/ia64/ia32/sys_ia32.c
 Line 164 
 Source code for this patch is "apt-get i
   void set_close_on_exec(unsigned int fd, int flag)
   {
- @@ -155,6 +156,9 @@ static int setfl(int fd, struct file * f
+ @@ -344,6 +345,8 @@ SYSCALL_DEFINE3(fcntl, unsigned int, fd,
-         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;
+ @@ -369,6 +372,8 @@ SYSCALL_DEFINE3(fcntl64, unsigned int, f
+                 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.27-17.46.orig/fs/ioctl.c
  +++ linux-2.6.27-17.46/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 リポジトリの参照