Diff of /trunk/1.8.x/ccs-patch/patches/ccs-patch-2.6.18-debian-etch.diff

TOMOYO

 Subversion リポジトリの参照



/[tomoyo]/trunk/1.8.x/ccs-patch/patches/ccs-patch-2.6.18-debian-etch.diff




Diff of /trunk/1.8.x/ccs-patch/patches/ccs-patch-2.6.18-debian-etch.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 18 
 Source code for this patch is "apt-get i


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












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

















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

















20
  fs/namei.c                      |   38 ++++++++++++++++++++++++++++++++++++++
  fs/namei.c                      |   38 ++++++++++++++++++++++++++++++++++++++















21


  fs/namespace.c                  |   27 ++++++++++++++++++++++++++-


  fs/namespace.c                  |   25 ++++++++++++++++++++++++-















22
  fs/open.c                       |   13 +++++++++++++
  fs/open.c                       |   13 +++++++++++++

















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

















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











#

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


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












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

















45
  security/Kconfig                |    2 ++
  security/Kconfig                |    2 ++

















46
  security/Makefile               |    3 +++
  security/Makefile               |    3 +++















47


  42 files changed, 275 insertions(+), 9 deletions(-)


  42 files changed, 273 insertions(+), 9 deletions(-)















48
 
 

















49
 --- linux-2.6.18-24etch2.orig/arch/alpha/kernel/ptrace.c
 --- linux-2.6.18-24etch2.orig/arch/alpha/kernel/ptrace.c

















50
 +++ linux-2.6.18-24etch2/arch/alpha/kernel/ptrace.c
 +++ linux-2.6.18-24etch2/arch/alpha/kernel/ptrace.c











#

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


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












573
  
  

















574
         newmnt->mnt_flags = mnt_flags;
         newmnt->mnt_flags = mnt_flags;

















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















576


 @@ -1402,6 +1416,13 @@ long do_mount(char *dev_name, char *dir_


 @@ -1402,6 +1416,11 @@ long do_mount(char *dev_name, char *dir_















577
         if (data_page)
         if (data_page)

















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

















579
  
  














 +       if (!ccs_capable(CCS_SYS_MOUNT))
 










 +               return -EPERM;
 













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

















581
 +                                           &flags);
 +                                           &flags);

















582
 +       if (retval)
 +       if (retval)











#

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


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












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

















586
         if (flags & MS_NOSUID)
         if (flags & MS_NOSUID)

















587
                 mnt_flags |= MNT_NOSUID;
                 mnt_flags |= MNT_NOSUID;















588


 @@ -1691,6 +1712,8 @@ asmlinkage long sys_pivot_root(const cha


 @@ -1691,6 +1710,8 @@ asmlinkage long sys_pivot_root(const cha















589
  
  

















590
         if (!capable(CAP_SYS_ADMIN))
         if (!capable(CAP_SYS_ADMIN))

















591
                 return -EPERM;
                 return -EPERM;











#

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


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












594
  
  

















595
         lock_kernel();
         lock_kernel();

















596
  
  















597


 @@ -1707,6 +1730,8 @@ asmlinkage long sys_pivot_root(const cha


 @@ -1707,6 +1728,8 @@ asmlinkage long sys_pivot_root(const cha















598
                 goto out1;
                 goto out1;

















599
  
  

















600
         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.18-debian-etch.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 18 
 Source code for this patch is "apt-get i
   fs/fcntl.c                      |    5 +++++
   fs/ioctl.c                      |    5 +++++
   fs/namei.c                      |   38 ++++++++++++++++++++++++++++++++++++++
-  fs/namespace.c                  |   27 ++++++++++++++++++++++++++-
+  fs/namespace.c                  |   25 ++++++++++++++++++++++++-
   fs/open.c                       |   13 +++++++++++++
   fs/proc/proc_misc.c             |    1 +
   include/linux/init_task.h       |    2 ++
 Line 44 
 Source code for this patch is "apt-get i
   net/unix/af_unix.c              |    4 ++++
   security/Kconfig                |    2 ++
   security/Makefile               |    3 +++
-files changed, 275 insertions(+), 9 deletions(-)
+files changed, 273 insertions(+), 9 deletions(-)
  --- linux-2.6.18-24etch2.orig/arch/alpha/kernel/ptrace.c
  +++ linux-2.6.18-24etch2/arch/alpha/kernel/ptrace.c
 Line 573 
 Source code for this patch is "apt-get i
          newmnt->mnt_flags = mnt_flags;
          if ((err = graft_tree(newmnt, nd)))
- @@ -1402,6 +1416,13 @@ long do_mount(char *dev_name, char *dir_
+ @@ -1402,6 +1416,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 587 
 Source code for this patch is "apt-get i
+Line 585 
 Source code for this patch is "apt-get i
          /* Separate the per-mountpoint flags */
          if (flags & MS_NOSUID)
                  mnt_flags |= MNT_NOSUID;
- @@ -1691,6 +1712,8 @@ asmlinkage long sys_pivot_root(const cha
+ @@ -1691,6 +1710,8 @@ asmlinkage long sys_pivot_root(const cha
          if (!capable(CAP_SYS_ADMIN))
                  return -EPERM;
-Line 596 
 Source code for this patch is "apt-get i
+Line 594 
 Source code for this patch is "apt-get i
          lock_kernel();
- @@ -1707,6 +1730,8 @@ asmlinkage long sys_pivot_root(const cha
+ @@ -1707,6 +1728,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 リポジトリの参照