From nobody Thu Oct 21 18:41:39 2021 X-Original-To: dev-commits-src-all@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 96DBC1817259; Thu, 21 Oct 2021 18:41:40 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HZxCS0ffYz3s8M; Thu, 21 Oct 2021 18:41:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 187C1205B1; Thu, 21 Oct 2021 18:41:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19LIfddO010400; Thu, 21 Oct 2021 18:41:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19LIfdAc010399; Thu, 21 Oct 2021 18:41:39 GMT (envelope-from git) Date: Thu, 21 Oct 2021 18:41:39 GMT Message-Id: <202110211841.19LIfdAc010399@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 6776747a0e0b - main - subr_firmware.c::unloadentry(): remote write-only variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6776747a0e0b1c0e3fb916685ac2180ca4ce2f3d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6776747a0e0b1c0e3fb916685ac2180ca4ce2f3d commit 6776747a0e0b1c0e3fb916685ac2180ca4ce2f3d Author: Konstantin Belousov AuthorDate: 2021-10-21 17:40:24 +0000 Commit: Konstantin Belousov CommitDate: 2021-10-21 18:40:46 +0000 subr_firmware.c::unloadentry(): remote write-only variable The function ignores result returned by linker_release_module(). The FW_UNLOAD flag on the file is cleared, so even on error it would not be tried again. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/kern/subr_firmware.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/kern/subr_firmware.c b/sys/kern/subr_firmware.c index 0465f2a88483..aafb2a2ba265 100644 --- a/sys/kern/subr_firmware.c +++ b/sys/kern/subr_firmware.c @@ -412,7 +412,6 @@ static void unloadentry(void *unused1, int unused2) { struct priv_fw *fp; - int err; mtx_lock(&firmware_mtx); restart: @@ -434,7 +433,7 @@ restart: * on unload to actually free the entry. */ mtx_unlock(&firmware_mtx); - err = linker_release_module(NULL, NULL, fp->file); + (void)linker_release_module(NULL, NULL, fp->file); mtx_lock(&firmware_mtx); /*