Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 70B8547DD42; Thu, 20 Aug 2026 17:49:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787248199; cv=none; b=eq+33zMSzrQzjbOURFjc2EmNwvYzdXCToAFjNSqyFX6SPDHeFkHyi+5/FsDdVCgwI9x04+xtwnh23TqaPo8t9CzKaRbtmrNQXPGyorhdFk157u1lRegJzgwxJJ+F1ghmjwC/f91n3k5cCL3WAT079Jfwh5pKcyac3VeuEpGIb0g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787248199; c=relaxed/simple; bh=5zXAa/XSvQoMC71Bmpm4nMM/WbV99ZFm6+3YPX3a2mY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JmIsfJ4/4IXN7pSCrWYx18LT7aal/NTKEppTQUZ///WnrKnFbr0Kt8b1Jm5THcilBsdx/Y4EZXcTesH5d03KT+Ha3Yl2x9OnNgFeqtFRfvGNOLZNHlgCSyZtaMZXxoxvDYfspGFq8rpjkPDixdnO/qMeUaWqplPdJwdCCgq9txE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=xazYgNEB; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="xazYgNEB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE9F51F000E9; Thu, 20 Aug 2026 17:49:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1787248198; bh=7qjkNjDgPnFVAjn79KqlE31ezUFItYZY7JVX2ht/5sM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=xazYgNEBG9H9cp6bGAfcpz3Gz3NXFU2udCKDfiv0RcwKXkH7U0oI7mYSqemWoMjvw SnJYpX+mriCPiZwGSt1w37IcFXYi8h+SB3WIKT00ZKwJ16AjI66nkPq6mklr4LfjSr LLHRyb2npKi+K9k00HD9XO+m3uKrEilKbyjvvBk4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dmitry Torokhov , Luis Chamberalin , Sasha Levin Subject: [PATCH 6.1 142/303] firmware_loader: introduce __free() cleanup hanler Date: Thu, 20 Aug 2026 16:54:38 +0200 Message-ID: <20260820145257.549410129@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260820145253.200766705@linuxfoundation.org> References: <20260820145253.200766705@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dmitry Torokhov [ Upstream commit 8dde8fa0cc3edce73c050b9882d06c1a575f6402 ] Define cleanup handler using facilities from linux/cleanup.h to simplify error handling in code using firmware loader. This will allow writing code like this: int driver_update_firmware(...) { const struct firmware *fw_entry __free(firmware) = NULL; int error; ... error = request_firmware(&fw_entry, fw_name, dev); if (error) { dev_err(dev, "failed to request firmware %s: %d", fw_name, error); return error; } error = check_firmware_valid(fw_entry); if (error) return error; guard(mutex)(&instance->lock); error = use_firmware(instance, fw); if (error) return error; return 0; } Signed-off-by: Dmitry Torokhov Acked-by: Luis Chamberalin Link: https://lore.kernel.org/r/ZaeQw7VXhnirX4pQ@google.com Signed-off-by: Greg Kroah-Hartman Stable-dep-of: d48795b5cd68 ("Input: ims-pcu - fix firmware leak in async update") Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- include/linux/firmware.h | 3 +++ 1 file changed, 3 insertions(+) --- a/include/linux/firmware.h +++ b/include/linux/firmware.h @@ -4,6 +4,7 @@ #include #include +#include #include #define FW_ACTION_NOUEVENT 0 @@ -196,4 +197,6 @@ static inline void firmware_upload_unreg int firmware_request_cache(struct device *device, const char *name); +DEFINE_FREE(firmware, struct firmware *, release_firmware(_T)) + #endif