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 X-Spam-Level: X-Spam-Status: No, score=-11.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3E0DC433E6 for ; Fri, 17 Jul 2020 19:10:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D45FA207EA for ; Fri, 17 Jul 2020 19:10:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="cCAmvlsU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728532AbgGQTK3 (ORCPT ); Fri, 17 Jul 2020 15:10:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728500AbgGQTK0 (ORCPT ); Fri, 17 Jul 2020 15:10:26 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3935C0619D6 for ; Fri, 17 Jul 2020 12:10:25 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id b6so12178445wrs.11 for ; Fri, 17 Jul 2020 12:10:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding:content-language; bh=/3tZLNgSUaBUOYFtarysCRR7+220ug8Q6HlgI7Nzn9o=; b=cCAmvlsUDJwZwJmRNK+H8fKklO9LVaNEl+TESiR0wM/9WOl4gqHrJeLLeokHptEi2Z mfVfnI/DQ8lbV43KW3fF7PXHYTWvLqhPUhdCtFftcUTV+1kYZkNMZ9L6n2F4V2hhM24M ygVUtqyThgYUVvXc2UchbsmG8Ns2cFz4iS3+c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=/3tZLNgSUaBUOYFtarysCRR7+220ug8Q6HlgI7Nzn9o=; b=szdToVgD9EwxA+JDuRYGYbsIXezhFYEB9+7rY2hUXzXN5iORC7EXrApi6WJYA+AZ1x PJx7dJgsySQeTEHCWtiIP883m9Rmjjay2E8sKaxDmmBsZJhFqaz52/lPxnCiNjRt5OJx tyB8MvO18/rADVtCc6jZ/Gup+1cPmCNOuJtollwjp4dJixuD1/TRFzL0RXb/rNIhqR4p LNa/E00PXzJAhbVWiRxpFZIsbVfG5TPm1iz/yLI3xU+e8OX3sEjT2lrts2JNRKnZr7Uj KlTZNOMcTgGsYNDlAdeU9Z62WZohZCL4NhYKDxeEFb0W83+w9E0lXTZRCCX7fxUdjACa /ooA== X-Gm-Message-State: AOAM531ic7qqtTSxu6ePowIXvTUgjmMeSg8rhuubxLF2j17KxtmUZerO Kb3kbeKpD3ZuMY76GEObUNVNAA== X-Google-Smtp-Source: ABdhPJyTAxDc4h0eRMxzqWDfGCUf8nSKoi7XGTE2dPrI2YcN6sHaJsCTxBwiuKYEbrxnK+MdFSrF2g== X-Received: by 2002:a5d:68cc:: with SMTP id p12mr11463924wrw.111.1595013024363; Fri, 17 Jul 2020 12:10:24 -0700 (PDT) Received: from [10.136.13.65] ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id c15sm15320664wme.23.2020.07.17.12.10.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 17 Jul 2020 12:10:23 -0700 (PDT) Subject: Re: [PATCH 03/13] fs/kernel_read_file: Remove FIRMWARE_EFI_EMBEDDED enum To: Kees Cook Cc: stable@vger.kernel.org, Mimi Zohar , Matthew Wilcox , James Morris , Luis Chamberlain , Greg Kroah-Hartman , "Rafael J. Wysocki" , Alexander Viro , Jessica Yu , Dmitry Kasatkin , "Serge E. Hallyn" , Casey Schaufler , "Eric W. Biederman" , Peter Zijlstra , Matthew Garrett , David Howells , Mauro Carvalho Chehab , Randy Dunlap , "Joel Fernandes (Google)" , KP Singh , Dave Olsthoorn , Hans de Goede , Peter Jones , Andrew Morton , Paul Moore , Stephen Smalley , linux-security-module@vger.kernel.org, linux-integrity@vger.kernel.org, selinux@vger.kernel.org, linux-fsdevel@vger.kernel.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org References: <20200717174309.1164575-1-keescook@chromium.org> <20200717174309.1164575-4-keescook@chromium.org> From: Scott Branden Message-ID: <8ee5f0f1-8eae-510a-a3bb-7420a3fca001@broadcom.com> Date: Fri, 17 Jul 2020 12:10:15 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200717174309.1164575-4-keescook@chromium.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org On 2020-07-17 10:42 a.m., Kees Cook wrote: > The "FIRMWARE_EFI_EMBEDDED" enum is a "where", not a "what". It > should not be distinguished separately from just "FIRMWARE", as this > confuses the LSMs about what is being loaded. Additionally, there was > no actual validation of the firmware contents happening. > > Fixes: e4c2c0ff00ec ("firmware: Add new platform fallback mechanism and firmware_request_platform()") > Cc: stable@vger.kernel.org > Signed-off-by: Kees Cook Acked-by: Scott Branden > --- > To aid in backporting, this change is made before moving > kernel_read_file() to separate header/source files. > --- > drivers/base/firmware_loader/fallback_platform.c | 2 +- > include/linux/fs.h | 3 +-- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/base/firmware_loader/fallback_platform.c b/drivers/base/firmware_loader/fallback_platform.c > index 685edb7dd05a..6958ab1a8059 100644 > --- a/drivers/base/firmware_loader/fallback_platform.c > +++ b/drivers/base/firmware_loader/fallback_platform.c > @@ -17,7 +17,7 @@ int firmware_fallback_platform(struct fw_priv *fw_priv, u32 opt_flags) > if (!(opt_flags & FW_OPT_FALLBACK_PLATFORM)) > return -ENOENT; > > - rc = security_kernel_load_data(LOADING_FIRMWARE_EFI_EMBEDDED); > + rc = security_kernel_load_data(LOADING_FIRMWARE); > if (rc) > return rc; > > diff --git a/include/linux/fs.h b/include/linux/fs.h > index 95fc775ed937..f50a35d54a61 100644 > --- a/include/linux/fs.h > +++ b/include/linux/fs.h > @@ -2993,11 +2993,10 @@ static inline void i_readcount_inc(struct inode *inode) > #endif > extern int do_pipe_flags(int *, int); > > -/* This is a list of *what* is being read, not *how*. */ > +/* This is a list of *what* is being read, not *how* nor *where*. */ > #define __kernel_read_file_id(id) \ > id(UNKNOWN, unknown) \ > id(FIRMWARE, firmware) \ > - id(FIRMWARE_EFI_EMBEDDED, firmware) \ > id(MODULE, kernel-module) \ > id(KEXEC_IMAGE, kexec-image) \ > id(KEXEC_INITRAMFS, kexec-initramfs) \