Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp685451yba; Wed, 3 Apr 2019 17:36:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqzBdDZzxyD7oZv5d9eqD7WuDCFhJoPSQVVPSA8FNBNnOCtoSaopETrt1b1SGN8AOxE8Sw6Z X-Received: by 2002:a17:902:e7:: with SMTP id a94mr3182507pla.114.1554338205753; Wed, 03 Apr 2019 17:36:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554338205; cv=none; d=google.com; s=arc-20160816; b=izx/BNEXyXdLzp9GdPHOVtGMbjEtXgimvBqRWaGWvBtLQzJ9sX17qQHV173DMGYSld zzCfvqofPDjVwvwyVhitvpux+WjcoxBH1yEqJ/rJN6BHAF/k/pKtf0CYXuywuro04zbU Vd0tbtiXklrW6Gs+a8f5J9QirPz9rwe+oS/88EOQEbIV+W67IXJqOe/fwK16rqFqb4ID +yeJAC+1JFKegoNnfv24KMlGpVQ8jFg8YawWRT5Vo6hAOp0TQvCKVqT2xLUTBJ8FRV2P gAp8g8cgudLR7ILWS8r1APM5zrOUepIYn06NB1AruRkPRghH5ZFabcoKTJCX61ZEa+hL Gslg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=ZxYq8cG2sFhGgbw0k3aUDfwIzpbQidarvZYq7w9bkW0=; b=KHPNOtWVYKx+vv7vvPCfufjllitxWg/GR+Gnp2jafbY4V39KpMJuUC2xbxnDa74KJn 4mZWDXyCtDpUw8sOpTO6xB7/VnUpYJfSu35shvymjTzzS/6+QMBugluFxNDUODNA0SWK wV6jPqS1Rpm11UE9xH75+ZTBKQI50rsWCY/lEdRcUkPv4DWp7jCWIDfq6RlK5+rAEw7H BdfSQpGwhaQ57gaztSt9l7SdnFGR5dVybQioCK6Ykme7v0FfEGu0Q+G9Uw/dyepYXVQ0 OtKi64fEYwP/whNuaUr76O+yTetfSIiiCtKWZyaHFtLahYQbxzTiChwXvStjoudrP5Pe 0GlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=cTbmRxtu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 36si15426865pld.6.2019.04.03.17.36.30; Wed, 03 Apr 2019 17:36:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=cTbmRxtu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727190AbfDDAfZ (ORCPT + 99 others); Wed, 3 Apr 2019 20:35:25 -0400 Received: from mail-oi1-f202.google.com ([209.85.167.202]:40927 "EHLO mail-oi1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726655AbfDDAdH (ORCPT ); Wed, 3 Apr 2019 20:33:07 -0400 Received: by mail-oi1-f202.google.com with SMTP id q82so345867oif.7 for ; Wed, 03 Apr 2019 17:33:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=ZxYq8cG2sFhGgbw0k3aUDfwIzpbQidarvZYq7w9bkW0=; b=cTbmRxtu2jUwcJETn1cw2HiL44MplIt+di+W0OqpKWmtj0D+RjaWKI6JUmwDvqOjgc Rl96fi5FPAJb06vs3tp+PtGIXumG8NcOOZdl96kpieo3+S/JUj6mocPiKjl0ZUYS40Gy 9Bi3BAPvZVKk8p6ORLM1tRfxHvU55s9pgGNijeTtpD4/UCgvsJ5LLMGhqk0gLL6/3nSO eZvDEvkUN/JIr/KgnIbcdcF5qWY+SiuWdu8O/9z1tVt2QFjSefCCnpamKII+wI6rIG8c oEPm3tbJ2jTPZch5fe5hzqK76tr/s3RmZkXLbhe92GGHVvJyD0BNCPAMfcmoyIZLa2W5 w+/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=ZxYq8cG2sFhGgbw0k3aUDfwIzpbQidarvZYq7w9bkW0=; b=GPa/WreSAXslP6f4qq8Xotl2usFdAN5lYxDP39lDG7wSviJEPH7uLqwKZKlT7dc+cs gG8ILpWXDGzOlhhBD8p6ejHHCgjCejxbPRKYSGWoVf4zWszrTdG9aLLkQK8xPnepPC0D IOPkDOoTMRElr+9716vkXhvm0c0kkJsH533eRJPyGLdQDbtgp3xCTz9OfX0uzk+fZmuI 1couK7C+TJCkIQLBiaegZPJpEHxw8W3K0Dy8UGJNipBTbtFbdyft6xt+R2PS4CAGxVmw Dh16ZWyNk6btAwVtqV+4CXbFhisn8SO2kY/rL7xS8qc9eMPgDvsoTNaAYnUitywnWoI3 cfkw== X-Gm-Message-State: APjAAAVziRh9x5ukKlX2nVzfhAaaz19Q5jWJ+I3w5mAJAKrsSBXd04c2 fgUk/J6QcSOgeS7XBOFqbxhynzWwe8Gd0W6kjhSTMQ== X-Received: by 2002:a9d:6208:: with SMTP id g8mr289988otj.15.1554337987036; Wed, 03 Apr 2019 17:33:07 -0700 (PDT) Date: Wed, 3 Apr 2019 17:32:27 -0700 In-Reply-To: <20190404003249.14356-1-matthewgarrett@google.com> Message-Id: <20190404003249.14356-6-matthewgarrett@google.com> Mime-Version: 1.0 References: <20190404003249.14356-1-matthewgarrett@google.com> X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog Subject: [PATCH V32 05/27] Copy secure_boot flag in boot params across kexec reboot From: Matthew Garrett To: jmorris@namei.org Cc: linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, dhowells@redhat.com, linux-api@vger.kernel.org, luto@kernel.org, Dave Young , Matthew Garrett , kexec@lists.infradead.org Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dave Young Kexec reboot in case secure boot being enabled does not keep the secure boot mode in new kernel, so later one can load unsigned kernel via legacy kexec_load. In this state, the system is missing the protections provided by secure boot. Adding a patch to fix this by retain the secure_boot flag in original kernel. secure_boot flag in boot_params is set in EFI stub, but kexec bypasses the stub. Fixing this issue by copying secure_boot flag across kexec reboot. Signed-off-by: Dave Young Signed-off-by: David Howells Signed-off-by: Matthew Garrett cc: kexec@lists.infradead.org --- arch/x86/kernel/kexec-bzimage64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c index 278cd07228dd..d49554b948fd 100644 --- a/arch/x86/kernel/kexec-bzimage64.c +++ b/arch/x86/kernel/kexec-bzimage64.c @@ -179,6 +179,7 @@ setup_efi_state(struct boot_params *params, unsigned long params_load_addr, if (efi_enabled(EFI_OLD_MEMMAP)) return 0; + params->secure_boot = boot_params.secure_boot; ei->efi_loader_signature = current_ei->efi_loader_signature; ei->efi_systab = current_ei->efi_systab; ei->efi_systab_hi = current_ei->efi_systab_hi; -- 2.21.0.392.gf8f6787159e-goog