Messages in this thread Patch in this message | | | Date | Fri, 4 Oct 2002 18:23:41 -0700 | From | Chris Wright <> | Subject | [PATCH] 2.5.40 capget fix |
| |
Linus,
Daniel Jacobowitz noticed that sys_capget is not behaving properly when called with pid of 0. It is supposed to return current capabilities, not those of swapper. Also cleaned up some duplicate code from a merge error. Patch is tested, please apply.
thanks, -chris
--- 2.5.40/kernel/capability.c Sun Sep 15 12:19:29 2002 +++ 2.5.40-capfix/kernel/capability.c Wed Oct 2 09:24:44 2002 @@ -33,7 +33,7 @@ int ret = 0; pid_t pid; __u32 version; - task_t *target; + task_t *target = current; struct __user_cap_data_struct data; if (get_user(version, &header->version)) @@ -52,21 +52,20 @@ return -EINVAL; spin_lock(&task_capability_lock); - read_lock(&tasklist_lock); - target = find_task_by_pid(pid); - if (!target) { - ret = -ESRCH; - goto out; + if (pid && pid != current->pid) { + read_lock(&tasklist_lock); + target = find_task_by_pid(pid); + read_unlock(&tasklist_lock); + if (!target) { + ret = -ESRCH; + goto out; + } } - 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: - read_unlock(&tasklist_lock); spin_unlock(&task_capability_lock); if (!ret && copy_to_user(dataptr, &data, sizeof data)) - 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/
| |