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 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 21A93C433F5 for ; Fri, 4 Mar 2022 02:05:40 +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=MSvdXDqijY6z0ME4aKAzL92mfv+ki2C4kvirNNT4Pjk=; b=WF8HqkpoRX5y2f D66aAJDjEfTt52Z6J7aWRYxK3XwX9I4D9Rne/aSScZRm6qUDisDo+LBndYURXbbXN40ehFw4aFAKu Eayitdi7dccbwxl1iViwy3Kv2wrXHXgqPowryH/icvam0hmGhXZdjtJM2u5jcCtoYW7OFnDXRRiSy wASu0CFUuk8eEsQOogqJtXmkfk/saivfDU2pnRaBwYtgoe/d2IXNiffyhSTJNqpY0Qfc0sdTVLLqo Yk1RmjL3i7MJSO4uKZfS5kMqQth1z4e7DofnbcX1V7g5h3Z2wB8/0msbciiflAXOpeZxPMwpoNvr5 2jbjvjj6P02sVohnXa7Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nPxJ3-008HKy-DM; Fri, 04 Mar 2022 02:04:33 +0000 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nPxIk-008HEW-39; Fri, 04 Mar 2022 02:04:15 +0000 Received: by mail-pl1-x632.google.com with SMTP id m2so483646pll.0; Thu, 03 Mar 2022 18:04:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=37PPdgMmKnfPsfL5uOEtSFfmQ8JkeKrQDV3j6+N2u9U=; b=HPOrSZZ3DE6oUUEP3y0f2LG7xe8GNPBmnBQEPzpcaFLAvc60HUgHVHBFFDKyaI+x/e PgX68jAVJ6KoWMghFqU/1dulNOdmeYPXLTT5s5f/xQ/D3zK9JWIcDvZ/uh8D2aXXrxRX CPw8B6wlLXJv3w2gKLPhQ1HL/ocDgZtFos8VRtV9wH08cTAX7gUvyfkd9DhJcxzSvP03 ScHd0KJ0/GROpR2CJo/PYizdPxXU3EfE0gD/bswX/n4izVxhBzJHIpEUKTJd5iHX/YgN hK0CM72x6QxkT1SKmI2vbwSe63Q+qVsaYqKlyYr00OsgNu+pxUcOquN4PDuF35j36rC+ uqhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=37PPdgMmKnfPsfL5uOEtSFfmQ8JkeKrQDV3j6+N2u9U=; b=7DbNdObFLaFiqY/1VYFz4UU/jZx9Wuj+kFjFCWGhivAPzyvxdjZL4mqXO4bzcjTvgJ Z8kLrdud7/c0ErwEdGi059xh9JYvW9EXtnpGDwU08eBRwJjpGpPUcAt6dXtmM0O1phhA fiGg4b29p8yt2rM/6GsIB3B8+t2Qm3/5SzOi0xu8AGRBYuesmQDCYUsOfqGdAnY3mACK fUjJ6Mt/ClDOqAcby7oJcVb5i4Lsckn8rqPINhRES5EvihXUs6Jhx/V6Wz/KbXWDV0E2 Wm9BsxOQHemQwSckIMMN+Kqmwh1rAXZPLg4/oL5AOdjkLJcQOWHB9NOScvN9D7d5y8J2 kWwg== X-Gm-Message-State: AOAM530g7HEBzWjd3Cp6DXQIQhRNId8ZivcCJ750T/5kNfYsI0mI5dez 6ded7/XvuYUnvhg8lA37+OXJfFUhGjTNiq6I X-Google-Smtp-Source: ABdhPJy+B1BOPYNfRN21A1KP8RrfDYkxJ9M+HpMGVI0mFR4n/SIz5oIElLzSYQSUDkPEbgWixMYT7w== X-Received: by 2002:a17:903:41cd:b0:150:25f6:72d3 with SMTP id u13-20020a17090341cd00b0015025f672d3mr34933204ple.162.1646359453287; Thu, 03 Mar 2022 18:04:13 -0800 (PST) Received: from localhost ([240e:3a1:2e5:800:f995:6136:f760:a3d0]) by smtp.gmail.com with ESMTPSA id na8-20020a17090b4c0800b001bf191ee347sm1902747pjb.27.2022.03.03.18.04.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Mar 2022 18:04:12 -0800 (PST) From: Coiby Xu To: kexec@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, Baoquan He , Dave Young , Will Deacon , "Eric W . Biederman" , Coiby Xu , Catalin Marinas , linux-kernel@vger.kernel.org (open list) Subject: [RESEND PATCH v3 3/3] arm64: kexec_file: use more system keyrings to verify kernel image signature Date: Fri, 4 Mar 2022 10:03:41 +0800 Message-Id: <20220304020341.85583-4-coiby.xu@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220304020341.85583-1-coiby.xu@gmail.com> References: <20220304020341.85583-1-coiby.xu@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220303_180414_164583_6B9EF306 X-CRM114-Status: GOOD ( 10.30 ) X-BeenThere: linux-arm-kernel@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: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Coiby Xu This allows to verify arm64 kernel image signature using not only .builtin_trusted_keys but also .secondary_trusted_keys and .platform keyring. Acked-by: Will Deacon Signed-off-by: Coiby Xu --- arch/arm64/kernel/kexec_image.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm64/kernel/kexec_image.c b/arch/arm64/kernel/kexec_image.c index 9ec34690e255..51af1c22d6da 100644 --- a/arch/arm64/kernel/kexec_image.c +++ b/arch/arm64/kernel/kexec_image.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -133,8 +132,7 @@ static void *image_load(struct kimage *image, #ifdef CONFIG_KEXEC_IMAGE_VERIFY_SIG static int image_verify_sig(const char *kernel, unsigned long kernel_len) { - return verify_pefile_signature(kernel, kernel_len, NULL, - VERIFYING_KEXEC_PE_SIGNATURE); + return kexec_kernel_verify_pe_sig(kernel, kernel_len); } #endif -- 2.34.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel