From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27E15C433E1 for ; Mon, 29 Jun 2020 20:04:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F2D2B20672 for ; Mon, 29 Jun 2020 20:04:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593461081; bh=nlWEtgoIaJ49QS6lXuyyuMLbym1Vx8sa5bAILlZk6Tc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KmKI9VwtM3+eoNzvDaFm73puoA+K9e9rZCg03a3HBhg4Wnzu69UbB0+nadGzp/cVU Ja9DhFBifDOQd/BgNzdoRi7yR5JiGQCmOVGKntfd8dQWlWANNQLeIf+4AQdss0iBDR A81YLt4iguBvGRTcxuShGaPCx2HX4rEnEVOqaC8E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388798AbgF2UE1 (ORCPT ); Mon, 29 Jun 2020 16:04:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:40564 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732995AbgF2Tac (ORCPT ); Mon, 29 Jun 2020 15:30:32 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A6326252D0; Mon, 29 Jun 2020 15:38:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593445096; bh=nlWEtgoIaJ49QS6lXuyyuMLbym1Vx8sa5bAILlZk6Tc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jLF+A536CYYIxjRdn1QaLCB8Uk/+bUoet8Pu0Da6yQYwS4UAcogs2f8GNhRNVf9D0 2kmj5QVTw0yzDox/LmH8a/QdiM0TEQZ6WWCMT3JijjgqVUpThxXFft2FvLL5lwekAt KqRPWYstMoU8OHicgZWS6Vi9JgnboXAe+mXGKA5M= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jann Horn , Cyrill Gorcunov , kernel test robot , John Johansen , Sasha Levin Subject: [PATCH 4.14 06/78] apparmor: don't try to replace stale label in ptraceme check Date: Mon, 29 Jun 2020 11:36:54 -0400 Message-Id: <20200629153806.2494953-7-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629153806.2494953-1-sashal@kernel.org> References: <20200629153806.2494953-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.186-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.14.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.14.186-rc1 X-KernelTest-Deadline: 2020-07-01T15:38+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jann Horn [ Upstream commit ca3fde5214e1d24f78269b337d3f22afd6bf445e ] begin_current_label_crit_section() must run in sleepable context because when label_is_stale() is true, aa_replace_current_label() runs, which uses prepare_creds(), which can sleep. Until now, the ptraceme access check (which runs with tasklist_lock held) violated this rule. Fixes: b2d09ae449ced ("apparmor: move ptrace checks to using labels") Reported-by: Cyrill Gorcunov Reported-by: kernel test robot Signed-off-by: Jann Horn Signed-off-by: John Johansen Signed-off-by: Sasha Levin --- security/apparmor/lsm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index 4f08023101f3c..1c6b389ad8f94 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c @@ -123,11 +123,11 @@ static int apparmor_ptrace_traceme(struct task_struct *parent) struct aa_label *tracer, *tracee; int error; - tracee = begin_current_label_crit_section(); + tracee = __begin_current_label_crit_section(); tracer = aa_get_task_label(parent); error = aa_may_ptrace(tracer, tracee, AA_PTRACE_TRACE); aa_put_label(tracer); - end_current_label_crit_section(tracee); + __end_current_label_crit_section(tracee); return error; } -- 2.25.1