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=-4.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no 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 10195C433E0 for ; Wed, 29 Jul 2020 17:43:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E977720809 for ; Wed, 29 Jul 2020 17:43:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="AeIC13m1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726909AbgG2Rnn (ORCPT ); Wed, 29 Jul 2020 13:43:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726509AbgG2Rnm (ORCPT ); Wed, 29 Jul 2020 13:43:42 -0400 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA510C0619D4 for ; Wed, 29 Jul 2020 10:43:42 -0700 (PDT) Received: by mail-pj1-x1044.google.com with SMTP id t15so2390122pjq.5 for ; Wed, 29 Jul 2020 10:43:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=IpEGCE0q6wfkYpfpb/XDXdn9nS+GlD2TddAOE4NPPEI=; b=AeIC13m1PsJ9z1wydsneAxkveLemVv0ncScQ95F89DpbbaDUXaLs0ZekavY7hIqmcf 1cn+yLjaDnBiXc55t/AK+wm85QCn3O3eCId3jp3rGWi9NiUN0pnHpzBedcNhBLblAu/m GlQQdatGAdDTMjuMRzH2l+Y5BJt32wYo9cFOQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=IpEGCE0q6wfkYpfpb/XDXdn9nS+GlD2TddAOE4NPPEI=; b=OQ3MbD383zD2NDJUrvn7bIpTANECL81lnJuiIQf27WgukS7kEjuYxgKKTmQ82RS/0g 9IIs1rYDHRzIwccPB7U5DHXrSFMhsmVMle85CzoP/ZtDW1BJFFUdIeSdcDKP/AGtJjMU nHcj/8NVPWo98ZlvTmVU99/V/Zwc2u3kJ3CchSQFUU/eXdavsKlq5hohD6eC+PHxKhBo OtZuY6J9W50ShyJvIHg0uKEqcjRDC0nKvvRaOTazRmCJrIO+/cILTiPTjuYOkTA9mHh1 OFYLYyQXN7lRw4KYBtj8ragewkB4cBu2RziOWZinLR3K2eYZXMPmCgZTc8peD57ftqNc UM9A== X-Gm-Message-State: AOAM5337HD2BT4Czn4wDi3SI6wJYE8zzIwm8aZx+4snXH19Sc+iUoPcm To4P0wZBoxIWFv2fAt187RS0xQ== X-Google-Smtp-Source: ABdhPJxfv+PReysFLw6E6WSNkne32mRmLTJMCFDDzBnP6rL7W8en+DYYRDnVGx8rX3N+fPYgEFIppg== X-Received: by 2002:a17:90b:112:: with SMTP id p18mr11067747pjz.92.1596044622171; Wed, 29 Jul 2020 10:43:42 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id r77sm3226522pfc.193.2020.07.29.10.43.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jul 2020 10:43:40 -0700 (PDT) Date: Wed, 29 Jul 2020 10:43:39 -0700 From: Kees Cook To: Takashi Iwai Cc: Luis Chamberlain , Greg Kroah-Hartman , Scott Branden , Mimi Zohar , Jessica Yu , SeongJae Park , KP Singh , linux-efi@vger.kernel.org, linux-security-module@vger.kernel.org, linux-integrity@vger.kernel.org, selinux@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 18/19] firmware: Add request_partial_firmware_into_buf() Message-ID: <202007291042.D43AA4AB37@keescook> References: <20200724213640.389191-1-keescook@chromium.org> <20200724213640.389191-19-keescook@chromium.org> <20200729011739.GL4332@42.do-not-panic.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org On Wed, Jul 29, 2020 at 08:22:17AM +0200, Takashi Iwai wrote: > On Wed, 29 Jul 2020 03:17:39 +0200, > Luis Chamberlain wrote: > > > > Long ago Takashi had some points about this strategy breaking > > compressed file use. Was that considered? > > As long as I read the patch, it tries to skip both the compressed and > the fallback loading when FW_OPT_PARTIAL is set, which is good. > > However... > > > > @@ -771,18 +805,20 @@ _request_firmware(const struct firmware **firmware_p, const char *name, > > > } > > > > > > ret = _request_firmware_prepare(&fw, name, device, buf, size, > > > - opt_flags); > > > + offset, opt_flags); > > > if (ret <= 0) /* error or already assigned */ > > > goto out; > > > > > > ret = fw_get_filesystem_firmware(device, fw->priv, "", NULL); > > > -#ifdef CONFIG_FW_LOADER_COMPRESS > > > - if (ret == -ENOENT) > > > + > > > + /* Only full reads can support decompression, platform, and sysfs. */ > > > + if (!(opt_flags & FW_OPT_PARTIAL)) > > > + nondirect = true; > > > + > > > + if (ret == -ENOENT && nondirect) > > > ret = fw_get_filesystem_firmware(device, fw->priv, ".xz", > > > fw_decompress_xz); > > > -#endif > > ... by dropping this ifdef, the fw loader would try to access *.xz > file unnecessarily even if CONFIG_FW_LOADER_COMPRESS is disabled. Ah, good point. I'd added the -ENOENT fw_decompress_xz, but I take your point about the needless access. I will switch this back to an #ifdef. -- Kees Cook