* Chris Wright (chris@wirex.com) wrote:
> I'll follow up with the patch that removes the duplicate code.
This patch, relative to the last patch in this thread, removes the
code from cap_sysget that fills out the capability set being returned
to userspace. The module handles this in a policy specific way. This
updates the dummy.c module to fill in return data according to superuser
policy, and also disables setting capabilities in superuser policy.
[PATCH] remove duplicated assignment from sys_capget.
===== kernel/capability.c 1.6 vs edited =====
--- 1.6/kernel/capability.c Tue Nov 19 15:57:15 2002
+++ edited/kernel/capability.c Tue Nov 19 15:59:38 2002
@@ -63,9 +63,6 @@
} else
target = current;
- data.permitted = cap_t(target->cap_permitted);
- data.inheritable = cap_t(target->cap_inheritable);
- data.effective = cap_t(target->cap_effective);
ret = security_ops->capget(target, &data.effective, &data.inheritable, &data.permitted);
out:
===== security/dummy.c 1.4 vs edited =====
--- 1.4/security/dummy.c Fri Oct 11 14:22:54 2002
+++ edited/security/dummy.c Tue Nov 19 14:58:11 2002
@@ -27,6 +27,17 @@
static int dummy_capget (struct task_struct *target, kernel_cap_t * effective,
kernel_cap_t * inheritable, kernel_cap_t * permitted)
{
+ *effective = *inheritable = *permitted = 0;
+ if (!issecure(SECURE_NOROOT)) {
+ if (target->euid == 0) {
+ *permitted |= (~0 & ~CAP_FS_MASK);
+ *effective |= (~0 & ~CAP_TO_MASK(CAP_SETPCAP) & ~CAP_FS_MASK);
+ }
+ if (target->fsuid == 0) {
+ *permitted |= CAP_FS_MASK;
+ *effective |= CAP_FS_MASK;
+ }
+ }
return 0;
}
@@ -35,7 +46,7 @@
kernel_cap_t * inheritable,
kernel_cap_t * permitted)
{
- return 0;
+ return -EPERM;
}
static void dummy_capset_set (struct task_struct *target,
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sat Nov 23 2002 - 22:00:30 EST