From patchwork Tue Jul 24 06:57:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 10541363 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 59EE914BC for ; Tue, 24 Jul 2018 07:00:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 46D4F28786 for ; Tue, 24 Jul 2018 07:00:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 449C12879B; Tue, 24 Jul 2018 07:00:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CA2D6287DE for ; Tue, 24 Jul 2018 07:00:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=V3JRqIxUVgjor13lMFQBfjueB6yyPD2ZmLVh6ycW/L0=; b=WYk9qSGBMI42EkuCLJ6N+9Uzv5 bWfIITidULe0sDjmGbSWsgFh3OsbkqT69kJxkLkpRjoMhr3Qxxoz+ACQJyjkTi8dQbPoMM8eSP02P y0jxz/md+C4bxqPcgFtUoaZi+wZiZS56vGbg3xDChrkONYNdIokW9npCYT6HmsuQVlZ40NiO9UPaP Cplr/nFgjPqkMikqwuwRETvzNWat68QgFPhjsu/2hngLtvyOIUF1d2hjBKvgWjW2pqkoDRIun1l0G Lq8JkfOSRtn7waUpPSxboT2qfWwRAxfitZUINS3GYxCHJzPbXKYw3pQVxTRsalOUnBesnMz4irFLb OXEv17ww==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fhrJL-00050R-Fa; Tue, 24 Jul 2018 07:00:43 +0000 Received: from mail-pl0-x244.google.com ([2607:f8b0:400e:c01::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fhrI2-0002qQ-VE for linux-arm-kernel@lists.infradead.org; Tue, 24 Jul 2018 06:59:34 +0000 Received: by mail-pl0-x244.google.com with SMTP id 31-v6so1328620plc.4 for ; Mon, 23 Jul 2018 23:59:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pwXt6vap8yHX0ws+sEoumnHhs6bkGBBWSifGoV32A7Y=; b=YqMA37RPrwDG7QMbekhUUHSkhSv6lFzDpMZn38BDZBonF4qxQNMpXVgwHX0+Qg4Oaf /3V2lz1+76QcGqE/OOehIRcxSCjbF29D+xDyrTkr7sDoabpzDYPx0ChmHhvLY1fX1Ugx nZr0y9zbP9jAzyB+admjVWsewji7m/SKzXCro= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pwXt6vap8yHX0ws+sEoumnHhs6bkGBBWSifGoV32A7Y=; b=a3p72zzgw7C7QrtOg/A0oJIcsq8Ur58mlYgAiuBwArfGS/EgwKfaqdpB0H1kv7EN/h HY2XO/fGECHkExQhSqHkVTXvek+OCxI9O7zFFOXtxy62ER4pIRoBE3s+T7U7Kn4zTu6i KGebIcWtCablsIDpEPTgHxb46Xp13Su1c1u72Wk3ekN7CLWryndnxfqlm+nyBj7UvOYY 0UDEoMuDppUipaQQ2kocn7+cBPM2HIiJWauQhnFUxRgrnu8z040GkHaJ5LF8Nlob6rKU R6SzSa41kVVUFoQUF1r8BvvlsLAt95OCHagEDJLo0ZISk6j+qcweJmnDCdm8py1Nj+rH xjsw== X-Gm-Message-State: AOUpUlGoYkfJBDcpDa5GbuBINC/10Zed/CDeP0Lmmh4mcaTVof3/O+d3 gipEt9tUHY+rjxcmcnr4IGaJDQ== X-Google-Smtp-Source: AAOMgpcb7hEP3pLLw18pY8MBctvEOFfhWftNlRycrBUzZ0Kk4b1IfHhUXCb9BVsnasaF7rHcXQUNog== X-Received: by 2002:a17:902:8486:: with SMTP id c6-v6mr15657253plo.283.1532415552316; Mon, 23 Jul 2018 23:59:12 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id 21-v6sm21506976pgx.20.2018.07.23.23.59.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jul 2018 23:59:11 -0700 (PDT) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, dhowells@redhat.com, vgoyal@redhat.com, herbert@gondor.apana.org.au, davem@davemloft.net, dyoung@redhat.com, bhe@redhat.com, arnd@arndb.de, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com Subject: [PATCH v12 15/16] arm64: kexec_file: add kernel signature verification support Date: Tue, 24 Jul 2018 15:57:58 +0900 Message-Id: <20180724065759.19186-16-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180724065759.19186-1-takahiro.akashi@linaro.org> References: <20180724065759.19186-1-takahiro.akashi@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180723_235923_371281_9A3D2608 X-CRM114-Status: GOOD ( 16.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ard.biesheuvel@linaro.org, bhsharma@redhat.com, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro , james.morse@arm.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP With this patch, kernel verification can be done without IMA security subsystem enabled. Turn on CONFIG_KEXEC_VERIFY_SIG instead. On x86, a signature is embedded into a PE file (Microsoft's format) header of binary. Since arm64's "Image" can also be seen as a PE file as far as CONFIG_EFI is enabled, we adopt this format for kernel signing. You can create a signed kernel image with: $ sbsign --key ${KEY} --cert ${CERT} Image Signed-off-by: AKASHI Takahiro Cc: Catalin Marinas Cc: Will Deacon Reviewed-by: James Morse --- arch/arm64/Kconfig | 24 ++++++++++++++++++++++++ arch/arm64/kernel/kexec_image.c | 15 +++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index a9a3a5583c8b..1445eb2fc833 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -844,6 +844,30 @@ config KEXEC_FILE for kernel and initramfs as opposed to list of segments as accepted by previous system call. +config KEXEC_VERIFY_SIG + bool "Verify kernel signature during kexec_file_load() syscall" + depends on KEXEC_FILE + help + Select this option to verify a signature with loaded kernel + image. If configured, any attempt of loading a image without + valid signature will fail. + + In addition to that option, you need to enable signature + verification for the corresponding kernel image type being + loaded in order for this to work. + +config KEXEC_IMAGE_VERIFY_SIG + bool "Enable Image signature verification support" + default y + depends on KEXEC_VERIFY_SIG + depends on EFI && SIGNED_PE_FILE_VERIFICATION + help + Enable Image signature verification support. + +comment "Support for PE file signature verification disabled" + depends on KEXEC_VERIFY_SIG + depends on !EFI || !SIGNED_PE_FILE_VERIFICATION + config CRASH_DUMP bool "Build kdump crash kernel" help diff --git a/arch/arm64/kernel/kexec_image.c b/arch/arm64/kernel/kexec_image.c index d64f5e9f9d22..578d358632d0 100644 --- a/arch/arm64/kernel/kexec_image.c +++ b/arch/arm64/kernel/kexec_image.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -28,6 +29,9 @@ static int image_probe(const char *kernel_buf, unsigned long kernel_len) memcmp(&h->magic, ARM64_MAGIC, sizeof(h->magic))) return -EINVAL; + pr_debug("PE format: %s\n", + memcmp(&h->mz_magic, "MZ", 2) ? "no" : "yes"); + return 0; } @@ -102,7 +106,18 @@ static void *image_load(struct kimage *image, return ERR_PTR(ret); } +#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); +} +#endif + const struct kexec_file_ops kexec_image_ops = { .probe = image_probe, .load = image_load, +#ifdef CONFIG_KEXEC_IMAGE_VERIFY_SIG + .verify_sig = image_verify_sig, +#endif };