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 8BFF4C761A6 for ; Sat, 1 Apr 2023 01:42:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233647AbjDABmm (ORCPT ); Fri, 31 Mar 2023 21:42:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233591AbjDABm0 (ORCPT ); Fri, 31 Mar 2023 21:42:26 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49B9E1EFDF; Fri, 31 Mar 2023 18:41:59 -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 9886062CF1; Sat, 1 Apr 2023 01:41:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C95C5C433EF; Sat, 1 Apr 2023 01:41:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680313315; bh=VCwMMj2q4qUoHuODRqKDgoLte/T7yupow6Vv8LVr/gY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=laM+NLec8+ztdkWgy+jyzT5lINCrpm4fODUsL4hJEfRaot+CypA9GnOXziEWS7jwo YL/xlpGQBl51KWiYhVgsNmaIn61w2OfqWpgumpVXKbWd5XX2bgmjadV9eE2GJO5RkH TJAwrdYwSAHBLFuAecoEviu5nzivk7dyH4+EWXkY7Rv4b+0e5w8HwZLGszUC0vAsIh mJj5OiUgkfXr7D7Qs5uncHhQOZU0w0yGTI4xRUPvpdD8orHYQmLB85iH3IcgbBeBHY Kg4WA15d+4Nj94qzqXP/x7BEunuCJv74b7Bb+J29YW2nd4kG4G1rtrPPXN0xmxdgYF OjkBqv0XFXWOw== 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.2 17/25] verify_pefile: relax wrapper length check Date: Fri, 31 Mar 2023 21:41:15 -0400 Message-Id: <20230401014126.3356410-17-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230401014126.3356410-1-sashal@kernel.org> References: <20230401014126.3356410-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: 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