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

TOMOYO

 Subversion リポジトリの参照



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




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



 Parent Directory

|  Revision Log



|  Patch














revision 2859 by kumaneko,
Thu Aug  6 07:51:05 2009 UTC




revision 2866 by kumaneko,
Fri Aug  7 14:47:14 2009 UTC






#

Line 13 
 Source code for this patch is http://dow


Line 13 
 Source code for this patch is http://dow












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

















14
  fs/ioctl.c                      |    5 +++++
  fs/ioctl.c                      |    5 +++++

















15
  fs/namei.c                      |   35 +++++++++++++++++++++++++++++++++++
  fs/namei.c                      |   35 +++++++++++++++++++++++++++++++++++















16


  fs/namespace.c                  |   26 ++++++++++++++++++++++++++


  fs/namespace.c                  |   24 ++++++++++++++++++++++++















17
  fs/open.c                       |   15 +++++++++++++++
  fs/open.c                       |   15 +++++++++++++++

















18
  fs/proc/proc_misc.c             |    1 +
  fs/proc/proc_misc.c             |    1 +

















19
  include/linux/init_task.h       |    2 ++
  include/linux/init_task.h       |    2 ++











#

Line 39 
 Source code for this patch is http://dow


Line 39 
 Source code for this patch is http://dow












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

















40
  security/Kconfig                |    2 ++
  security/Kconfig                |    2 ++

















41
  security/Makefile               |    3 +++
  security/Makefile               |    3 +++















42


  37 files changed, 240 insertions(+), 2 deletions(-)


  37 files changed, 238 insertions(+), 2 deletions(-)















43
 
 

















44
 --- linux-2.6.25.20-0.4.orig/arch/ia64/ia32/sys_ia32.c
 --- linux-2.6.25.20-0.4.orig/arch/ia64/ia32/sys_ia32.c

















45
 +++ linux-2.6.25.20-0.4/arch/ia64/ia32/sys_ia32.c
 +++ linux-2.6.25.20-0.4/arch/ia64/ia32/sys_ia32.c











#

Line 458 
 Source code for this patch is http://dow


Line 458 
 Source code for this patch is http://dow












458
  
  

















459
         newmnt->mnt_flags = mnt_flags;
         newmnt->mnt_flags = mnt_flags;

















460
         if ((err = graft_tree(newmnt, nd)))
         if ((err = graft_tree(newmnt, nd)))















461


 @@ -1412,6 +1427,13 @@ long do_mount(char *dev_name, char *dir_


 @@ -1412,6 +1427,11 @@ long do_mount(char *dev_name, char *dir_















462
         if (data_page)
         if (data_page)

















463
                 ((char *)data_page)[PAGE_SIZE - 1] = 0;
                 ((char *)data_page)[PAGE_SIZE - 1] = 0;

















464
  
  














 +       if (!ccs_capable(CCS_SYS_MOUNT))
 










 +               return -EPERM;
 













465
 +       retval = ccs_check_mount_permission(dev_name, dir_name, type_page,
 +       retval = ccs_check_mount_permission(dev_name, dir_name, type_page,

















466
 +                                           &flags);
 +                                           &flags);

















467
 +       if (retval)
 +       if (retval)











#

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


Line 470 
 Source code for this patch is http://dow












470
         /* Separate the per-mountpoint flags */
         /* Separate the per-mountpoint flags */

















471
         if (flags & MS_NOSUID)
         if (flags & MS_NOSUID)

















472
                 mnt_flags |= MNT_NOSUID;
                 mnt_flags |= MNT_NOSUID;















473


 @@ -1680,6 +1702,8 @@ asmlinkage long sys_pivot_root(const cha


 @@ -1680,6 +1700,8 @@ asmlinkage long sys_pivot_root(const cha















474
  
  

















475
         if (!capable(CAP_SYS_ADMIN))
         if (!capable(CAP_SYS_ADMIN))

















476
                 return -EPERM;
                 return -EPERM;











#

Line 481 
 Source code for this patch is http://dow


Line 479 
 Source code for this patch is http://dow












479
  
  

















480
         lock_kernel();
         lock_kernel();

















481
  
  















482


 @@ -1696,6 +1720,8 @@ asmlinkage long sys_pivot_root(const cha


 @@ -1696,6 +1718,8 @@ asmlinkage long sys_pivot_root(const cha















483
                 goto out1;
                 goto out1;

















484
  
  

















485
         error = security_sb_pivotroot(&old_nd, &new_nd);
         error = security_sb_pivotroot(&old_nd, &new_nd);





























Legend:



Removed from v.2859
 


changed lines


 
Added in v.2866













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-suse-11.0.diff
-revision 2859 by kumaneko,
Thu Aug  6 07:51:05 2009 UTC
+revision 2866 by kumaneko,
Fri Aug  7 14:47:14 2009 UTC
 Line 13 
 Source code for this patch is http://dow
   fs/fcntl.c                      |    5 +++++
   fs/ioctl.c                      |    5 +++++
   fs/namei.c                      |   35 +++++++++++++++++++++++++++++++++++
-  fs/namespace.c                  |   26 ++++++++++++++++++++++++++
+  fs/namespace.c                  |   24 ++++++++++++++++++++++++
   fs/open.c                       |   15 +++++++++++++++
   fs/proc/proc_misc.c             |    1 +
   include/linux/init_task.h       |    2 ++
 Line 39 
 Source code for this patch is http://dow
   net/unix/af_unix.c              |    4 ++++
   security/Kconfig                |    2 ++
   security/Makefile               |    3 +++
-files changed, 240 insertions(+), 2 deletions(-)
+files changed, 238 insertions(+), 2 deletions(-)
  --- linux-2.6.25.20-0.4.orig/arch/ia64/ia32/sys_ia32.c
  +++ linux-2.6.25.20-0.4/arch/ia64/ia32/sys_ia32.c
 Line 458 
 Source code for this patch is http://dow
          newmnt->mnt_flags = mnt_flags;
          if ((err = graft_tree(newmnt, nd)))
- @@ -1412,6 +1427,13 @@ long do_mount(char *dev_name, char *dir_
+ @@ -1412,6 +1427,11 @@ long do_mount(char *dev_name, char *dir_
          if (data_page)
                  ((char *)data_page)[PAGE_SIZE - 1] = 0;
- +       if (!ccs_capable(CCS_SYS_MOUNT))
- +               return -EPERM;
  +       retval = ccs_check_mount_permission(dev_name, dir_name, type_page,
  +                                           &flags);
  +       if (retval)
-Line 472 
 Source code for this patch is http://dow
+Line 470 
 Source code for this patch is http://dow
          /* Separate the per-mountpoint flags */
          if (flags & MS_NOSUID)
                  mnt_flags |= MNT_NOSUID;
- @@ -1680,6 +1702,8 @@ asmlinkage long sys_pivot_root(const cha
+ @@ -1680,6 +1700,8 @@ asmlinkage long sys_pivot_root(const cha
          if (!capable(CAP_SYS_ADMIN))
                  return -EPERM;
-Line 481 
 Source code for this patch is http://dow
+Line 479 
 Source code for this patch is http://dow
          lock_kernel();
- @@ -1696,6 +1720,8 @@ asmlinkage long sys_pivot_root(const cha
+ @@ -1696,6 +1718,8 @@ asmlinkage long sys_pivot_root(const cha
                  goto out1;
          error = security_sb_pivotroot(&old_nd, &new_nd);
 Legend:



Removed from v.2859
 


changed lines


 
Added in v.2866
 Legend:



Removed from v.2859
 


changed lines


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

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

TOMOYO

Subversion リポジトリの参照