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,URIBL_BLOCKED,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 5AC2EC433E1 for ; Tue, 21 Jul 2020 21:43:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2F73120771 for ; Tue, 21 Jul 2020 21:43:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="WyitzgLC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731209AbgGUVnT (ORCPT ); Tue, 21 Jul 2020 17:43:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731001AbgGUVnS (ORCPT ); Tue, 21 Jul 2020 17:43:18 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 830DCC061794 for ; Tue, 21 Jul 2020 14:43:18 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id c80so45680wme.0 for ; Tue, 21 Jul 2020 14:43:18 -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=xi0hCpRkmcf6gK8tASFxK3aaOMPZtOr07eR1uGQZQ3Q=; b=WyitzgLCPTotTvFyXBjJCUBLv9LTVIGuV0BLXP/t+rNxyFRvxJQhiYjVQxrxFWakWu 49H70+HEYP6PnW9KhlJ465HMbNOR6C7Be16Ag+Ttve3BCJ0H/uLHpyc9JTOy696ifuKV FDhgso1RDz81jzni2fNhhGBmN+KDfYXTEOgY4= 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=xi0hCpRkmcf6gK8tASFxK3aaOMPZtOr07eR1uGQZQ3Q=; b=DYVM2TCzZbnID6pWNJ0Ll1VW+4PYDuEddwQnK5GQk1hG0ztUwI6ioGa3/9UKgCfinh vtFrK2NSHSRJ8Pkd7cbwx+qTRoS+tcO9wQM0w1kxXiDCGRZzI0JMRSEaaFgsUucSXs4q dCk4RpXwrxXFzT9PrwHDCZ+BwKuUu0z6hTvYDM1fwMAhGP6DbI4pe+O6PoG4Idvijbzm WTkg+PdgQjQxubbYwh33pJVeUnj5YpIUuUY2Pr9EeDqGuPEtdgYkwcF//HDNA3Hrdz9d cUUYfNDssH5b9d9zseKvL67NHs0QJisd3AaVRf8OlktrdaKp3loW1B4GR9dp/rXMEC48 f7RQ== X-Gm-Message-State: AOAM5321SbyReTYJYxt9yWxu/47kgb1exG5vVeKs3FucLsU7d3echuT+ MCD7WB5Vza3eVZcm1+GlZci9Wg== X-Google-Smtp-Source: ABdhPJylo9oBD0Nkc2IZhuODZGWhVfU7dT9PhCcECwJI5ehMiPxyWlzltkQd49Y0rX47zJzR6OdmzA== X-Received: by 2002:a1c:2402:: with SMTP id k2mr5758664wmk.138.1595367797160; Tue, 21 Jul 2020 14:43:17 -0700 (PDT) Received: from [10.136.13.65] ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id y11sm23591601wrs.80.2020.07.21.14.43.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 21 Jul 2020 14:43:16 -0700 (PDT) Subject: Re: [PATCH 06/13] fs/kernel_read_file: Remove redundant size argument To: Kees Cook Cc: 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 , Stephen Boyd , 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-7-keescook@chromium.org> From: Scott Branden Message-ID: Date: Tue, 21 Jul 2020 14:43:07 -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-7-keescook@chromium.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org Hi Kees, On 2020-07-17 10:43 a.m., Kees Cook wrote: > In preparation for refactoring kernel_read_file*(), remove the redundant > "size" argument which is not needed: it can be included in the return > code, with callers adjusted. (VFS reads already cannot be larger than > INT_MAX.) > > Signed-off-by: Kees Cook > --- > drivers/base/firmware_loader/main.c | 8 ++++---- > fs/kernel_read_file.c | 20 +++++++++----------- > include/linux/kernel_read_file.h | 8 ++++---- > kernel/kexec_file.c | 13 ++++++------- > kernel/module.c | 7 +++---- > security/integrity/digsig.c | 5 +++-- > security/integrity/ima/ima_fs.c | 5 +++-- > 7 files changed, 32 insertions(+), 34 deletions(-) > > diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c > index d4a413ea48ce..ea419c7d3d34 100644 > --- a/drivers/base/firmware_loader/main.c > +++ b/drivers/base/firmware_loader/main.c > @@ -462,7 +462,7 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv, > size_t in_size, > const void *in_buffer)) > { > - loff_t size; > + size_t size; > int i, len; > int rc = -ENOENT; > char *path; > @@ -494,10 +494,9 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv, > fw_priv->size = 0; > > /* load firmware files from the mount namespace of init */ > - rc = kernel_read_file_from_path_initns(path, &buffer, > - &size, msize, > + rc = kernel_read_file_from_path_initns(path, &buffer, msize, > READING_FIRMWARE); > - if (rc) { > + if (rc < 0) { > if (rc != -ENOENT) > dev_warn(device, "loading %s failed with error %d\n", > path, rc); > @@ -506,6 +505,7 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv, > path); > continue; > } > + size = rc; Change fails to return 0.  Need rc = 0; here. > dev_dbg(device, "Loading firmware from %s\n", path); > if (decompress) { > dev_dbg(device, "f/w decompressing %s\n", >