lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 10 Apr 2017 17:32:13 +0200 From: Jiri Slaby <jslaby@...e.cz> To: stable@...r.kernel.org Cc: linux-kernel@...r.kernel.org, Peter Zijlstra <peterz@...radead.org>, Alexander Shishkin <alexander.shishkin@...ux.intel.com>, Arnaldo Carvalho de Melo <acme@...nel.org>, Arnaldo Carvalho de Melo <acme@...hat.com>, Dmitry Vyukov <dvyukov@...gle.com>, Frederic Weisbecker <fweisbec@...il.com>, Jiri Olsa <jolsa@...hat.com>, Linus Torvalds <torvalds@...ux-foundation.org>, Mathieu Desnoyers <mathieu.desnoyers@...icios.com>, Stephane Eranian <eranian@...gle.com>, Thomas Gleixner <tglx@...utronix.de>, Vince Weaver <vincent.weaver@...ne.edu>, oleg@...hat.com, Ingo Molnar <mingo@...nel.org>, Jiri Slaby <jslaby@...e.cz> Subject: [PATCH 3.12 052/142] perf/core: Fix event inheritance on fork() From: Peter Zijlstra <peterz@...radead.org> 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit e7cc4865f0f31698ef2f7aac01a50e78968985b7 upstream. While hunting for clues to a use-after-free, Oleg spotted that perf_event_init_context() can loose an error value with the result that fork() can succeed even though we did not fully inherit the perf event context. Spotted-by: Oleg Nesterov <oleg@...hat.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org> Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com> Cc: Arnaldo Carvalho de Melo <acme@...nel.org> Cc: Arnaldo Carvalho de Melo <acme@...hat.com> Cc: Dmitry Vyukov <dvyukov@...gle.com> Cc: Frederic Weisbecker <fweisbec@...il.com> Cc: Jiri Olsa <jolsa@...hat.com> Cc: Linus Torvalds <torvalds@...ux-foundation.org> Cc: Mathieu Desnoyers <mathieu.desnoyers@...icios.com> Cc: Peter Zijlstra <peterz@...radead.org> Cc: Stephane Eranian <eranian@...gle.com> Cc: Thomas Gleixner <tglx@...utronix.de> Cc: Vince Weaver <vincent.weaver@...ne.edu> Cc: oleg@...hat.com Fixes: 889ff0150661 ("perf/core: Split context's event group list into pinned and non-pinned lists") Link: http://lkml.kernel.org/r/20170316125823.190342547@infradead.org Signed-off-by: Ingo Molnar <mingo@...nel.org> Signed-off-by: Jiri Slaby <jslaby@...e.cz> --- kernel/events/core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index a4a1516f3efc..0a360d3868c5 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -7754,7 +7754,7 @@ int perf_event_init_context(struct task_struct *child, int ctxn) ret = inherit_task_group(event, parent, parent_ctx, child, ctxn, &inherited_all); if (ret) - break; + goto out_unlock; } /* @@ -7770,7 +7770,7 @@ int perf_event_init_context(struct task_struct *child, int ctxn) ret = inherit_task_group(event, parent, parent_ctx, child, ctxn, &inherited_all); if (ret) - break; + goto out_unlock; } raw_spin_lock_irqsave(&parent_ctx->lock, flags); @@ -7798,6 +7798,7 @@ int perf_event_init_context(struct task_struct *child, int ctxn) } raw_spin_unlock_irqrestore(&parent_ctx->lock, flags); +out_unlock: mutex_unlock(&parent_ctx->mutex); perf_unpin_context(parent_ctx); -- 2.12.2
Powered by blists - more mailing lists