15 |
fs/Kconfig | 2 |
fs/Kconfig | 2 |
16 |
fs/Makefile | 2 |
fs/Makefile | 2 |
17 |
fs/attr.c | 19 ++++++ |
fs/attr.c | 19 ++++++ |
18 |
fs/compat.c | 11 +++ |
fs/compat.c | 15 ++++- |
19 |
fs/exec.c | 21 ++++++- |
fs/exec.c | 21 ++++++- |
20 |
fs/fcntl.c | 9 +++ |
fs/fcntl.c | 9 +++ |
21 |
fs/ioctl.c | 7 ++ |
fs/ioctl.c | 11 +++ |
22 |
fs/namei.c | 118 ++++++++++++++++++++++++++++++++++++++++ |
fs/namei.c | 118 ++++++++++++++++++++++++++++++++++++++++ |
23 |
fs/namespace.c | 50 ++++++++++++++++ |
fs/namespace.c | 50 ++++++++++++++++ |
24 |
fs/open.c | 27 +++++++++ |
fs/open.c | 27 +++++++++ |
44 |
net/ipv6/udp.c | 11 +++ |
net/ipv6/udp.c | 11 +++ |
45 |
net/socket.c | 43 +++++++++++++- |
net/socket.c | 43 +++++++++++++- |
46 |
net/unix/af_unix.c | 15 +++++ |
net/unix/af_unix.c | 15 +++++ |
47 |
42 files changed, 681 insertions(+), 8 deletions(-) |
42 files changed, 689 insertions(+), 8 deletions(-) |
48 |
|
|
49 |
--- linux-2.6.18-23etch1.orig/arch/alpha/kernel/ptrace.c |
--- linux-2.6.18-23etch1.orig/arch/alpha/kernel/ptrace.c |
50 |
+++ linux-2.6.18-23etch1/arch/alpha/kernel/ptrace.c |
+++ linux-2.6.18-23etch1/arch/alpha/kernel/ptrace.c |
351 |
|
|
352 |
extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat); |
extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat); |
353 |
|
|
354 |
@@ -421,6 +424,12 @@ asmlinkage long compat_sys_ioctl(unsigne |
@@ -397,6 +400,10 @@ asmlinkage long compat_sys_ioctl(unsigne |
355 |
|
|
356 |
|
/* RED-PEN how should LSM module know it's handling 32bit? */ |
357 |
|
error = security_file_ioctl(filp, cmd, arg); |
358 |
|
+ /***** TOMOYO Linux start. *****/ |
359 |
|
+ if (!error) |
360 |
|
+ error = ccs_check_ioctl_permission(filp, cmd, arg); |
361 |
|
+ /***** TOMOYO Linux end. *****/ |
362 |
|
if (error) |
363 |
|
goto out_fput; |
364 |
|
|
365 |
|
@@ -421,6 +428,12 @@ asmlinkage long compat_sys_ioctl(unsigne |
366 |
/*FALL THROUGH*/ |
/*FALL THROUGH*/ |
367 |
|
|
368 |
default: |
default: |
375 |
if (filp->f_op && filp->f_op->compat_ioctl) { |
if (filp->f_op && filp->f_op->compat_ioctl) { |
376 |
error = filp->f_op->compat_ioctl(filp, cmd, arg); |
error = filp->f_op->compat_ioctl(filp, cmd, arg); |
377 |
if (error != -ENOIOCTLCMD) |
if (error != -ENOIOCTLCMD) |
378 |
@@ -1567,7 +1576,7 @@ int compat_do_execve(char * filename, |
@@ -1567,7 +1580,7 @@ int compat_do_execve(char * filename, |
379 |
if (retval < 0) |
if (retval < 0) |
380 |
goto out; |
goto out; |
381 |
|
|
483 |
|
|
484 |
if (filp->f_op->unlocked_ioctl) { |
if (filp->f_op->unlocked_ioctl) { |
485 |
error = filp->f_op->unlocked_ioctl(filp, cmd, arg); |
error = filp->f_op->unlocked_ioctl(filp, cmd, arg); |
486 |
|
@@ -167,6 +174,10 @@ asmlinkage long sys_ioctl(unsigned int f |
487 |
|
goto out; |
488 |
|
|
489 |
|
error = security_file_ioctl(filp, cmd, arg); |
490 |
|
+ /***** TOMOYO Linux start. *****/ |
491 |
|
+ if (!error) |
492 |
|
+ error = ccs_check_ioctl_permission(filp, cmd, arg); |
493 |
|
+ /***** TOMOYO Linux end. *****/ |
494 |
|
if (error) |
495 |
|
goto out_fput; |
496 |
|
|
497 |
--- linux-2.6.18-23etch1.orig/fs/namei.c |
--- linux-2.6.18-23etch1.orig/fs/namei.c |
498 |
+++ linux-2.6.18-23etch1/fs/namei.c |
+++ linux-2.6.18-23etch1/fs/namei.c |
499 |
@@ -37,6 +37,10 @@ |
@@ -37,6 +37,10 @@ |
926 |
#endif |
#endif |
927 |
+ /***** CCS start. *****/ |
+ /***** CCS start. *****/ |
928 |
+#if defined(CONFIG_SAKURA) || defined(CONFIG_TOMOYO) |
+#if defined(CONFIG_SAKURA) || defined(CONFIG_TOMOYO) |
929 |
+ printk(KERN_INFO "Hook version: 2.6.18-23etch1 2008/12/16\n"); |
+ printk(KERN_INFO "Hook version: 2.6.18-23etch1 2009/03/18\n"); |
930 |
+#endif |
+#endif |
931 |
+ /***** CCS end. *****/ |
+ /***** CCS end. *****/ |
932 |
} |
} |