From patchwork Sun May 19 23:51:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 13667980 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C5E6BFC01; Sun, 19 May 2024 23:51:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716162696; cv=none; b=iVlQH3c1y9dxfU8xzfHxVj4+Sv5GmUlAIdqti2JKRf+Ty6jsK4SUr7RJG97T6dhxusmz/vweIAVzcfu2cr+kA5k6FXhBxPl9JhiEHVuC/I4l0Al7kcfVih4ksrs+WIiru/BWdwq5skN8oBPBEtC/ml/coUPydDNv1nm1/QHEAlM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716162696; c=relaxed/simple; bh=FZnEkMOpn0PCjEi882Nayoei2+TEsEgYzwl1ZagOIgM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D33OTg7jAZu0k+cEoJ26F8XUeTkK8aJ+STd5N55vtaGgGL3UH9omvVErDE2QOshvYLCALcYHa/JqMgWdpEKOVj+hXGln5QjJI07osSl/oALV65RW15oZ6TNhDIiw1ccn1DewPKgxR0pAFm6LvyZUApC/oqAy4eHKKAxMT1uW4/s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FvOoPXd4; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FvOoPXd4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0533FC32789; Sun, 19 May 2024 23:51:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716162696; bh=FZnEkMOpn0PCjEi882Nayoei2+TEsEgYzwl1ZagOIgM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FvOoPXd4i7knzZOO3yoJKYEeWHwsCBqia2TSZJ2mE3C2cGqxRK9te1oxF7nGx6syh bZtCmdNKdmQDfXKbjpcR/MFUPGSe92TI1DOe0CBMzE2K11p6eVLWlvz9Gf58QV0W32 AzvsMUPMPUlKfU8o4i25HGZf9KZKY2iBbnMGzeYyWrW0Zp/yzxHWQbC0eGo9WAVVmA 61Rt/EZzME3p8iGOsUVzg5dWc0O892dR4pB2XqznxepaKI3Xggx5ZHD4v8KwtwQTez Hhk4lKSIesf5x9hA8PZsU4fFeBSeD7CdOAQubP896SUdWTly843gNDntKsrSPawwXQ w35kCqhPO0FaQ== From: Jarkko Sakkinen To: linux-integrity@vger.kernel.org Cc: keyrings@vger.kernel.org, James.Bottomley@HansenPartnership.com, Jarkko Sakkinen , stable@vger.kernel.org, Mimi Zohar , David Howells , Paul Moore , James Morris , "Serge E. Hallyn" , linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] KEYS: trusted: Fix memory leak in tpm2_key_encode() Date: Mon, 20 May 2024 02:51:20 +0300 Message-ID: <20240519235122.3380-3-jarkko@kernel.org> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240519235122.3380-1-jarkko@kernel.org> References: <20240519235122.3380-1-jarkko@kernel.org> Precedence: bulk X-Mailing-List: linux-integrity@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 'scratch' is never freed. Fix this by calling kfree() in the success, and in the error case. Cc: stable@vger.kernel.org # +v5.13 Fixes: f2219745250f ("security: keys: trusted: use ASN.1 TPM2 key format for the blobs") Signed-off-by: Jarkko Sakkinen --- security/keys/trusted-keys/trusted_tpm2.c | 24 +++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c index dfeec06301ce..c6882f5d094f 100644 --- a/security/keys/trusted-keys/trusted_tpm2.c +++ b/security/keys/trusted-keys/trusted_tpm2.c @@ -38,6 +38,7 @@ static int tpm2_key_encode(struct trusted_key_payload *payload, u8 *end_work = scratch + SCRATCH_SIZE; u8 *priv, *pub; u16 priv_len, pub_len; + int ret; priv_len = get_unaligned_be16(src) + 2; priv = src; @@ -57,8 +58,10 @@ static int tpm2_key_encode(struct trusted_key_payload *payload, unsigned char bool[3], *w = bool; /* tag 0 is emptyAuth */ w = asn1_encode_boolean(w, w + sizeof(bool), true); - if (WARN(IS_ERR(w), "BUG: Boolean failed to encode")) - return PTR_ERR(w); + if (WARN(IS_ERR(w), "BUG: Boolean failed to encode")) { + ret = PTR_ERR(w); + goto err; + } work = asn1_encode_tag(work, end_work, 0, bool, w - bool); } @@ -69,8 +72,10 @@ static int tpm2_key_encode(struct trusted_key_payload *payload, * trigger, so if it does there's something nefarious going on */ if (WARN(work - scratch + pub_len + priv_len + 14 > SCRATCH_SIZE, - "BUG: scratch buffer is too small")) - return -EINVAL; + "BUG: scratch buffer is too small")) { + ret = -EINVAL; + goto err; + } work = asn1_encode_integer(work, end_work, options->keyhandle); work = asn1_encode_octet_string(work, end_work, pub, pub_len); @@ -79,10 +84,17 @@ static int tpm2_key_encode(struct trusted_key_payload *payload, work1 = payload->blob; work1 = asn1_encode_sequence(work1, work1 + sizeof(payload->blob), scratch, work - scratch); - if (WARN(IS_ERR(work1), "BUG: ASN.1 encoder failed")) - return PTR_ERR(work1); + if (WARN(IS_ERR(work1), "BUG: ASN.1 encoder failed")) { + ret = PTR_ERR(work1); + goto err; + } + kfree(scratch); return work1 - payload->blob; + +err: + kfree(scratch); + return ret; } struct tpm2_key_context {