mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rpmsg: Fix kfree() of static memory on setting driver_override

Browse source 
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: 950a7388f0 ("rpmsg: Turn name service into a stand alone driver")
Fixes: c0cdc19f84 ("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>
This commit is contained in:
Krzysztof Kozlowski 2022-04-19 13:34:35 +02:00 committed by Greg Kroah-Hartman
parent e5f89131a0
commit 42cd402b8f
3 changed files with 28 additions and 7 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/rpmsg/rpmsg_internal.h
View file

@ -94,10 +94,19 @@ int rpmsg_release_channel(struct rpmsg_device *rpdev,
*/ */
static inline int rpmsg_ctrldev_register_device(struct rpmsg_device *rpdev) static inline int rpmsg_ctrldev_register_device(struct rpmsg_device *rpdev)
{ {
strcpy(rpdev->id.name, "rpmsg_ctrl"); int ret;
rpdev->driver_override = "rpmsg_ctrl";
return rpmsg_register_device(rpdev); strcpy(rpdev->id.name, "rpmsg_ctrl");
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 ret;
} }
#endif #endif

14
drivers/rpmsg/rpmsg_ns.c
View file

@ -20,12 +20,22 @@
*/ */
int rpmsg_ns_register_device(struct rpmsg_device *rpdev) int rpmsg_ns_register_device(struct rpmsg_device *rpdev)
{ {
int ret;
strcpy(rpdev->id.name, "rpmsg_ns"); strcpy(rpdev->id.name, "rpmsg_ns");
rpdev->driver_override = "rpmsg_ns"; ret = driver_set_override(&rpdev->dev, &rpdev->driver_override,
rpdev->id.name, strlen(rpdev->id.name));
if (ret)
return ret;
rpdev->src = RPMSG_NS_ADDR; rpdev->src = RPMSG_NS_ADDR;
rpdev->dst = RPMSG_NS_ADDR; rpdev->dst = RPMSG_NS_ADDR;
return rpmsg_register_device(rpdev); ret = rpmsg_register_device(rpdev);
if (ret)
kfree(rpdev->driver_override);
return ret;
} }
EXPORT_SYMBOL(rpmsg_ns_register_device); EXPORT_SYMBOL(rpmsg_ns_register_device);

6
include/linux/rpmsg.h
View file

@ -41,7 +41,9 @@ struct rpmsg_channel_info {
* rpmsg_device - device that belong to the rpmsg bus * rpmsg_device - device that belong to the rpmsg bus
* @dev: the device struct * @dev: the device struct
* @id: device id (used to match between rpmsg drivers and devices) * @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 * @src: local address
* @dst: destination address * @dst: destination address
* @ept: the rpmsg endpoint of this channel * @ept: the rpmsg endpoint of this channel
@ -51,7 +53,7 @@ struct rpmsg_channel_info {
struct rpmsg_device { struct rpmsg_device {
struct device dev; struct device dev;
struct rpmsg_device_id id; struct rpmsg_device_id id;
char *driver_override; const char *driver_override;
u32 src; u32 src;
u32 dst; u32 dst;
struct rpmsg_endpoint *ept; struct rpmsg_endpoint *ept;