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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BD0AC25B07 for ; Mon, 8 Aug 2022 01:52:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243219AbiHHBwT (ORCPT ); Sun, 7 Aug 2022 21:52:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243272AbiHHBuX (ORCPT ); Sun, 7 Aug 2022 21:50:23 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA8DDDFD9; Sun, 7 Aug 2022 18:37:40 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DE71160E06; Mon, 8 Aug 2022 01:37:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 18065C433C1; Mon, 8 Aug 2022 01:37:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659922651; bh=6CRLhn7oCpLe3R4QHpr0/0MYXVi1LdC9PER/71MjKW4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aX1Vh0Qy/WqTuQQ0pg9Cel+2GNLWjKD9qaYPYZQ7AoOEmanG4wJPbQ7Cp2Rbq1NBq hcnhZUH5Y1fPo1qrOHzj6qQmNYQSc1SqAytKph5tuCVl3b4H/oinfiuu8wipb337I8 nxME/hAeXkb/SrCB2QCkUxJbl6uD7O1KNKefiV6tbjdBvsD7btj8srOQmISAZgd77M Nz7KXlx98hzm6zsQBpb7pZoYdYe+DfQXkKCJ94UTSLKAdp1LjV79lnrN8HTY6S9+q6 wYjpoM6PlNqTFbQ9NVIVT2ztdHFldyYHuUP4th6c4R+MBKIn3xzv48x5CEYZmnpFk6 FYlfRww6oFThQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xiu Jianfeng , Paul Moore , Sasha Levin , stephen.smalley.work@gmail.com, eparis@parisplace.org, cgzones@googlemail.com, omosnace@redhat.com, michalorzel.eng@gmail.com, selinux@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 42/45] selinux: fix memleak in security_read_state_kernel() Date: Sun, 7 Aug 2022 21:35:46 -0400 Message-Id: <20220808013551.315446-42-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220808013551.315446-1-sashal@kernel.org> References: <20220808013551.315446-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xiu Jianfeng [ Upstream commit 73de1befcc53a7c68b0c5e76b9b5ac41c517760f ] In this function, it directly returns the result of __security_read_policy without freeing the allocated memory in *data, cause memory leak issue, so free the memory if __security_read_policy failed. Signed-off-by: Xiu Jianfeng [PM: subject line tweak] Signed-off-by: Paul Moore Signed-off-by: Sasha Levin --- security/selinux/ss/services.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index c4931bf6f92a..e8035e4876df 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c @@ -4045,6 +4045,7 @@ int security_read_policy(struct selinux_state *state, int security_read_state_kernel(struct selinux_state *state, void **data, size_t *len) { + int err; struct selinux_policy *policy; policy = rcu_dereference_protected( @@ -4057,5 +4058,11 @@ int security_read_state_kernel(struct selinux_state *state, if (!*data) return -ENOMEM; - return __security_read_policy(policy, *data, len); + err = __security_read_policy(policy, *data, len); + if (err) { + vfree(*data); + *data = NULL; + *len = 0; + } + return err; } -- 2.35.1