2022-12-01 19:39:01

by Greg Kroah-Hartman

Subject: [PATCH 4/4] firmware_loader: fix up to_fw_sysfs() to preserve const

to_fw_sysfs() was changed in commit 23680f0b7d7f ("driver core: make
struct class.dev_uevent() take a const *") to pass in a const pointer
but not pass it back out to handle some changes in the driver core.
That isn't the best idea as it could cause problems if used incorrectly,
so switch to use the container_of_const() macro instead which will
preserve the const status of the pointer and enforce it by the compiler.

Cc: Luis Chamberlain <[email protected]>
Cc: Russ Weight <[email protected]>
Cc: "Rafael J. Wysocki" <[email protected]>
Fixes: 23680f0b7d7f ("driver core: make struct class.dev_uevent() take a const *")
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/base/firmware_loader/sysfs.h | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/base/firmware_loader/sysfs.h b/drivers/base/firmware_loader/sysfs.h
index fd0b4ad9bdbb..0f0b1f7bf335 100644
--- a/drivers/base/firmware_loader/sysfs.h
+++ b/drivers/base/firmware_loader/sysfs.h
@@ -80,11 +80,8 @@ struct fw_sysfs {
struct firmware *fw;
void *fw_upload_priv;
};
-
-static inline struct fw_sysfs *to_fw_sysfs(const struct device *dev)
-{
- return container_of(dev, struct fw_sysfs, dev);
-}
+#define to_fw_sysfs(__dev) \
+ container_of_const(struct device, __dev, struct fw_sysfs, dev)

void __fw_load_abort(struct fw_priv *fw_priv);

--
2.38.1

2022-12-01 20:41:05

by Russ Weight

Subject: Re: [PATCH 4/4] firmware_loader: fix up to_fw_sysfs() to preserve const

On 12/1/22 11:30, Greg Kroah-Hartman wrote:
> to_fw_sysfs() was changed in commit 23680f0b7d7f ("driver core: make
> struct class.dev_uevent() take a const *") to pass in a const pointer
> but not pass it back out to handle some changes in the driver core.
> That isn't the best idea as it could cause problems if used incorrectly,
> so switch to use the container_of_const() macro instead which will
> preserve the const status of the pointer and enforce it by the compiler.
>
> Cc: Luis Chamberlain <[email protected]>
> Cc: Russ Weight <[email protected]>
> Cc: "Rafael J. Wysocki" <[email protected]>
> Fixes: 23680f0b7d7f ("driver core: make struct class.dev_uevent() take a const *")
Acked-by: Russ Weight <[email protected]>
> Signed-off-by: Greg Kroah-Hartman <[email protected]>
> ---
> drivers/base/firmware_loader/sysfs.h | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/base/firmware_loader/sysfs.h b/drivers/base/firmware_loader/sysfs.h
> index fd0b4ad9bdbb..0f0b1f7bf335 100644
> --- a/drivers/base/firmware_loader/sysfs.h
> +++ b/drivers/base/firmware_loader/sysfs.h
> @@ -80,11 +80,8 @@ struct fw_sysfs {
> struct firmware *fw;
> void *fw_upload_priv;
> };
> -
> -static inline struct fw_sysfs *to_fw_sysfs(const struct device *dev)
> -{
> - return container_of(dev, struct fw_sysfs, dev);
> -}
> +#define to_fw_sysfs(__dev) \
> + container_of_const(struct device, __dev, struct fw_sysfs, dev)
>
> void __fw_load_abort(struct fw_priv *fw_priv);
>