From patchwork Mon May 20 19:04:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 13668610 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 07719139584; Mon, 20 May 2024 19:05:05 +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=1716231906; cv=none; b=Lhmb0O1G/DPfITga7Qavd788YnDnHjTVJ2rYu520no7QhyExYdHiTwAGs6legekrmjsX+0x4pwtqtT7uLxgWGek+9gZ0k9EfsvAMEHhYJfcKY7TIAHaHQ4cD5rl8y9HFGUTkOtDVQLuQqJC22ckwj1RuiwEavYOUBb8ax+DiIGk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716231906; c=relaxed/simple; bh=FZnEkMOpn0PCjEi882Nayoei2+TEsEgYzwl1ZagOIgM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LjKKmvnSw1O7Pjfic1js2dsRlsKZWUaciSqpSZnfOCA5r+dTqsEWYfRdNINYT501+NyhiWdFruC2+KGNm0dTbp2eywvZfvo3YZaj5pEXnWJDEiCBZGZSGZq42vQZ6rdFj7cmHRsMtdeBrYw7Jrk2UTTkttl7b+pPtxDu7Og6dLk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=h2RS34h2; 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="h2RS34h2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 29234C4AF07; Mon, 20 May 2024 19:05:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716231905; bh=FZnEkMOpn0PCjEi882Nayoei2+TEsEgYzwl1ZagOIgM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h2RS34h2RXJD/4CvbEdPsUrWpogXH9jqbTU4lrPL9uqQWowAAWLZLyLJKs67IaSsM yecQmzXR/033iIekfHJi4l2zdHPrmDJj+QFtpKHkC+sGa+s2IAyLOkZLs7cw4YZuKr Va3swV3Q9QRPvOGk8DbKi4bDOBWCRsdzVlgh8ErmC2y3YRa8wjgfRz9kyl7sEnY/OM qc5wlou10yoJC+xo3MgN50qyNK6BUybDQVr1dGBqN0i4KX6/iqR9ko0Y3SzQYVck3s kSxHmdi0K9SIEelRnTY8+ddsHqYOsQqeXv4fQCVziDmabdebjjXDgI2YlyVKJOtvmk CrPbwqzgQ+eGA== 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 v2 1/2] KEYS: trusted: Fix memory leak in tpm2_key_encode() Date: Mon, 20 May 2024 22:04:52 +0300 Message-ID: <20240520190454.28745-2-jarkko@kernel.org> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240520190454.28745-1-jarkko@kernel.org> References: <20240520190454.28745-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 { From patchwork Mon May 20 19:04:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 13668611 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 181B71384B4; Mon, 20 May 2024 19:05:09 +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=1716231911; cv=none; b=TWQWxhbnM4K+Kw5JLnqNHDrZ2RmmYlROZ+jgs04FxNUfhwolx4meyd1gqKJq3w2BrCsCU7mGoszAQUbPYZhTtVZaafCqw2tV3i5bwoSWNb7jUMZRBeEakFj1cXiHUHfp14Z5bkfHAAGWC/aHCRSizz52L8Spwi6Y+d+efgtpwG4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716231911; c=relaxed/simple; bh=zjmdVHD9xhS/1n4Rw9BcJgcMBhyRpG01mLSj2X8CQ7M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DACh722hwMt1Qba2CwITo/wQ4m1YbjNoAGvm9KX62TdDi7SfAJ+Ic8Ldlw4IYyaPoRhwm4WsUpS2TGIWm/NaJrfv6s0n9XmolL3wUhYTIWx3jcLcUsV9GLfBItC07xkW58T0ORKLJ5DCQO55cVq4ya3VoNWnKZtKVTHU0Kc8IMo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Hul6fYn5; 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="Hul6fYn5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4F785C32789; Mon, 20 May 2024 19:05:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716231909; bh=zjmdVHD9xhS/1n4Rw9BcJgcMBhyRpG01mLSj2X8CQ7M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hul6fYn5E545RYZ9SafZ8CkXb8YK3/NkkOuRfr8u2cDjYHv4KwrJu6SFGSvPg89nB Bdk4wkW64saAU+3uKZTpEDwliB7YmxnK2GBAgIKHe2dUR9TwVTgH+/g+GO6t6w0tn4 n03rOTvygXO1ibMNZuguBywXjf+EiFAZsXnqO9eUw65LWvea0tRIggZ8NyKMzV0wps OtokmA8nOLpJIoGgOtPsdLWg1EdfJqlFXXJAVeplyFvr95kMzcrD4goFYyHKYE9QH6 VJIb2VYxcadqkGyDiYRLkFTXr/YCVaLrCt7BkuZ6uNZ4/l8oUk/Wn362Gcf2rXt5h0 NHLGKTLvU54zg== 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 v2 2/2] KEYS: trusted: Do not use WARN when encode fails Date: Mon, 20 May 2024 22:04:53 +0300 Message-ID: <20240520190454.28745-3-jarkko@kernel.org> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240520190454.28745-1-jarkko@kernel.org> References: <20240520190454.28745-1-jarkko@kernel.org> Precedence: bulk X-Mailing-List: linux-integrity@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 When asn1_encode_sequence() fails, WARN is not the correct solution. 1. asn1_encode_sequence() is not an internal function (located in lib/asn1_encode.c). 2. Location is known, which makes the stack trace useless. 3. Results a crash if panic_on_warn is set. It is also noteworthy that the use of WARN is undocumented, and it should be avoided unless there is a carefully considered rationale to use it. Replace WARN with pr_err, and print the return value instead, which is only useful piece of information. 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c index c6882f5d094f..8b7dd73d94c1 100644 --- a/security/keys/trusted-keys/trusted_tpm2.c +++ b/security/keys/trusted-keys/trusted_tpm2.c @@ -84,8 +84,9 @@ 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")) { + if (IS_ERR(work1)) { ret = PTR_ERR(work1); + pr_err("BUG: ASN.1 encoder failed with %d\n", ret); goto err; }