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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 9B706C76186 for ; Wed, 24 Jul 2019 19:47:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6E37920659 for ; Wed, 24 Jul 2019 19:47:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563997629; bh=i18rj119Nttz0NHuwhWTC1GnCe6rScxI4Sng1VPQJEc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JgBdaCnPOa8MH2HEIv9ZWzXaimU3vCTMwntLeCXw55NuwVrN6K7ZUnbwkrI0Ls5g/ 7YE0g+bYg5YLRt9WLU7be4RLncPYQ+8bFykn/TxZSdBzbknjhf5+Gq5tFUJkCyJFZt FiRibQyR1HIXrJTOcK+k8N+l9y62UONVIUKrx4nU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728570AbfGXTrC (ORCPT ); Wed, 24 Jul 2019 15:47:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:53400 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728309AbfGXTrA (ORCPT ); Wed, 24 Jul 2019 15:47:00 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EA00322ADB; Wed, 24 Jul 2019 19:46:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563997620; bh=i18rj119Nttz0NHuwhWTC1GnCe6rScxI4Sng1VPQJEc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L+cCoGfusgToq7g6a99P+YMRg6oFIWni5XTvtlE0xyVNLpHX3gdzKQMDIEWaXJhIB KwDRbVdcQ2uWqjy1JK6sav9SAn+f/4QeXwPRp9NP1dLCsPIVArPN6aYYetYoWtQp8z WLJoS+KPyeLvRoUKej3O55uoHzfBgX9J/YtVDoE8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kir Kolyshkin , Ondrej Mosnacek , Paul Moore , Sasha Levin Subject: [PATCH 5.1 087/371] selinux: fix empty write to keycreate file Date: Wed, 24 Jul 2019 21:17:19 +0200 Message-Id: <20190724191731.391270221@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191724.382593077@linuxfoundation.org> References: <20190724191724.382593077@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 464c258aa45b09f16aa0f05847ed8895873262d9 ] When sid == 0 (we are resetting keycreate_sid to the default value), we should skip the KEY__CREATE check. Before this patch, doing a zero-sized write to /proc/self/keycreate would check if the current task can create unlabeled keys (which would usually fail with -EACCESS and generate an AVC). Now it skips the check and correctly sets the task's keycreate_sid to 0. Bug report: https://bugzilla.redhat.com/show_bug.cgi?id=1719067 Tested using the reproducer from the report above. Fixes: 4eb582cf1fbd ("[PATCH] keys: add a way to store the appropriate context for newly-created keys") Reported-by: Kir Kolyshkin Signed-off-by: Ondrej Mosnacek Signed-off-by: Paul Moore Signed-off-by: Sasha Levin --- security/selinux/hooks.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 614bc753822c..bf37bdce9918 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -6269,11 +6269,12 @@ static int selinux_setprocattr(const char *name, void *value, size_t size) } else if (!strcmp(name, "fscreate")) { tsec->create_sid = sid; } else if (!strcmp(name, "keycreate")) { - error = avc_has_perm(&selinux_state, - mysid, sid, SECCLASS_KEY, KEY__CREATE, - NULL); - if (error) - goto abort_change; + if (sid) { + error = avc_has_perm(&selinux_state, mysid, sid, + SECCLASS_KEY, KEY__CREATE, NULL); + if (error) + goto abort_change; + } tsec->keycreate_sid = sid; } else if (!strcmp(name, "sockcreate")) { tsec->sockcreate_sid = sid; -- 2.20.1