Skip to content

Commit

Permalink
rpmsg: Fix kfree() of static memory on setting driver_override
Browse files Browse the repository at this point in the history
commit 42cd402 upstream.

The driver_override field from platform driver should not be initialized
from static memory (string literal) because the core later kfree() it,
for example when driver_override is set via sysfs.

Use dedicated helper to set driver_override properly.

Fixes: 950a738 ("rpmsg: Turn name service into a stand alone driver")
Fixes: c0cdc19 ("rpmsg: Driver for user space endpoint interface")
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20220419113435.246203-13-krzysztof.kozlowski@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Lee Jones <lee@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
krzk authored and gregkh committed Nov 8, 2023
1 parent e9a07a5 commit 79ec08a
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
13 changes: 11 additions & 2 deletions drivers/rpmsg/rpmsg_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,19 @@ struct device *rpmsg_find_device(struct device *parent,
*/
static inline int rpmsg_chrdev_register_device(struct rpmsg_device *rpdev)
{
int ret;

strcpy(rpdev->id.name, "rpmsg_chrdev");
rpdev->driver_override = "rpmsg_chrdev";
ret = driver_set_override(&rpdev->dev, &rpdev->driver_override,
rpdev->id.name, strlen(rpdev->id.name));
if (ret)
return ret;

ret = rpmsg_register_device(rpdev);
if (ret)
kfree(rpdev->driver_override);

return rpmsg_register_device(rpdev);
return ret;
}

#endif
6 changes: 4 additions & 2 deletions include/linux/rpmsg.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ struct rpmsg_channel_info {
* rpmsg_device - device that belong to the rpmsg bus
* @dev: the device struct
* @id: device id (used to match between rpmsg drivers and devices)
* @driver_override: driver name to force a match
* @driver_override: driver name to force a match; do not set directly,
* because core frees it; use driver_set_override() to
* set or clear it.
* @src: local address
* @dst: destination address
* @ept: the rpmsg endpoint of this channel
Expand All @@ -75,7 +77,7 @@ struct rpmsg_channel_info {
struct rpmsg_device {
struct device dev;
struct rpmsg_device_id id;
char *driver_override;
const char *driver_override;
u32 src;
u32 dst;
struct rpmsg_endpoint *ept;
Expand Down

0 comments on commit 79ec08a

Please sign in to comment.