From patchwork Fri Aug 4 17:05:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mirsad Todorovac X-Patchwork-Id: 131276 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:1a9a:b0:139:fa0d:b2d with SMTP id gm26csp96375rwb; Fri, 4 Aug 2023 10:38:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGegn9Kn91nAkjOb0vQz1S5igigZRaCz1veCdlvD5icUus+lIeL9wtCXmIx/0RxLqTMX5ZW X-Received: by 2002:a17:902:d4c8:b0:1bc:1e17:6d70 with SMTP id o8-20020a170902d4c800b001bc1e176d70mr426242plg.24.1691170704776; Fri, 04 Aug 2023 10:38:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691170704; cv=none; d=google.com; s=arc-20160816; b=Ziiupak+7Q6Xy7sKTyX7uuv/c3HDxiIqhVufKhIbHm+9Xshrl1/ZP5dsyv/3cijVDD Y04XNACseXSjkuYKj55NI/dKngp+peHnPk/Tu5HX1t2JYtIqQbIdMTjlKnIFi28CKyBj tlSK2SGIPWtPk3NVX/+d6rghSusgR93M9kqHYKOiM4wEQ5MbGScECLmCLPfKZ/SM7+Yo RnQoIpoOQvK4nL1xAQI7mMvhShP9XyVSegFR07soV0veNHC7mqxFG4r3nfuLvsn4G/MR YKGcLpQBch0hxVEXmYY4Ci723RI8FGojjE2gnJ0tLSl02FOfWU8QgQ7hQ3AVgmPqzfIa XEzg== 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=b5/CPSydWXfRphPXumhaAbY0mYToQgfxBTepsXd4PHg=; fh=XjyNB95yoVpl1Pmuvsnk+85Q8XEKFCWq0nVxooeDBp4=; b=MFHUV/3XPeXm8Vq0Rf57c2uy+p4X7y+o+cH93SL7YDRXf1jUegUEUm8XZMESnobu9w NZu3kL271iwrYPyk24HA8FnVTOLRnYUqUSwZGNXBX3Xc0xvW5Cb0XgZxc6ZAkdmbbeJK sjZ7RZeYULk5GEUQJ861opeEEm6NyLEj8CtHnzmw/7+BHKb4D+RQH9jih+7squSzaQpU l70Fm9VO9sWiUHbEEfqA+7alYL/aipRAJSqGfa+N9T4R4xidnHMjPf2aEb4HCdJJ1Q0F G9X1nuaSDgVM/H8Jtw6q1CTDKUc9X3JXtEY7HziMk4CE23FjSpO9qNhFM3t5EAMJr33i PNRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=LVZwOKjj; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=Kaxj7Pwc; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i2-20020a170902c94200b001bbfbe6bf3esi2083473pla.504.2023.08.04.10.38.10; Fri, 04 Aug 2023 10:38:24 -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=LVZwOKjj; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=Kaxj7Pwc; 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 S231831AbjHDRJq (ORCPT + 99 others); Fri, 4 Aug 2023 13:09:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232216AbjHDRJc (ORCPT ); Fri, 4 Aug 2023 13:09:32 -0400 Received: from domac.alu.hr (domac.alu.unizg.hr [161.53.235.3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6391849E8; Fri, 4 Aug 2023 10:09:19 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by domac.alu.hr (Postfix) with ESMTP id 0530960177; Fri, 4 Aug 2023 19:09:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1691168958; bh=3JiXZASr/FsY0LPdywqZZQAkPJKMfvzD/I/olgkRIwA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LVZwOKjjFNnT4xWAwUCJ7hU5A5B0T7bB6cBVvH0FSnGwQSUV58D77YAESfiN3rxIE h6iVpSF9lrQkeoZ9p9W5TxfCgy1k/hXQjOAgU/Wk5ieOflzM97dQYg5svDovq76myq TZDeHRqGnwRQI7BZvIf8PDRERCZSrAibOdpp9QZ/sysMQoImeg/YUd5pu4+2Ns9Bou d7020hdNbmE4Zgatoh1A+LF839Lq3LNzq3JcYFtDCc5e3VIHx4FcqkhQuL7CZMCe9y DbDt1MkjEbD+657ctEcwVrxwOgAeUdbr/OtztcEjK3CwkFyQvka55hjU95BdxaHCn4 yJ4jJZk2+AL2Q== 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 j3SnGruj2ZK9; Fri, 4 Aug 2023 19:09:15 +0200 (CEST) Received: from defiant.. (unknown [94.250.191.183]) by domac.alu.hr (Postfix) with ESMTPSA id 6355B60174; Fri, 4 Aug 2023 19:09:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1691168955; bh=3JiXZASr/FsY0LPdywqZZQAkPJKMfvzD/I/olgkRIwA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kaxj7PwcMD8VP8mhF0K0DEIxxVh/UxxX6NbNuqymSei6rn+LmMyeiJNykNGuzRjI7 iPYrlVkJGBNZ545hpacB1AI0Sj+mAMnHBob23LYpTvzqXTZHDEzOdqDdDuOTS3s3CR VYmAsIC0FO3h6e1gxTFb4R4AXyDUxJgUZ8CJeJteKIN84N75lXwnrvX7Qpx4EGBlgK 8Dw6TJxLqfPj6BSWqQ1lql12DhJ0lLRVqGqAP9LMmv/THTVkgtDs2vvMqjhosXYuAM FbW/c554oLb72ceXCvuBQFozp8Aj0cKS5bwt0XFBeWLaWycrYgm/rqEinfenPw/OaY o/uhBkNK+tVxw== 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 v4 5.4 2/2] test_firmware: return -ENOMEM instead of -ENOSPC on failed memory allocation Date: Fri, 4 Aug 2023 19:05:30 +0200 Message-Id: <20230804170528.93028-2-mirsad.todorovac@alu.unizg.hr> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230804170528.93028-1-mirsad.todorovac@alu.unizg.hr> References: <20230804170528.93028-1-mirsad.todorovac@alu.unizg.hr> MIME-Version: 1.0 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, URIBL_BLOCKED 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773321012924522898 X-GMAIL-MSGID: 1773321012924522898 [ 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 # 5.4 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 the 5.4 branch. There are no ] [ semantic differences in the commit when compared to upstream, only fewer instances ] [ of error code replacement. Backport is provided for completeness sake ] [ so it would apply to all of the supported LTS kernels. ] --- v4: minor clarification in versioning for the patchwork. no change to the commit. v3: fixed a minor typo. no change to commit. 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,