From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751293AbZH1JLy (ORCPT ); Fri, 28 Aug 2009 05:11:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751119AbZH1JLy (ORCPT ); Fri, 28 Aug 2009 05:11:54 -0400 Received: from server1.wserver.cz ([82.113.45.157]:38086 "EHLO server1.wserver.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750772AbZH1JLx (ORCPT ); Fri, 28 Aug 2009 05:11:53 -0400 From: Jiri Slaby To: James Morris Cc: linux-kernel@vger.kernel.org, Jiri Slaby , Stephen Smalley , James Morris , Eric Paris , David Howells Subject: [PATCH 1/1] SECURITY: selinux, fix update_rlimit_cpu parameter Date: Fri, 28 Aug 2009 11:11:54 +0200 Message-Id: <1251450714-1498-1-git-send-email-jirislaby@gmail.com> X-Mailer: git-send-email 1.6.3.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Don't pass rlim_cur member of RLIM_NLIMITS-1=RLIMIT_RTTIME limit to update_rlimit_cpu() in selinux_bprm_committing_creds. Use proper rlim[RLIMIT_CPU].rlim_cur instead. Introduced by f06febc96ba8e0af80bcc3eaec0a109e88275fac (timers: fix itimer/many thread hang) Signed-off-by: Jiri Slaby Cc: Stephen Smalley Cc: James Morris Cc: Eric Paris Cc: David Howells --- security/selinux/hooks.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 205f5b0..839622a 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -2360,7 +2360,7 @@ static void selinux_bprm_committing_creds(struct linux_binprm *bprm) initrlim = init_task.signal->rlim + i; rlim->rlim_cur = min(rlim->rlim_max, initrlim->rlim_cur); } - update_rlimit_cpu(rlim->rlim_cur); + update_rlimit_cpu(current->signal->rlim[RLIMIT_CPU].rlim_cur); } } -- 1.6.3.3