[linux] 01/02: Fix reference leak in "perf/core: Fix concurrent sys_perf_event_open() ..."

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch jessie-security
in repository linux.

commit 41ab2a29e2a5c7e2e8ffbc775035244f849ce38b
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue Feb 21 00:50:15 2017 +0000

    Fix reference leak in "perf/core: Fix concurrent sys_perf_event_open() ..."
    
    We now need to drop 2 references to gctx, not 1, in the final
    if (move_group) block.
---
 ...f-core-Fix-concurrent-sys_perf_event_open-vs.-mov.patch | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/debian/patches/bugfix/all/perf-core-Fix-concurrent-sys_perf_event_open-vs.-mov.patch b/debian/patches/bugfix/all/perf-core-Fix-concurrent-sys_perf_event_open-vs.-mov.patch
index 855254e..64680cc 100644
--- a/debian/patches/bugfix/all/perf-core-Fix-concurrent-sys_perf_event_open-vs.-mov.patch
+++ b/debian/patches/bugfix/all/perf-core-Fix-concurrent-sys_perf_event_open-vs.-mov.patch
@@ -129,20 +129,16 @@ Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
  		perf_remove_from_context(group_leader, false);
  
  		/*
-@@ -7569,10 +7617,8 @@ SYSCALL_DEFINE5(perf_event_open,
- 	perf_install_in_context(ctx, event, event->cpu);
+@@ -7570,7 +7618,7 @@ SYSCALL_DEFINE5(perf_event_open,
  	perf_unpin_context(ctx);
  
--	if (move_group) {
+ 	if (move_group) {
 -		mutex_unlock(&gctx->mutex);
--		put_ctx(gctx);
--	}
-+	if (move_group)
 +		perf_event_ctx_unlock(group_leader, gctx);
+ 		put_ctx(gctx);
+ 	}
  	mutex_unlock(&ctx->mutex);
- 
- 	put_online_cpus();
-@@ -7599,6 +7645,11 @@ SYSCALL_DEFINE5(perf_event_open,
+@@ -7599,6 +7647,11 @@ SYSCALL_DEFINE5(perf_event_open,
  	fd_install(event_fd, event_file);
  	return event_fd;
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git