mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Yama: add PR_SET_PTRACER_ANY
For a process to entirely disable Yama ptrace restrictions, it can use the special PR_SET_PTRACER_ANY pid to indicate that any otherwise allowed process may ptrace it. This is stronger than calling PR_SET_PTRACER with pid "1" because it includes processes in external pid namespaces. This is currently needed by the Chrome renderer, since its crash handler (Breakpad) runs external to the renderer's pid namespace. Signed-off-by: Kees Cook <[email protected]> Signed-off-by: James Morris <[email protected]>
This commit is contained in:
parent
3ab1aff894
commit
bf06189e4d
3 changed files with 13 additions and 3 deletions
|
|
@ -84,7 +84,7 @@ static void yama_ptracer_del(struct task_struct *tracer,
|
|||
spin_lock_bh(&ptracer_relations_lock);
|
||||
list_for_each_entry_safe(relation, safe, &ptracer_relations, node)
|
||||
if (relation->tracee == tracee ||
|
||||
relation->tracer == tracer) {
|
||||
(tracer && relation->tracer == tracer)) {
|
||||
list_del(&relation->node);
|
||||
kfree(relation);
|
||||
}
|
||||
|
|
@ -138,6 +138,8 @@ static int yama_task_prctl(int option, unsigned long arg2, unsigned long arg3,
|
|||
if (arg2 == 0) {
|
||||
yama_ptracer_del(NULL, myself);
|
||||
rc = 0;
|
||||
} else if (arg2 == PR_SET_PTRACER_ANY) {
|
||||
rc = yama_ptracer_add(NULL, myself);
|
||||
} else {
|
||||
struct task_struct *tracer;
|
||||
|
||||
|
|
@ -208,6 +210,7 @@ static int ptracer_exception_found(struct task_struct *tracer,
|
|||
int rc = 0;
|
||||
struct ptrace_relation *relation;
|
||||
struct task_struct *parent = NULL;
|
||||
bool found = false;
|
||||
|
||||
spin_lock_bh(&ptracer_relations_lock);
|
||||
rcu_read_lock();
|
||||
|
|
@ -216,10 +219,11 @@ static int ptracer_exception_found(struct task_struct *tracer,
|
|||
list_for_each_entry(relation, &ptracer_relations, node)
|
||||
if (relation->tracee == tracee) {
|
||||
parent = relation->tracer;
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
|
||||
if (task_is_descendant(parent, tracer))
|
||||
if (found && (parent == NULL || task_is_descendant(parent, tracer)))
|
||||
rc = 1;
|
||||
rcu_read_unlock();
|
||||
spin_unlock_bh(&ptracer_relations_lock);
|
||||
|
|
|
|||
Loading…
Reference in a new issue