From nobody Sun Nov 01 01:22:46 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jHHBv15lwz6vXbW for ; Sun, 01 Nov 2026 01:22:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jHHBt6B82z4Fgk for ; Sun, 01 Nov 2026 01:22:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793496166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z0FcPwqwo4GYgFGis/+3DEgH2s7p76YASRqv32hgiZ0=; b=VEv5/+c5b2dXDmsz7a1a1ac3LOWRl4eF0y5TJcrDojeh4AZNr0aXqtfw2qw3bX2C0Na38j EJcIQsvXItJihpznC42oCrk+VUnkVUOiMu2kOg5HFTnQ3onT+kBMeyDE1Ok2OSJLN6P1ce QQuVPGAeDCasLZBV8FKcLb4+VI+EbOkse2p/8huAc50CWZ0Hz5S1lxVAmumvomdJcannhL n1s9bukWs1+Yx4Ux0hT1CKhcv8M0tMC/HGe2/3mT+rExjqYkjnJcpJFwn/jJYGfvjfksHP DjAkf1RgCUCUjVqR8SpAT+kOn8N/BR4ZsS8Ak6rjh4sSx5S6PqrdAcTa0eHA7g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793496166; b=bPbQb901h+vzcYpS520R81gEWcAyk1aJgnRhlNCowe49jt/Axz7q6cXYjv/yJCo0JfgGam /7z7PTH4in18KQU6/Mpx54qAzYKgie5WauNWpYAvOV+QHKAj2OWzYs/wQTNj6DEtv4kZO6 Hib4AiSsU9B6C20wx7TyHB5MmhzrmBgKtrxqEtpUBN+v3f3gBD9PiTvTIG2gLlDm1ImCgn U0PTc2HockJ1da/66wxc9AV0EbXAkFuveguZqtZ7/wZ8mSlBl6D0piaQgBND5c0hSmAPNJ NL3Lmho5O2vyGcdb/zzf6vno3RNTLJE9GX7xED1WgaKwNbI/84rGipXfeLdaBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793496166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z0FcPwqwo4GYgFGis/+3DEgH2s7p76YASRqv32hgiZ0=; b=hkC1DVWTNvDvTk0lCbKVzJkJAyq8BiKEde3FCak3T7FgL9KcvSwP+KGyFAnTVG3nC/PQ8E 3QwN7vosasCkeUFlksi10kmqxmPvwgc/bKiPYVNC4UgXiHaFqOCN6f2EXsCEX956R2Lfnt 6kWWptnkZx2gWZyLm4//0Pbi0aBf6Md7iV2c00eRp2ONsrmtzeX1q5dWZbv6JeFaeSKXnt In6mRMcg/jWRk4h6A3Bzvacqo6r/xZWqMcxhq+UzCs95LdANgRMHz26VB+CMmFIRSTDopd XZx5zl1xNTLYZFVOAt1qTUaA0pE/Q9rTf6vtphn+by+K4o0NLY8zVsxfY8mzEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jHHBt5qb1zdMp for ; Sun, 01 Nov 2026 01:22:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 226c3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Nov 2026 01:22:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: e4679ca286d0 - stable/15 - LinuxKPI: firmware: remove `enoentok` logic in `*firmware_request(..)` List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e4679ca286d0611cd6f79220ed8b74f36cf9aecd Auto-Submitted: auto-generated Date: Sun, 01 Nov 2026 01:22:46 +0000 Message-Id: <6ae69466.226c3.7f4c2699@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=e4679ca286d0611cd6f79220ed8b74f36cf9aecd commit e4679ca286d0611cd6f79220ed8b74f36cf9aecd Author: Enji Cooper AuthorDate: 2026-10-07 18:22:00 +0000 Commit: Enji Cooper CommitDate: 2026-11-01 01:18:57 +0000 LinuxKPI: firmware: remove `enoentok` logic in `*firmware_request(..)` Prior to this change, in the event that a firmware module could not be loaded, the linux_firmware driver would return a partially initialized structure with uninitialized/zeroed out values for certain fields. Linux does not do this, however, so some drivers that use `request_firmware_nowait` expecting Linux behavior, like `if_bcrmfmac`, would crash trying to dereference a NULL pointer. This doesn't address the load/unload situation completely as the driver remains loaded after the "firmware crashes", but it makes a completely unusable situation (a kernel panic) into a slightly more usable situation (driver does not unload). As a sidenote: the raw free(9) call was replaced with a call to `linuxkpi_release_firmware` because the latter call [better] ensures that all resources allocated earlier on in the function are cleaned up. MFC after: 1 weeks Reviewed by: bz Differential Revision: https://reviews.freebsd.org/D58451 (cherry picked from commit ef947bb97302d8862545cd0a5f38b24fa1bae2f6) --- sys/compat/linuxkpi/common/src/linux_firmware.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_firmware.c b/sys/compat/linuxkpi/common/src/linux_firmware.c index 0915b317c01e..0d8f9b770d70 100644 --- a/sys/compat/linuxkpi/common/src/linux_firmware.c +++ b/sys/compat/linuxkpi/common/src/linux_firmware.c @@ -57,7 +57,7 @@ struct lkpi_fw_task { static int _linuxkpi_request_firmware(const char *fw_name, const struct linuxkpi_firmware **fw, - struct device *dev, gfp_t gfp __unused, bool enoentok, bool warn) + struct device *dev, gfp_t gfp __unused, bool warn) { const struct firmware *fbdfw; struct linuxkpi_firmware *lfw; @@ -124,12 +124,8 @@ _linuxkpi_request_firmware(const char *fw_name, const struct linuxkpi_firmware * } } if (fbdfw == NULL) { - if (enoentok) - *fw = lfw; - else { - free(lfw, M_LKPI_FW); - *fw = NULL; - } + linuxkpi_release_firmware(lfw); + *fw = NULL; if (warn) device_printf(dev->bsddev, "could not load firmware image '%s'\n", @@ -159,8 +155,8 @@ lkpi_fw_task(void *ctx, int pending) if (lfwt->cont == NULL) goto out; - _linuxkpi_request_firmware(lfwt->fw_name, &fw, lfwt->dev, - lfwt->gfp, true, true); + _linuxkpi_request_firmware(lfwt->fw_name, &fw, lfwt->dev, lfwt->gfp, + true); /* * Linux seems to run the callback if it cannot find the firmware. @@ -200,8 +196,7 @@ linuxkpi_request_firmware(const struct linuxkpi_firmware **fw, const char *fw_name, struct device *dev) { - return (_linuxkpi_request_firmware(fw_name, fw, dev, GFP_KERNEL, false, - true)); + return (_linuxkpi_request_firmware(fw_name, fw, dev, GFP_KERNEL, true)); } int @@ -209,7 +204,7 @@ linuxkpi_firmware_request_nowarn(const struct linuxkpi_firmware **fw, const char *fw_name, struct device *dev) { - return (_linuxkpi_request_firmware(fw_name, fw, dev, GFP_KERNEL, false, + return (_linuxkpi_request_firmware(fw_name, fw, dev, GFP_KERNEL, false)); }