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

TOMOYO

 Subversion リポジトリの参照



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




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



 Parent Directory

|  Revision Log



|  Patch














revision 1498 by kumaneko,
Fri Aug 29 12:08:57 2008 UTC




revision 1769 by kumaneko,
Thu Oct 30 08:38:46 2008 UTC






#

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


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












9
  arch/mips/kernel/ptrace32.c     |    9 +++
  arch/mips/kernel/ptrace32.c     |    9 +++

















10
  arch/powerpc/kernel/ptrace32.c  |    9 +++
  arch/powerpc/kernel/ptrace32.c  |    9 +++

















11
  arch/s390/kernel/ptrace.c       |    9 +++
  arch/s390/kernel/ptrace.c       |    9 +++














  arch/sh64/kernel/ptrace.c       |    9 +++
 













12
  arch/sparc/kernel/ptrace.c      |   11 +++
  arch/sparc/kernel/ptrace.c      |   11 +++

















13
  arch/sparc64/kernel/ptrace.c    |   11 +++
  arch/sparc64/kernel/ptrace.c    |   11 +++

















14
  arch/x86_64/ia32/ptrace32.c     |    9 +++
  arch/x86_64/ia32/ptrace32.c     |    9 +++











#

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


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












44
  net/ipv6/inet6_hashtables.c     |    7 ++
  net/ipv6/inet6_hashtables.c     |    7 ++

















45
  net/socket.c                    |   41 ++++++++++++++
  net/socket.c                    |   41 ++++++++++++++

















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















47


  43 files changed, 680 insertions(+), 2 deletions(-)


  42 files changed, 671 insertions(+), 2 deletions(-)















48
 
 

















49
 --- linux-2.6.21.7.orig/arch/alpha/kernel/ptrace.c
 --- linux-2.6.21.7.orig/arch/alpha/kernel/ptrace.c

















50
 +++ linux-2.6.21.7/arch/alpha/kernel/ptrace.c
 +++ linux-2.6.21.7/arch/alpha/kernel/ptrace.c











#

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


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












221
         lock_kernel();
         lock_kernel();

















222
         if (request == PTRACE_TRACEME) {
         if (request == PTRACE_TRACEME) {

















223
                  ret = ptrace_traceme();
                  ret = ptrace_traceme();














 --- linux-2.6.21.7.orig/arch/sh64/kernel/ptrace.c
 










 +++ linux-2.6.21.7/arch/sh64/kernel/ptrace.c
 










 @@ -35,6 +35,9 @@
 










  #include <asm/system.h>
 










  #include <asm/processor.h>
 










  #include <asm/mmu_context.h>
 










 +/***** TOMOYO Linux start. *****/
 










 +#include <linux/tomoyo.h>
 










 +/***** TOMOYO Linux end. *****/
 










  
 










  /* This mask defines the bits of the SR which the user is not allowed to
 










     change, which are everything except S, Q, M, PR, SZ, FR. */
 










 @@ -271,6 +274,12 @@ asmlinkage int sh64_ptrace(long request,
 










         extern void poke_real_address_q(unsigned long long addr, unsigned long long data);
 










  #define WPC_DBRMODE 0x0d104008
 










         static int first_call = 1;
 










 +       /***** TOMOYO Linux start. *****/
 










 +#ifdef TOMOYO_SYS_PTRACE
 










 +       if (!ccs_capable(TOMOYO_SYS_PTRACE))
 










 +               return -EPERM;
 










 +#endif
 










 +       /***** TOMOYO Linux end. *****/
 










  
 










         lock_kernel();
 










         if (first_call) {
 













224
 --- linux-2.6.21.7.orig/arch/sparc/kernel/ptrace.c
 --- linux-2.6.21.7.orig/arch/sparc/kernel/ptrace.c

















225
 +++ linux-2.6.21.7/arch/sparc/kernel/ptrace.c
 +++ linux-2.6.21.7/arch/sparc/kernel/ptrace.c

















226
 @@ -23,6 +23,9 @@
 @@ -23,6 +23,9 @@











#

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


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












916
  #endif
  #endif

















917
 +       /***** CCS start. *****/
 +       /***** CCS start. *****/

















918
 +#if defined(CONFIG_SAKURA) || defined(CONFIG_TOMOYO)
 +#if defined(CONFIG_SAKURA) || defined(CONFIG_TOMOYO)















919


 +       printk(KERN_INFO "Hook version: 2.6.21.7 2008/08/27\n");


 +       printk(KERN_INFO "Hook version: 2.6.21.7 2008/10/30\n");















920
 +#endif
 +#endif

















921
 +       /***** CCS end. *****/
 +       /***** CCS end. *****/

















922
  }
  }





























Legend:



Removed from v.1498
 


changed lines


 
Added in v.1769













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.21.diff
-revision 1498 by kumaneko,
Fri Aug 29 12:08:57 2008 UTC
+revision 1769 by kumaneko,
Thu Oct 30 08:38:46 2008 UTC
 Line 9 
 Source code for this patch is http://www
   arch/mips/kernel/ptrace32.c     |    9 +++
   arch/powerpc/kernel/ptrace32.c  |    9 +++
   arch/s390/kernel/ptrace.c       |    9 +++
-  arch/sh64/kernel/ptrace.c       |    9 +++
   arch/sparc/kernel/ptrace.c      |   11 +++
   arch/sparc64/kernel/ptrace.c    |   11 +++
   arch/x86_64/ia32/ptrace32.c     |    9 +++
-Line 45 
 Source code for this patch is http://www
+Line 44 
 Source code for this patch is http://www
   net/ipv6/inet6_hashtables.c     |    7 ++
   net/socket.c                    |   41 ++++++++++++++
   net/unix/af_unix.c              |   15 +++++
-files changed, 680 insertions(+), 2 deletions(-)
+files changed, 671 insertions(+), 2 deletions(-)
  --- linux-2.6.21.7.orig/arch/alpha/kernel/ptrace.c
  +++ linux-2.6.21.7/arch/alpha/kernel/ptrace.c
-Line 222 
 Source code for this patch is http://www
+Line 221 
 Source code for this patch is http://www
          lock_kernel();
          if (request == PTRACE_TRACEME) {
                   ret = ptrace_traceme();
- --- linux-2.6.21.7.orig/arch/sh64/kernel/ptrace.c
- +++ linux-2.6.21.7/arch/sh64/kernel/ptrace.c
- @@ -35,6 +35,9 @@
-  #include <asm/system.h>
-  #include <asm/processor.h>
-  #include <asm/mmu_context.h>
- +/***** TOMOYO Linux start. *****/
- +#include <linux/tomoyo.h>
- +/***** TOMOYO Linux end. *****/
-  /* This mask defines the bits of the SR which the user is not allowed to
-     change, which are everything except S, Q, M, PR, SZ, FR. */
- @@ -271,6 +274,12 @@ asmlinkage int sh64_ptrace(long request,
-         extern void poke_real_address_q(unsigned long long addr, unsigned long long data);
-  #define WPC_DBRMODE 0x0d104008
-         static int first_call = 1;
- +       /***** TOMOYO Linux start. *****/
- +#ifdef TOMOYO_SYS_PTRACE
- +       if (!ccs_capable(TOMOYO_SYS_PTRACE))
- +               return -EPERM;
- +#endif
- +       /***** TOMOYO Linux end. *****/
-         lock_kernel();
-         if (first_call) {
  --- linux-2.6.21.7.orig/arch/sparc/kernel/ptrace.c
  +++ linux-2.6.21.7/arch/sparc/kernel/ptrace.c
  @@ -23,6 +23,9 @@
-Line 942 
 Source code for this patch is http://www
+Line 916 
 Source code for this patch is http://www
   #endif
  +       /***** CCS start. *****/
  +#if defined(CONFIG_SAKURA) || defined(CONFIG_TOMOYO)
- +       printk(KERN_INFO "Hook version: 2.6.21.7 2008/08/27\n");
+ +       printk(KERN_INFO "Hook version: 2.6.21.7 2008/10/30\n");
  +#endif
  +       /***** CCS end. *****/
   }
 Legend:



Removed from v.1498
 


changed lines


 
Added in v.1769
 Legend:



Removed from v.1498
 


changed lines


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

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

TOMOYO

Subversion リポジトリの参照