From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762761AbZEFWGl (ORCPT ); Wed, 6 May 2009 18:06:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761482AbZEFVyr (ORCPT ); Wed, 6 May 2009 17:54:47 -0400 Received: from kroah.org ([198.145.64.141]:57187 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761396AbZEFVyo (ORCPT ); Wed, 6 May 2009 17:54:44 -0400 X-Mailbox-Line: From gregkh@mini.kroah.org Wed May 6 14:47:59 2009 Message-Id: <20090506214759.276395562@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Wed, 06 May 2009 14:45:57 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Oleg Nesterov , Roland McGrath , David Howells , James Morris Subject: [patch 29/58] ptrace: ptrace_attach: fix the usage of ->cred_exec_mutex References: <20090506214528.660389067@mini.kroah.org> Content-Disposition: inline; filename=ptrace-ptrace_attach-fix-the-usage-of-cred_exec_mutex.patch In-Reply-To: <20090506215017.GA21981@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.29-stable review patch. If anyone has any objections, please let us know. ------------------ From: Oleg Nesterov commit cad81bc2529ab8c62b6fdc83a1c0c7f4a87209eb upstream. ptrace_attach() needs task->cred_exec_mutex, not current->cred_exec_mutex. Signed-off-by: Oleg Nesterov Acked-by: Roland McGrath Acked-by: David Howells Signed-off-by: James Morris Signed-off-by: Greg Kroah-Hartman --- kernel/ptrace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -186,7 +186,7 @@ int ptrace_attach(struct task_struct *ta /* Protect exec's credential calculations against our interference; * SUID, SGID and LSM creds get determined differently under ptrace. */ - retval = mutex_lock_interruptible(¤t->cred_exec_mutex); + retval = mutex_lock_interruptible(&task->cred_exec_mutex); if (retval < 0) goto out; @@ -230,7 +230,7 @@ repeat: bad: write_unlock_irqrestore(&tasklist_lock, flags); task_unlock(task); - mutex_unlock(¤t->cred_exec_mutex); + mutex_unlock(&task->cred_exec_mutex); out: return retval; }