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 2855 by kumaneko,
Thu Aug  6 03:24:41 2009 UTC




revision 2858 by kumaneko,
Thu Aug  6 06:53:20 2009 UTC






#

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


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












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

















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

















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














  fs/Kconfig                      |    2 ++
 










  fs/Makefile                     |    2 ++
 













15
  fs/attr.c                       |    5 +++++
  fs/attr.c                       |    5 +++++

















16
  fs/compat.c                     |    9 ++++++++-
  fs/compat.c                     |    9 ++++++++-

















17
  fs/exec.c                       |   12 +++++++++++-
  fs/exec.c                       |   12 +++++++++++-











#

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


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












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

















21
  fs/namespace.c                  |   28 +++++++++++++++++++++++++++-
  fs/namespace.c                  |   28 +++++++++++++++++++++++++++-

















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














  fs/proc/Makefile                |    3 +++
 













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 ++

















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











#

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


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












42
  net/ipv6/udp.c                  |    9 +++++++++
  net/ipv6/udp.c                  |    9 +++++++++

















43
  net/socket.c                    |   26 ++++++++++++++++++++++++--
  net/socket.c                    |   26 ++++++++++++++++++++++++--

















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















45


  43 files changed, 282 insertions(+), 9 deletions(-)


  security/Kconfig                |    2 ++













46


 


  security/Makefile               |    3 +++













47


 


  42 files changed, 280 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 241 
 Source code for this patch is "apt-get i


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












240
  
  

















241
         switch (request) { 
         switch (request) { 

















242
         case PTRACE_TRACEME:
         case PTRACE_TRACEME:














 --- linux-2.6.18-24etch2.orig/fs/Kconfig
 










 +++ linux-2.6.18-24etch2/fs/Kconfig
 










 @@ -1931,5 +1931,7 @@ endmenu
 










  
 










  source "fs/nls/Kconfig"
 










  
 










 +source "fs/Kconfig.ccs"
 










 +
 










  endmenu
 










  
 










 --- linux-2.6.18-24etch2.orig/fs/Makefile
 










 +++ linux-2.6.18-24etch2/fs/Makefile
 










 @@ -102,3 +102,5 @@ obj-$(CONFIG_HOSTFS)                += hostfs/
 










  obj-$(CONFIG_HPPFS)            += hppfs/
 










  obj-$(CONFIG_DEBUG_FS)         += debugfs/
 










  obj-$(CONFIG_OCFS2_FS)         += ocfs2/
 










 +
 










 +include $(srctree)/fs/Makefile-2.6.ccs
 













243
 --- linux-2.6.18-24etch2.orig/fs/attr.c
 --- linux-2.6.18-24etch2.orig/fs/attr.c

















244
 +++ linux-2.6.18-24etch2/fs/attr.c
 +++ linux-2.6.18-24etch2/fs/attr.c

















245
 @@ -15,6 +15,7 @@
 @@ -15,6 +15,7 @@











#

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


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












657
         if (capable(CAP_SYS_TTY_CONFIG)) {
         if (capable(CAP_SYS_TTY_CONFIG)) {

















658
                 tty_vhangup(current->signal->tty);
                 tty_vhangup(current->signal->tty);

















659
                 return 0;
                 return 0;














 --- linux-2.6.18-24etch2.orig/fs/proc/Makefile
 










 +++ linux-2.6.18-24etch2/fs/proc/Makefile
 










 @@ -13,3 +13,6 @@ proc-y       += inode.o root.o base.o ge
 










  proc-$(CONFIG_PROC_KCORE)      += kcore.o
 










  proc-$(CONFIG_PROC_VMCORE)     += vmcore.o
 










  proc-$(CONFIG_PROC_DEVICETREE) += proc_devtree.o
 










 +
 










 +proc-$(CONFIG_SAKURA) += ccs_proc.o
 










 +proc-$(CONFIG_TOMOYO) += ccs_proc.o
 













660
 --- linux-2.6.18-24etch2.orig/fs/proc/proc_misc.c
 --- linux-2.6.18-24etch2.orig/fs/proc/proc_misc.c

















661
 +++ linux-2.6.18-24etch2/fs/proc/proc_misc.c
 +++ linux-2.6.18-24etch2/fs/proc/proc_misc.c

















662
 @@ -723,4 +723,5 @@ void __init proc_misc_init(void)
 @@ -723,4 +723,5 @@ void __init proc_misc_init(void)











#

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


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












1257
                 err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0);
                 err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0);

















1258
                 if (err)
                 if (err)

















1259
                         goto out_mknod_dput;
                         goto out_mknod_dput;












1260
 
 --- linux-2.6.18-24etch2.orig/security/Kconfig







1261
 
 +++ linux-2.6.18-24etch2/security/Kconfig







1262
 
 @@ -107,5 +107,7 @@ config SECURITY_SECLVL







1263
 
  







1264
 
  source security/selinux/Kconfig







1265
 
  







1266
 
 +source security/ccsecurity/Kconfig







1267
 
 +







1268
 
  endmenu







1269
 
  







1270
 
 --- linux-2.6.18-24etch2.orig/security/Makefile







1271
 
 +++ linux-2.6.18-24etch2/security/Makefile







1272
 
 @@ -17,3 +17,6 @@ obj-$(CONFIG_SECURITY_SELINUX)                += selin







1273
 
  obj-$(CONFIG_SECURITY_CAPABILITIES)    += commoncap.o capability.o







1274
 
  obj-$(CONFIG_SECURITY_ROOTPLUG)                += commoncap.o root_plug.o







1275
 
  obj-$(CONFIG_SECURITY_SECLVL)          += seclvl.o







1276
 
 +







1277
 
 +subdir-$(CONFIG_CCSECURITY)+= ccsecurity







1278
 
 +obj-$(CONFIG_CCSECURITY)+= ccsecurity/built-in.o
























Legend:



Removed from v.2855
 


changed lines


 
Added in v.2858













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 2855 by kumaneko,
Thu Aug  6 03:24:41 2009 UTC
+revision 2858 by kumaneko,
Thu Aug  6 06:53:20 2009 UTC
 Line 12 
 Source code for this patch is "apt-get i
   arch/sparc/kernel/ptrace.c      |    5 +++++
   arch/sparc64/kernel/ptrace.c    |    5 +++++
   arch/x86_64/ia32/ptrace32.c     |    3 +++
-  fs/Kconfig                      |    2 ++
-  fs/Makefile                     |    2 ++
   fs/attr.c                       |    5 +++++
   fs/compat.c                     |    9 ++++++++-
   fs/exec.c                       |   12 +++++++++++-
-Line 22 
 Source code for this patch is "apt-get i
+Line 20 
 Source code for this patch is "apt-get i
   fs/namei.c                      |   38 ++++++++++++++++++++++++++++++++++++++
   fs/namespace.c                  |   28 +++++++++++++++++++++++++++-
   fs/open.c                       |   14 ++++++++++++++
-  fs/proc/Makefile                |    3 +++
   fs/proc/proc_misc.c             |    1 +
   include/linux/init_task.h       |    2 ++
   include/linux/sched.h           |    4 ++++
-Line 45 
 Source code for this patch is "apt-get i
+Line 42 
 Source code for this patch is "apt-get i
   net/ipv6/udp.c                  |    9 +++++++++
   net/socket.c                    |   26 ++++++++++++++++++++++++--
   net/unix/af_unix.c              |    4 ++++
-files changed, 282 insertions(+), 9 deletions(-)
+  security/Kconfig                |    2 ++
+  security/Makefile               |    3 +++
+files changed, 280 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 241 
 Source code for this patch is "apt-get i
+Line 240 
 Source code for this patch is "apt-get i
          switch (request) {
          case PTRACE_TRACEME:
- --- linux-2.6.18-24etch2.orig/fs/Kconfig
- +++ linux-2.6.18-24etch2/fs/Kconfig
- @@ -1931,5 +1931,7 @@ endmenu
-  source "fs/nls/Kconfig"
- +source "fs/Kconfig.ccs"
- +
-  endmenu
- --- linux-2.6.18-24etch2.orig/fs/Makefile
- +++ linux-2.6.18-24etch2/fs/Makefile
- @@ -102,3 +102,5 @@ obj-$(CONFIG_HOSTFS)                += hostfs/
-  obj-$(CONFIG_HPPFS)            += hppfs/
-  obj-$(CONFIG_DEBUG_FS)         += debugfs/
-  obj-$(CONFIG_OCFS2_FS)         += ocfs2/
- +
- +include $(srctree)/fs/Makefile-2.6.ccs
  --- linux-2.6.18-24etch2.orig/fs/attr.c
  +++ linux-2.6.18-24etch2/fs/attr.c
  @@ -15,6 +15,7 @@
-Line 676 
 Source code for this patch is "apt-get i
+Line 657 
 Source code for this patch is "apt-get i
          if (capable(CAP_SYS_TTY_CONFIG)) {
                  tty_vhangup(current->signal->tty);
                  return 0;
- --- linux-2.6.18-24etch2.orig/fs/proc/Makefile
- +++ linux-2.6.18-24etch2/fs/proc/Makefile
- @@ -13,3 +13,6 @@ proc-y       += inode.o root.o base.o ge
-  proc-$(CONFIG_PROC_KCORE)      += kcore.o
-  proc-$(CONFIG_PROC_VMCORE)     += vmcore.o
-  proc-$(CONFIG_PROC_DEVICETREE) += proc_devtree.o
- +
- +proc-$(CONFIG_SAKURA) += ccs_proc.o
- +proc-$(CONFIG_TOMOYO) += ccs_proc.o
  --- linux-2.6.18-24etch2.orig/fs/proc/proc_misc.c
  +++ linux-2.6.18-24etch2/fs/proc/proc_misc.c
  @@ -723,4 +723,5 @@ void __init proc_misc_init(void)
-Line 1285 
 Source code for this patch is "apt-get i
+Line 1257 
 Source code for this patch is "apt-get i
                  err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0);
                  if (err)
                          goto out_mknod_dput;
+ --- linux-2.6.18-24etch2.orig/security/Kconfig
+ +++ linux-2.6.18-24etch2/security/Kconfig
+ @@ -107,5 +107,7 @@ config SECURITY_SECLVL
+  source security/selinux/Kconfig
+ +source security/ccsecurity/Kconfig
+ +
+  endmenu
+ --- linux-2.6.18-24etch2.orig/security/Makefile
+ +++ linux-2.6.18-24etch2/security/Makefile
+ @@ -17,3 +17,6 @@ obj-$(CONFIG_SECURITY_SELINUX)                += selin
+  obj-$(CONFIG_SECURITY_CAPABILITIES)    += commoncap.o capability.o
+  obj-$(CONFIG_SECURITY_ROOTPLUG)                += commoncap.o root_plug.o
+  obj-$(CONFIG_SECURITY_SECLVL)          += seclvl.o
+ +
+ +subdir-$(CONFIG_CCSECURITY)+= ccsecurity
+ +obj-$(CONFIG_CCSECURITY)+= ccsecurity/built-in.o
 Legend:



Removed from v.2855
 


changed lines


 
Added in v.2858
 Legend:



Removed from v.2855
 


changed lines


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

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

TOMOYO

Subversion リポジトリの参照