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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 65620C761AF for ; Sat, 1 Apr 2023 01:43:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ThE/5cNYWcDnNCvdo0/+XsRWRbMZVlrJl9u5cg4X0pk=; b=B1UH0/TUGXMvhe fmoax+SpDSZbNl0n5o62Z/v6TSLc5iFeowZk8GnrCt7HjrYJcA1e4I+0SyH4tPdQekqD6oAdQGTH0 0ZaeA3BNlbQRFiLnzR8OMlto7YQLYiwg/mrcZ5UUQuZ+t0rKdd2WfB9QZXmK5TKFNq0DmfohVhHnC ZhW53P35aA14/8i0mR4N+OgcRDUBNAW1HPGQ/xxG0WD3ucwf/JXxX0tGK69hdJSUBQAGPKZBqhOND Lrd8tZhHnY04XYGbcIJfYIJF2LUNcSin4bNhvWEZ5Di5ab21tC3/2f88QOw/aApQeXeL2Qlknn9qE 84Sp/3iI/oHF6RiVWsng==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1piQH0-009UDJ-2h; Sat, 01 Apr 2023 01:43:18 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1piQGx-009U9i-2L for kexec@lists.infradead.org; Sat, 01 Apr 2023 01:43:17 +0000 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 sin.source.kernel.org (Postfix) with ESMTPS id E5B82CE2F30; Sat, 1 Apr 2023 01:43:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13237C4339B; Sat, 1 Apr 2023 01:43:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680313387; bh=VCwMMj2q4qUoHuODRqKDgoLte/T7yupow6Vv8LVr/gY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GGJQwv2CyeSb0tEoAR62kRGNWlzq0AgLHnZW2J0VL04vk5GYXGG/eFMA97cq0DZpW vsVU7MmyGGn3uQLtl2mXnMb99DGHSu/huhz5nGpm2TSY6J68iVa9OJGkPy1YLVaPNF FxMcnzbTuV3KbvZyZHelUD2AyHefCe5g4g7TAg7IkihJUhC88fetHyuunp/2Ecud/K 6RPz/NxcBa+A7+Awo1ADA4/pimfLs8H7Ufegh3mjAKYTe65AG54yFCBhKCpZ5RGZSb yG09Vj9Io/6i4gCWODw2KaanGCMvWcMyMeyXkjeLTk7yzdmgORwXBPmMt73Zl2yhlF jN+AjFPyCmbtQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Robbie Harwood , David Howells , Jarkko Sakkinen , Eric Biederman , Herbert Xu , keyrings@vger.kernel.org, linux-crypto@vger.kernel.org, kexec@lists.infradead.org, Sasha Levin , davem@davemloft.net Subject: [PATCH AUTOSEL 6.1 16/24] verify_pefile: relax wrapper length check Date: Fri, 31 Mar 2023 21:42:32 -0400 Message-Id: <20230401014242.3356780-16-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230401014242.3356780-1-sashal@kernel.org> References: <20230401014242.3356780-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230331_184316_141424_79832CDB X-CRM114-Status: GOOD ( 13.39 ) X-BeenThere: kexec@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+kexec=archiver.kernel.org@lists.infradead.org From: Robbie Harwood [ Upstream commit 4fc5c74dde69a7eda172514aaeb5a7df3600adb3 ] The PE Format Specification (section "The Attribute Certificate Table (Image Only)") states that `dwLength` is to be rounded up to 8-byte alignment when used for traversal. Therefore, the field is not required to be an 8-byte multiple in the first place. Accordingly, pesign has not performed this alignment since version 0.110. This causes kexec failure on pesign'd binaries with "PEFILE: Signature wrapper len wrong". Update the comment and relax the check. Signed-off-by: Robbie Harwood Signed-off-by: David Howells cc: Jarkko Sakkinen cc: Eric Biederman cc: Herbert Xu cc: keyrings@vger.kernel.org cc: linux-crypto@vger.kernel.org cc: kexec@lists.infradead.org Link: https://learn.microsoft.com/en-us/windows/win32/debug/pe-format#the-attribute-certificate-table-image-only Link: https://github.com/rhboot/pesign Link: https://lore.kernel.org/r/20230220171254.592347-2-rharwood@redhat.com/ # v2 Signed-off-by: Sasha Levin --- crypto/asymmetric_keys/verify_pefile.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/crypto/asymmetric_keys/verify_pefile.c b/crypto/asymmetric_keys/verify_pefile.c index 7553ab18db898..fe1bb374239d7 100644 --- a/crypto/asymmetric_keys/verify_pefile.c +++ b/crypto/asymmetric_keys/verify_pefile.c @@ -135,11 +135,15 @@ static int pefile_strip_sig_wrapper(const void *pebuf, pr_debug("sig wrapper = { %x, %x, %x }\n", wrapper.length, wrapper.revision, wrapper.cert_type); - /* Both pesign and sbsign round up the length of certificate table - * (in optional header data directories) to 8 byte alignment. + /* sbsign rounds up the length of certificate table (in optional + * header data directories) to 8 byte alignment. However, the PE + * specification states that while entries are 8-byte aligned, this is + * not included in their length, and as a result, pesign has not + * rounded up since 0.110. */ - if (round_up(wrapper.length, 8) != ctx->sig_len) { - pr_debug("Signature wrapper len wrong\n"); + if (wrapper.length > ctx->sig_len) { + pr_debug("Signature wrapper bigger than sig len (%x > %x)\n", + ctx->sig_len, wrapper.length); return -ELIBBAD; } if (wrapper.revision != WIN_CERT_REVISION_2_0) { -- 2.39.2 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec