Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove gotos #490

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove gotos #490

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8b68f7
Remove Gotos
Nov 21, 2017
ebaba10
Update commoncap.c
Nov 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions security/commoncap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,15 +149,20 @@ int cap_ptrace_access_check(struct task_struct *child, unsigned int mode)
caller_caps = &cred->cap_effective;
else
caller_caps = &cred->cap_permitted;
if (cred->user_ns == child_cred->user_ns &&
cap_issubset(child_cred->cap_permitted, *caller_caps))
goto out;
if (ns_capable(child_cred->user_ns, CAP_SYS_PTRACE))
goto out;

if ((cred->user_ns == child_cred->user_ns &&
cap_issubset(child_cred->cap_permitted, *caller_caps)) || ns_capable(child_cred->user_ns, CAP_SYS_PTRACE)) {

rcu_read_unlock();
return ret;

}

ret = -EPERM;
out:
rcu_read_unlock();
return ret;


}

/**
Expand All @@ -181,13 +186,15 @@ int cap_ptrace_traceme(struct task_struct *parent)
rcu_read_lock();
cred = __task_cred(parent);
child_cred = current_cred();
if (cred->user_ns == child_cred->user_ns &&
cap_issubset(child_cred->cap_permitted, cred->cap_permitted))
goto out;
if (has_ns_capability(parent, child_cred->user_ns, CAP_SYS_PTRACE))
goto out;
if ((cred->user_ns == child_cred->user_ns &&
cap_issubset(child_cred->cap_permitted, cred->cap_permitted)) || has_ns_capability(parent, child_cred->user_ns, CAP_SYS_PTRACE)) {

rcu_read_unlock();
return ret;

}

ret = -EPERM;
out:
rcu_read_unlock();
return ret;
}
Expand Down