From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 AE848143867; Thu, 13 Jun 2024 11:59:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718279979; cv=none; b=G+/oqgmSVzj4ScIdCsUWXTYGACNa0Q1yDJgdNcctuDI5YWepgKrmNmd6mJon5GHBMGDZVgl1k2FV3b60bASnTpgRmLZkgl6ejt4yVUdKF+FtVeLkzhpbDSScRIdk0HDqPC48w78WI44xhh0Wdl04GMpOs0Lx1yAKYL/uVmlaR2w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718279979; c=relaxed/simple; bh=gyaaCNKP7u3/FDYZJPeBpVt1w+mK6DIRf9v2Mxx1Es0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XMxuCXNlXKmVWfDEQowncs4pvTTPMAqhW6ewvWKa+nR4BRHHfVvDLPELuau+BBztp4o8XLpxFf9WwNBGHT2b9KlqwgMvn2enoZYE4umjsrvr7Zbaw61Xs8VXRxaCdNcJqy2Gj5GBJojp1BeXuWOdn9JaYDStkUyr4UZ/hhmacVA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=AYAWEtL0; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="AYAWEtL0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E22AC2BBFC; Thu, 13 Jun 2024 11:59:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718279979; bh=gyaaCNKP7u3/FDYZJPeBpVt1w+mK6DIRf9v2Mxx1Es0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AYAWEtL0VGnotinhIOaGz/5US3WtKSDihJLKDOzFUt2cB7HPNSCavDLS8SCEY+RsR hkhj0nFPrmOpcqdso5az+52Oid/yAsDoFjLbC7Y2q0jVNXKziYtpB/c/AP2u6NtBjR GUlK8xA7At8n4M6rqlYwNVnsT1/dfxvHuGou9kmY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Arnd Bergmann , Jean Delvare , Sasha Levin Subject: [PATCH 5.4 102/202] firmware: dmi-id: add a release callback function Date: Thu, 13 Jun 2024 13:33:20 +0200 Message-ID: <20240613113231.701400846@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240613113227.759341286@linuxfoundation.org> References: <20240613113227.759341286@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnd Bergmann [ Upstream commit cf770af5645a41a753c55a053fa1237105b0964a ] dmi_class uses kfree() as the .release function, but that now causes a warning with clang-16 as it violates control flow integrity (KCFI) rules: drivers/firmware/dmi-id.c:174:17: error: cast from 'void (*)(const void *)' to 'void (*)(struct device *)' converts to incompatible function type [-Werror,-Wcast-function-type-strict] 174 | .dev_release = (void(*)(struct device *)) kfree, Add an explicit function to call kfree() instead. Fixes: 4f5c791a850e ("DMI-based module autoloading") Link: https://lore.kernel.org/lkml/20240213100238.456912-1-arnd@kernel.org/ Signed-off-by: Arnd Bergmann Signed-off-by: Jean Delvare Signed-off-by: Sasha Levin --- drivers/firmware/dmi-id.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c index ff39f64f2aae3..1bb3370650cf5 100644 --- a/drivers/firmware/dmi-id.c +++ b/drivers/firmware/dmi-id.c @@ -160,9 +160,14 @@ static int dmi_dev_uevent(struct device *dev, struct kobj_uevent_env *env) return 0; } +static void dmi_dev_release(struct device *dev) +{ + kfree(dev); +} + static struct class dmi_class = { .name = "dmi", - .dev_release = (void(*)(struct device *)) kfree, + .dev_release = dmi_dev_release, .dev_uevent = dmi_dev_uevent, }; -- 2.43.0