Received: by 2002:a05:6358:700f:b0:131:369:b2a3 with SMTP id 15csp2356280rwo; Thu, 3 Aug 2023 08:16:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlG/VbTzSAd0v+6lZEEDi+GWRAxYXKonncOtI5TyVIODj86gYm7qkVEIpPk2oJLr1U+oDREH X-Received: by 2002:a17:906:5308:b0:99b:ed27:9f4c with SMTP id h8-20020a170906530800b0099bed279f4cmr8258451ejo.69.1691075778375; Thu, 03 Aug 2023 08:16:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691075778; cv=none; d=google.com; s=arc-20160816; b=SHX5zx4pgH44GQly6yTWrrosEONKd+6sOs3zUmvPtgdQ/WtGuRd0hAZQ3YA592uOZu /R+DqZe9E+oUAAeYBA71zbWnV4cH2g6qfwhv+Qsq2kqTmLS+5k9BoLXh7uWb9huPMC+Z 4zIjTSXJXe2qKxJTUkO1VkBJjuj4TRB0iNly+BCW7ghVC7pq5x8LnXRjMqf4LvWPO7ie zmlrR01nb7/icBC4rf12kvTYI4zGf5tZizn2ZkwiSQ3KEtPdkT7uda2t0+03NTnuA67c pCC3esxmd0lk4ByvRUA0gMTnwztsj2vz/w0bWuqgppDO0mcGu38rPjgnBO0u9sC6nZZo 3cWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=gpBKnDovxQLeHjNftEV0p9Y/a7M+IuB1M+xhUKRbhCo=; fh=XjyNB95yoVpl1Pmuvsnk+85Q8XEKFCWq0nVxooeDBp4=; b=OIVg4Nwv7pTighurKFp0swEYvUFJGl+vFJcmXRk4uEh6hqH+1Sa4F/RYrHlgj9XnwC EyurVB7VqXQBVwwVsVuBs1PtV8ni+/B6wM5zRWLuOHs+uRvAG8nb0n//WJf00jPi5KQL Am/KgzwkEifeVl/6eIrokMYlXtXcluyLZUQ7h1/i0GgPi7MPI4WGB9A4B2KU8e305qEC 2Sw8hDDz+Ua29K2bTk+uqlWE2fRsmVRTQKuEuAWWfM9kf42OmvcR6r0JWKiXW5vf/Ajk zCkiGjiRTH5OiuS9EAtlVossXH9C6KYvv67Olsfdfz2LssvBQm+vAB/MzXjIv1eckzDS M5cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=W5AXfG83; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=HNpxiyMQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alu.unizg.hr Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ja1-20020a170907988100b0099bcf57414esi12910535ejc.896.2023.08.03.08.15.24; Thu, 03 Aug 2023 08:16:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=W5AXfG83; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=HNpxiyMQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alu.unizg.hr Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236341AbjHCOrN (ORCPT + 99 others); Thu, 3 Aug 2023 10:47:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236724AbjHCOrD (ORCPT ); Thu, 3 Aug 2023 10:47:03 -0400 Received: from domac.alu.hr (domac.alu.unizg.hr [IPv6:2001:b68:2:2800::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00AB53ABA; Thu, 3 Aug 2023 07:46:47 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by domac.alu.hr (Postfix) with ESMTP id 87B1B60182; Thu, 3 Aug 2023 16:46:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1691074006; bh=XDroynnUjUBJEtp/2QLFLkXj09Awer2npj4c8l8wtN8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W5AXfG833jMfoDSe+SbeS9XN/NVK+m1mUJtLdOHhRGQo1QKdIsszFGfCUQHcrx0LX xm2Yzem9Mi8L79lyxJWrXLe3aHVUcRccmmdBEZT+qHRW8hE3ArFxGAyXupgXpuTq24 Tm6kw0it3oO4ozMW2147W+pjS/Vykt6K0RimBWGxNJ+Wuwk0Rk7xXd6Opi/nvQ8pSB WsBw3ruZfXzFvCL7ipbXXd95YMgNeRKCE0SjImyt8elDKHo+weO7Fslwx1CsIzxnwO DlQLC7B2MxNe4QtjyAYF9KzLP3Spm18cAefxPER/8Uf4Z/iWnlmzWeaBirUEg4XGTZ JGJWqsitMdA+Q== X-Virus-Scanned: Debian amavisd-new at domac.alu.hr Received: from domac.alu.hr ([127.0.0.1]) by localhost (domac.alu.hr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id clE_6VX2vetW; Thu, 3 Aug 2023 16:46:44 +0200 (CEST) Received: from pc-mtodorov.slava.alu.hr (pc-mtodorov.slava.alu.hr [193.198.186.200]) by domac.alu.hr (Postfix) with ESMTPSA id 05FFD6017F; Thu, 3 Aug 2023 16:46:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1691074004; bh=XDroynnUjUBJEtp/2QLFLkXj09Awer2npj4c8l8wtN8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HNpxiyMQHHvXmeiafqhFrS9euCBk6QcmVGJU/oDITpjolO9qoZV61J5TuxkbgYV0c 5cuAAw8iK/Vy3bOSROhceS1/uPbAbkzu7HjH0/WXW4BFUujYcsoHvru4hX2QI4/gTL 9m8BhgGgWNxkf6T0WIQRdXI6XL66cu3yYtr8lbaRK1MxP93uUKOHcccv3R2F72jpSw deBN4SJQnUZOKJ49U0duvGDeJUjgavIZu871YKYM3JqUQ5HsQwV2i1JkTF6zD7fbtd 3ArwUiKJiDCcc0ZaZ+6inAU5iCm3oFjuUJUbzcaDs+CLc465N8rJ0Gwgj2PhGqkOtU IIob2jRq1SDQg== From: Mirsad Todorovac To: Greg Kroah-Hartman , Mirsad Todorovac , linux-kernel@vger.kernel.org Cc: Dan Carpenter , Takashi Iwai , Kees Cook , "Luis R . Rodriguez" , Brian Norris , stable@vger.kernel.org Subject: [PATCH v2 2/2] test_firmware: return ENOMEM instead of ENOSPC on failed memory allocation Date: Thu, 3 Aug 2023 16:44:53 +0200 Message-Id: <20230803144451.3571-2-mirsad.todorovac@alu.unizg.hr> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20230803144451.3571-1-mirsad.todorovac@alu.unizg.hr> References: <20230803144451.3571-1-mirsad.todorovac@alu.unizg.hr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 7dae593cd226a0bca61201cf85ceb9335cf63682 ] In a couple of situations like name = kstrndup(buf, count, GFP_KERNEL); if (!name) return -ENOSPC; the error is not actually "No space left on device", but "Out of memory". It is semantically correct to return -ENOMEM in all failed kstrndup() and kzalloc() cases in this driver, as it is not a problem with disk space, but with kernel memory allocator failing allocation. The semantically correct should be: name = kstrndup(buf, count, GFP_KERNEL); if (!name) return -ENOMEM; Cc: Dan Carpenter Cc: Takashi Iwai Cc: Kees Cook Cc: Luis R. Rodriguez Cc: Brian Norris Cc: stable@vger.kernel.org # 4.19, 4.14 Fixes: c92316bf8e948 ("test_firmware: add batched firmware tests") Fixes: 0a8adf584759c ("test: add firmware_class loader test") Fixes: eb910947c82f9 ("test: firmware_class: add asynchronous request trigger") Fixes: 061132d2b9c95 ("test_firmware: add test custom fallback trigger") Fixes: 7feebfa487b92 ("test_firmware: add support for request_firmware_into_buf") Link: https://lore.kernel.org/all/20230606070808.9300-1-mirsad.todorovac@alu.unizg.hr/ Signed-off-by: Mirsad Todorovac [ This is the backport of the patch to specific to 5.4 branch. There are no ] [ semantic differences in the commit. Backport is provided for completeness sake ] [ so it would apply to all of the supported LTS kernels. ] --- v2: tested on 5.4 stable build. lib/test_firmware.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/test_firmware.c b/lib/test_firmware.c index 92d7195d5b5b..dd3850ec1dfa 100644 --- a/lib/test_firmware.c +++ b/lib/test_firmware.c @@ -173,7 +173,7 @@ static int __kstrncpy(char **dst, const char *name, size_t count, gfp_t gfp) { *dst = kstrndup(name, count, gfp); if (!*dst) - return -ENOSPC; + return -ENOMEM; return count; } @@ -509,7 +509,7 @@ static ssize_t trigger_request_store(struct device *dev, name = kstrndup(buf, count, GFP_KERNEL); if (!name) - return -ENOSPC; + return -ENOMEM; pr_info("loading '%s'\n", name); @@ -552,7 +552,7 @@ static ssize_t trigger_async_request_store(struct device *dev, name = kstrndup(buf, count, GFP_KERNEL); if (!name) - return -ENOSPC; + return -ENOMEM; pr_info("loading '%s'\n", name); @@ -597,7 +597,7 @@ static ssize_t trigger_custom_fallback_store(struct device *dev, name = kstrndup(buf, count, GFP_KERNEL); if (!name) - return -ENOSPC; + return -ENOMEM; pr_info("loading '%s' using custom fallback mechanism\n", name); @@ -648,7 +648,7 @@ static int test_fw_run_batch_request(void *data) test_buf = kzalloc(TEST_FIRMWARE_BUF_SIZE, GFP_KERNEL); if (!test_buf) - return -ENOSPC; + return -ENOMEM; req->rc = request_firmware_into_buf(&req->fw, req->name, -- 2.39.3