git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
[pandora-kernel.git]
/
kernel
/
capability.c
diff --git
a/kernel/capability.c
b/kernel/capability.c
index
1a4d8a4
..
edb845a
100644
(file)
--- a/
kernel/capability.c
+++ b/
kernel/capability.c
@@
-46,7
+46,7
@@
asmlinkage long sys_capget(cap_user_header_t header, cap_user_data_t dataptr)
int ret = 0;
pid_t pid;
__u32 version;
int ret = 0;
pid_t pid;
__u32 version;
-
task_
t *target;
+
struct task_struc
t *target;
struct __user_cap_data_struct data;
if (get_user(version, &header->version))
struct __user_cap_data_struct data;
if (get_user(version, &header->version))
@@
-96,7
+96,7
@@
static inline int cap_set_pg(int pgrp, kernel_cap_t *effective,
kernel_cap_t *inheritable,
kernel_cap_t *permitted)
{
kernel_cap_t *inheritable,
kernel_cap_t *permitted)
{
-
task_
t *g, *target;
+
struct task_struc
t *g, *target;
int ret = -EPERM;
int found = 0;
int ret = -EPERM;
int found = 0;
@@
-128,12
+128,12
@@
static inline int cap_set_all(kernel_cap_t *effective,
kernel_cap_t *inheritable,
kernel_cap_t *permitted)
{
kernel_cap_t *inheritable,
kernel_cap_t *permitted)
{
-
task_
t *g, *target;
+
struct task_struc
t *g, *target;
int ret = -EPERM;
int found = 0;
do_each_thread(g, target) {
int ret = -EPERM;
int found = 0;
do_each_thread(g, target) {
- if (target == current ||
target->pid == 1
)
+ if (target == current ||
is_init(target)
)
continue;
found = 1;
if (security_capset_check(target, effective, inheritable,
continue;
found = 1;
if (security_capset_check(target, effective, inheritable,
@@
-172,7
+172,7
@@
asmlinkage long sys_capset(cap_user_header_t header, const cap_user_data_t data)
{
kernel_cap_t inheritable, permitted, effective;
__u32 version;
{
kernel_cap_t inheritable, permitted, effective;
__u32 version;
-
task_
t *target;
+
struct task_struc
t *target;
int ret;
pid_t pid;
int ret;
pid_t pid;