Message ID | 20200619161621.644540-46-seth.forshee@canonical.com |
---|---|
State | New |
Headers | show
Return-Path: <kernel-team-bounces@lists.ubuntu.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49pPBN4Sc9zB47h; Sat, 20 Jun 2020 02:18:52 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from <kernel-team-bounces@lists.ubuntu.com>) id 1jmJj4-0003yN-Pb; Fri, 19 Jun 2020 16:18:46 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from <seth.forshee@canonical.com>) id 1jmJhi-0002op-Kc for kernel-team@lists.ubuntu.com; Fri, 19 Jun 2020 16:17:22 +0000 Received: from mail-il1-f199.google.com ([209.85.166.199]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from <seth.forshee@canonical.com>) id 1jmJhg-0003jk-Lu for kernel-team@lists.ubuntu.com; Fri, 19 Jun 2020 16:17:20 +0000 Received: by mail-il1-f199.google.com with SMTP id c29so6805662ilf.20 for <kernel-team@lists.ubuntu.com>; Fri, 19 Jun 2020 09:17:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AwYcIsdy0Sw03kYMfbvUFlWqCJhDqXXwh6mECPJ4aSs=; b=n3FSUpMKM2UUuXVN4X9NELwPSsQjiRl0FJjhPmmooJMVr0C4Mqe5g1H1SvRvcop0KV xkuFX5UTcWACD6KIIjDyg33BGfriYJhz81GpBfZjPGTuZ1L+dLyu4wmbnJTIuGcwmScV H+0ZnGUCkkuO2vVraMTSYySeDiNTTU5YT3DqJfl/WeoKFP1/NtmMJZ8oHrsZpJs+WzH7 Uhtql/QMi/6vJTrlE5NyAxrhdQN8gEHK7kVcHlCxSewFyB7swYUgIf4JHgrC2+WtvTOX oZM8m17HchYi9HprhcAGF5XdFSUxmms+cbJfnj+B+G21SOcmk+FOYwOejeiaWA+6is/x GPfQ== X-Gm-Message-State: AOAM530bqm8FQsYum1vIqrF/0jIoUh0EATuMrVb/ejzl/KwtMhdUhlSI 92rNW7ygmRPqWIo9JK1IUo7fD51eK9ye8CeeSsQSPtVQcp5o4WOUTdkXxaRcqRfyT76+whOTCvI h+odbqj5n3o9BzZvRawhY1bg7Gft1CpB8vxrxhoeL0Q== X-Received: by 2002:a02:cd2b:: with SMTP id h11mr4555102jaq.47.1592583439506; Fri, 19 Jun 2020 09:17:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyI1oot46jqyhr5Q7R/nOvmxR/uQOpl/vNKJU0uZRGboAZaNntsqJaZNY9l7CpWVLvaKILgKA== X-Received: by 2002:a02:cd2b:: with SMTP id h11mr4555081jaq.47.1592583439233; Fri, 19 Jun 2020 09:17:19 -0700 (PDT) Received: from localhost ([2605:a601:ac0f:820:f090:1573:c2fc:6389]) by smtp.gmail.com with ESMTPSA id v20sm3494557ilc.1.2020.06.19.09.17.18 for <kernel-team@lists.ubuntu.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:17:18 -0700 (PDT) From: Seth Forshee <seth.forshee@canonical.com> To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 45/57][B] UBUNTU: SAUCE: (efi-lockdown) kexec_file: Disable at runtime if the kernel is locked down Date: Fri, 19 Jun 2020 11:16:09 -0500 Message-Id: <20200619161621.644540-46-seth.forshee@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619161621.644540-1-seth.forshee@canonical.com> References: <20200619161621.644540-1-seth.forshee@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions <kernel-team.lists.ubuntu.com> List-Unsubscribe: <https://lists.ubuntu.com/mailman/options/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe> List-Archive: <https://lists.ubuntu.com/archives/kernel-team> List-Post: <mailto:kernel-team@lists.ubuntu.com> List-Help: <mailto:kernel-team-request@lists.ubuntu.com?subject=help> List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" <kernel-team-bounces@lists.ubuntu.com> |
Series |
Lockdown updates
|
expand
|
diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index 6030efd4a188..14d19eda9ec9 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -317,6 +317,12 @@ SYSCALL_DEFINE5(kexec_file_load, int, kernel_fd, int, initrd_fd, if (!capable(CAP_SYS_BOOT) || kexec_load_disabled) return -EPERM; + /* Don't permit images to be loaded into trusted kernels if we're not + * going to verify the signature on them + */ + if (!IS_ENABLED(CONFIG_KEXEC_VERIFY_SIG) && secure_modules()) + return -EPERM; + /* Make sure we have a legal set of flags */ if (flags != (flags & KEXEC_FILE_FLAGS)) return -EINVAL;