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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 8313EC35DF1 for ; Thu, 27 Feb 2020 13:59:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4A5FE24656 for ; Thu, 27 Feb 2020 13:59:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582811963; bh=gRt0usRCi+fl5V3gncPz4/5Mk8Qu3PTnC7dCLbt3sU4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XDQTHU24YnuPfbpztQzPDVk2AytNHQy0oFA20EvEY05apDSnFs+xNShsD1Cw9Xm5z 8BtcYziDGEviIVa/n+LpJzxSBVSVaVunI8xXR96AVVhXdogvaO/jcgid9S1YLdjXQJ jwqsVEfHcFEFoJxF40LWruLB3K0p9cGgFES0TFu4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728059AbgB0N7W (ORCPT ); Thu, 27 Feb 2020 08:59:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:60572 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732588AbgB0N7O (ORCPT ); Thu, 27 Feb 2020 08:59:14 -0500 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 2912E24656; Thu, 27 Feb 2020 13:59:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582811953; bh=gRt0usRCi+fl5V3gncPz4/5Mk8Qu3PTnC7dCLbt3sU4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TldNylByqUeOcZGGvkzBiUh1aAJYQsYWM0nT7zyrX+cs9gCFj0jUNMEy/r5O+aOOX uW7m5CKQZCr0Q31pYCbsw+IIAPK+yY8SpELDdGokm7SEj+IqnBNgaHSv18F3XiDl0C cYnQMnPFMNc2AGdDe1mrsC1ZELFU6GxH0QVVliVA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jaihind Yadav , Ravi Kumar Siddojigari , Paul Moore , Sasha Levin Subject: [PATCH 4.14 166/237] selinux: ensure we cleanup the internal AVC counters on error in avc_update() Date: Thu, 27 Feb 2020 14:36:20 +0100 Message-Id: <20200227132308.686210790@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200227132255.285644406@linuxfoundation.org> References: <20200227132255.285644406@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jaihind Yadav [ Upstream commit 030b995ad9ece9fa2d218af4429c1c78c2342096 ] In AVC update we don't call avc_node_kill() when avc_xperms_populate() fails, resulting in the avc->avc_cache.active_nodes counter having a false value. In last patch this changes was missed , so correcting it. Fixes: fa1aa143ac4a ("selinux: extended permissions for ioctls") Signed-off-by: Jaihind Yadav Signed-off-by: Ravi Kumar Siddojigari [PM: merge fuzz, minor description cleanup] Signed-off-by: Paul Moore Signed-off-by: Sasha Levin --- security/selinux/avc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/security/selinux/avc.c +++ b/security/selinux/avc.c @@ -863,7 +863,7 @@ static int avc_update_node(u32 event, u3 if (orig->ae.xp_node) { rc = avc_xperms_populate(node, orig->ae.xp_node); if (rc) { - kmem_cache_free(avc_node_cachep, node); + avc_node_kill(node); goto out_unlock; } }