Diff of /branches/ccs-patch/patches/ccs-patch-2.6.22.diff

TOMOYO

 Subversion リポジトリの参照



/[tomoyo]/branches/ccs-patch/patches/ccs-patch-2.6.22.diff




Diff of /branches/ccs-patch/patches/ccs-patch-2.6.22.diff



 Parent Directory

|  Revision Log



|  Patch














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




revision 2869 by kumaneko,
Sat Aug  8 02:47:05 2009 UTC






#

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


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












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

















21
  fs/namei.c                      |   33 +++++++++++++++++++++++++++++++++
  fs/namei.c                      |   33 +++++++++++++++++++++++++++++++++

















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















23


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


  fs/open.c                       |   27 +++++++++++++++++++++++++++















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

















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

















26
  include/linux/sched.h           |    4 ++++
  include/linux/sched.h           |    4 ++++











#

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


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












30
  kernel/module.c                 |    5 +++++
  kernel/module.c                 |    5 +++++

















31
  kernel/ptrace.c                 |    3 +++
  kernel/ptrace.c                 |    3 +++

















32
  kernel/sched.c                  |    3 +++
  kernel/sched.c                  |    3 +++















33


  kernel/signal.c                 |    7 +++++++


  kernel/signal.c                 |    9 +++++++++















34
  kernel/sys.c                    |   11 +++++++++++
  kernel/sys.c                    |   11 +++++++++++

















35
  kernel/sysctl.c                 |    5 +++++
  kernel/sysctl.c                 |    5 +++++

















36
  kernel/time.c                   |    5 +++++
  kernel/time.c                   |    5 +++++











#

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


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












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

















47
  security/Kconfig                |    2 ++
  security/Kconfig                |    2 ++

















48
  security/Makefile               |    3 +++
  security/Makefile               |    3 +++















49


  44 files changed, 257 insertions(+), 2 deletions(-)


  44 files changed, 273 insertions(+), 2 deletions(-)















50
 
 

















51
 --- linux-2.6.22.19.orig/arch/alpha/kernel/ptrace.c
 --- linux-2.6.22.19.orig/arch/alpha/kernel/ptrace.c

















52
 +++ linux-2.6.22.19/arch/alpha/kernel/ptrace.c
 +++ linux-2.6.22.19/arch/alpha/kernel/ptrace.c











#

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


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












649
  
  

















650
         set_fs_root(current->fs, nd.mnt, nd.dentry);
         set_fs_root(current->fs, nd.mnt, nd.dentry);

















651
         set_fs_altroot();
         set_fs_altroot();















652


 @@ -1087,6 +1098,8 @@ EXPORT_SYMBOL(sys_close);


 @@ -516,6 +527,9 @@ asmlinkage long sys_fchmod(unsigned int 













653


 


         err = -EPERM;













654


 


         if (IS_IMMUTABLE(inode) || IS_APPEND(inode))













655


 


                 goto out_putf;













656


 


 +       err = ccs_chmod_permission(dentry, file->f_vfsmnt, mode);













657


 


 +       if (err)













658


 


 +               goto out_putf;













659


 


         mutex_lock(&inode->i_mutex);













660


 


         if (mode == (mode_t) -1)













661


 


                 mode = inode->i_mode;













662


 


 @@ -550,6 +564,9 @@ asmlinkage long sys_fchmodat(int dfd, co













663


 


         error = -EPERM;













664


 


         if (IS_IMMUTABLE(inode) || IS_APPEND(inode))













665


 


                 goto dput_and_out;













666


 


 +       error = ccs_chmod_permission(nd.dentry, nd.mnt, mode);













667


 


 +       if (error)













668


 


 +               goto dput_and_out;













669


 


  













670


 


         mutex_lock(&inode->i_mutex);













671


 


         if (mode == (mode_t) -1)













672


 


 @@ -613,6 +630,8 @@ asmlinkage long sys_chown(const char __u













673


 


         error = user_path_walk(filename, &nd);













674


 


         if (error)













675


 


                 goto out;













676


 


 +       error = ccs_chown_permission(nd.dentry, nd.mnt, user, group);













677


 


 +       if (!error)













678


 


         error = chown_common(nd.dentry, user, group);













679


 


         path_release(&nd);













680


 


  out:













681


 


 @@ -633,6 +652,8 @@ asmlinkage long sys_fchownat(int dfd, co













682


 


         error = __user_walk_fd(dfd, filename, follow, &nd);













683


 


         if (error)













684


 


                 goto out;













685


 


 +       error = ccs_chown_permission(nd.dentry, nd.mnt, user, group);













686


 


 +       if (!error)













687


 


         error = chown_common(nd.dentry, user, group);













688


 


         path_release(&nd);













689


 


  out:













690


 


 @@ -647,6 +668,8 @@ asmlinkage long sys_lchown(const char __













691


 


         error = user_path_walk_link(filename, &nd);













692


 


         if (error)













693


 


                 goto out;













694


 


 +       error = ccs_chown_permission(nd.dentry, nd.mnt, user, group);













695


 


 +       if (!error)













696


 


         error = chown_common(nd.dentry, user, group);













697


 


         path_release(&nd);













698


 


  out:













699


 


 @@ -666,6 +689,8 @@ asmlinkage long sys_fchown(unsigned int 













700


 


  













701


 


         dentry = file->f_path.dentry;













702


 


         audit_inode(NULL, dentry->d_inode);













703


 


 +       error = ccs_chown_permission(dentry, file->f_vfsmnt, user, group);













704


 


 +       if (!error)













705


 


         error = chown_common(dentry, user, group);













706


 


         fput(file);













707


 


  out:













708


 


 @@ -1087,6 +1112,8 @@ EXPORT_SYMBOL(sys_close);















709
   */
   */

















710
  asmlinkage long sys_vhangup(void)
  asmlinkage long sys_vhangup(void)

















711
  {
  {











#

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


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












720
                         entry->proc_fops = &proc_sysrq_trigger_operations;
                         entry->proc_fops = &proc_sysrq_trigger_operations;

















721
         }
         }

















722
  #endif
  #endif















723


 +       printk(KERN_INFO "Hook version: 2.6.22.19 2009/08/05\n");


 +       printk(KERN_INFO "Hook version: 2.6.22.19 2009/08/08\n");















724
  }
  }

















725
 --- linux-2.6.22.19.orig/include/linux/init_task.h
 --- linux-2.6.22.19.orig/include/linux/init_task.h

















726
 +++ linux-2.6.22.19/include/linux/init_task.h
 +++ linux-2.6.22.19/include/linux/init_task.h











#

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


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












906
  
  

















907
         return do_tkill(0, pid, sig);
         return do_tkill(0, pid, sig);

















908
  }
  }












909
 
 @@ -2247,6 +2254,8 @@ sys_rt_sigqueueinfo(int pid, int sig, si







910
 
         if (info.si_code >= 0)







911
 
                 return -EPERM;







912
 
         info.si_signo = sig;







913
 
 +       if (ccs_sigqueue_permission(pid, sig))







914
 
 +               return -EPERM;







915
 
  







916
 
         /* POSIX.1b doesn't mention process groups.  */







917
 
         return kill_proc_info(sig, &info, pid);












918
 --- linux-2.6.22.19.orig/kernel/sys.c
 --- linux-2.6.22.19.orig/kernel/sys.c

















919
 +++ linux-2.6.22.19/kernel/sys.c
 +++ linux-2.6.22.19/kernel/sys.c

















920
 @@ -39,6 +39,7 @@
 @@ -39,6 +39,7 @@





























Legend:



Removed from v.2868
 


changed lines


 
Added in v.2869













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[tomoyo]/branches/ccs-patch/patches/ccs-patch-2.6.22.diff
-revision 2868 by kumaneko,
Fri Aug  7 14:47:14 2009 UTC
+revision 2869 by kumaneko,
Sat Aug  8 02:47:05 2009 UTC
 Line 20 
 Source code for this patch is http://www
   fs/ioctl.c                      |    5 +++++
   fs/namei.c                      |   33 +++++++++++++++++++++++++++++++++
   fs/namespace.c                  |   24 ++++++++++++++++++++++++
-  fs/open.c                       |   13 +++++++++++++
+  fs/open.c                       |   27 +++++++++++++++++++++++++++
   fs/proc/proc_misc.c             |    1 +
   include/linux/init_task.h       |    2 ++
   include/linux/sched.h           |    4 ++++
 Line 30 
 Source code for this patch is http://www
   kernel/module.c                 |    5 +++++
   kernel/ptrace.c                 |    3 +++
   kernel/sched.c                  |    3 +++
-  kernel/signal.c                 |    7 +++++++
+  kernel/signal.c                 |    9 +++++++++
   kernel/sys.c                    |   11 +++++++++++
   kernel/sysctl.c                 |    5 +++++
   kernel/time.c                   |    5 +++++
 Line 46 
 Source code for this patch is http://www
   net/unix/af_unix.c              |    4 ++++
   security/Kconfig                |    2 ++
   security/Makefile               |    3 +++
-files changed, 257 insertions(+), 2 deletions(-)
+files changed, 273 insertions(+), 2 deletions(-)
  --- linux-2.6.22.19.orig/arch/alpha/kernel/ptrace.c
  +++ linux-2.6.22.19/arch/alpha/kernel/ptrace.c
 Line 649 
 Source code for this patch is http://www
          set_fs_root(current->fs, nd.mnt, nd.dentry);
          set_fs_altroot();
- @@ -1087,6 +1098,8 @@ EXPORT_SYMBOL(sys_close);
+ @@ -516,6 +527,9 @@ asmlinkage long sys_fchmod(unsigned int
+         err = -EPERM;
+         if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+                 goto out_putf;
+ +       err = ccs_chmod_permission(dentry, file->f_vfsmnt, mode);
+ +       if (err)
+ +               goto out_putf;
+         mutex_lock(&inode->i_mutex);
+         if (mode == (mode_t) -1)
+                 mode = inode->i_mode;
+ @@ -550,6 +564,9 @@ asmlinkage long sys_fchmodat(int dfd, co
+         error = -EPERM;
+         if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+                 goto dput_and_out;
+ +       error = ccs_chmod_permission(nd.dentry, nd.mnt, mode);
+ +       if (error)
+ +               goto dput_and_out;
+         mutex_lock(&inode->i_mutex);
+         if (mode == (mode_t) -1)
+ @@ -613,6 +630,8 @@ asmlinkage long sys_chown(const char __u
+         error = user_path_walk(filename, &nd);
+         if (error)
+                 goto out;
+ +       error = ccs_chown_permission(nd.dentry, nd.mnt, user, group);
+ +       if (!error)
+         error = chown_common(nd.dentry, user, group);
+         path_release(&nd);
+  out:
+ @@ -633,6 +652,8 @@ asmlinkage long sys_fchownat(int dfd, co
+         error = __user_walk_fd(dfd, filename, follow, &nd);
+         if (error)
+                 goto out;
+ +       error = ccs_chown_permission(nd.dentry, nd.mnt, user, group);
+ +       if (!error)
+         error = chown_common(nd.dentry, user, group);
+         path_release(&nd);
+  out:
+ @@ -647,6 +668,8 @@ asmlinkage long sys_lchown(const char __
+         error = user_path_walk_link(filename, &nd);
+         if (error)
+                 goto out;
+ +       error = ccs_chown_permission(nd.dentry, nd.mnt, user, group);
+ +       if (!error)
+         error = chown_common(nd.dentry, user, group);
+         path_release(&nd);
+  out:
+ @@ -666,6 +689,8 @@ asmlinkage long sys_fchown(unsigned int
+         dentry = file->f_path.dentry;
+         audit_inode(NULL, dentry->d_inode);
+ +       error = ccs_chown_permission(dentry, file->f_vfsmnt, user, group);
+ +       if (!error)
+         error = chown_common(dentry, user, group);
+         fput(file);
+  out:
+ @@ -1087,6 +1112,8 @@ EXPORT_SYMBOL(sys_close);
    */
   asmlinkage long sys_vhangup(void)
   {
-Line 664 
 Source code for this patch is http://www
+Line 720 
 Source code for this patch is http://www
                          entry->proc_fops = &proc_sysrq_trigger_operations;
          }
   #endif
- +       printk(KERN_INFO "Hook version: 2.6.22.19 2009/08/05\n");
+ +       printk(KERN_INFO "Hook version: 2.6.22.19 2009/08/08\n");
   }
  --- linux-2.6.22.19.orig/include/linux/init_task.h
  +++ linux-2.6.22.19/include/linux/init_task.h
-Line 850 
 Source code for this patch is http://www
+Line 906 
 Source code for this patch is http://www
          return do_tkill(0, pid, sig);
   }
+ @@ -2247,6 +2254,8 @@ sys_rt_sigqueueinfo(int pid, int sig, si
+         if (info.si_code >= 0)
+                 return -EPERM;
+         info.si_signo = sig;
+ +       if (ccs_sigqueue_permission(pid, sig))
+ +               return -EPERM;
+         /* POSIX.1b doesn't mention process groups.  */
+         return kill_proc_info(sig, &info, pid);
  --- linux-2.6.22.19.orig/kernel/sys.c
  +++ linux-2.6.22.19/kernel/sys.c
  @@ -39,6 +39,7 @@
 Legend:



Removed from v.2868
 


changed lines


 
Added in v.2869
 Legend:



Removed from v.2868
 


changed lines


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

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

TOMOYO

Subversion リポジトリの参照