mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 20:22:09 +00:00
bb17d110cb
driver_set_override() helper uses device_lock() so it should not be
called before rpmsg_register_device() (which calls device_register()).
Effect can be seen with CONFIG_DEBUG_MUTEXES:
DEBUG_LOCKS_WARN_ON(lock->magic != lock)
WARNING: CPU: 3 PID: 57 at kernel/locking/mutex.c:582 __mutex_lock+0x1ec/0x430
...
Call trace:
__mutex_lock+0x1ec/0x430
mutex_lock_nested+0x44/0x50
driver_set_override+0x124/0x150
qcom_glink_native_probe+0x30c/0x3b0
glink_rpm_probe+0x274/0x350
platform_probe+0x6c/0xe0
really_probe+0x17c/0x3d0
__driver_probe_device+0x114/0x190
driver_probe_device+0x3c/0xf0
...
Refactor the rpmsg_register_device() function to use two-step device
registering (initialization + add) and call driver_set_override() in
proper moment.
This moves the code around, so while at it also NULL-ify the
rpdev->driver_override in error path to be sure it won't be kfree()
second time.
Fixes: 42cd402b8f ("rpmsg: Fix kfree() of static memory on setting driver_override")
Reported-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Link: https://lore.kernel.org/r/20220429195946.1061725-2-krzysztof.kozlowski@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
125 lines
3.2 KiB
C
125 lines
3.2 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Copyright (C) STMicroelectronics 2020 - All Rights Reserved
|
|
*/
|
|
#include <linux/device.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/rpmsg.h>
|
|
#include <linux/rpmsg/ns.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include "rpmsg_internal.h"
|
|
|
|
/**
|
|
* rpmsg_ns_register_device() - register name service device based on rpdev
|
|
* @rpdev: prepared rpdev to be used for creating endpoints
|
|
*
|
|
* This function wraps rpmsg_register_device() preparing the rpdev for use as
|
|
* basis for the rpmsg name service device.
|
|
*/
|
|
int rpmsg_ns_register_device(struct rpmsg_device *rpdev)
|
|
{
|
|
rpdev->src = RPMSG_NS_ADDR;
|
|
rpdev->dst = RPMSG_NS_ADDR;
|
|
|
|
return rpmsg_register_device_override(rpdev, "rpmsg_ns");
|
|
}
|
|
EXPORT_SYMBOL(rpmsg_ns_register_device);
|
|
|
|
/* invoked when a name service announcement arrives */
|
|
static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,
|
|
void *priv, u32 src)
|
|
{
|
|
struct rpmsg_ns_msg *msg = data;
|
|
struct rpmsg_device *newch;
|
|
struct rpmsg_channel_info chinfo;
|
|
struct device *dev = rpdev->dev.parent;
|
|
int ret;
|
|
|
|
#if defined(CONFIG_DYNAMIC_DEBUG)
|
|
dynamic_hex_dump("NS announcement: ", DUMP_PREFIX_NONE, 16, 1,
|
|
data, len, true);
|
|
#endif
|
|
|
|
if (len != sizeof(*msg)) {
|
|
dev_err(dev, "malformed ns msg (%d)\n", len);
|
|
return -EINVAL;
|
|
}
|
|
|
|
/* don't trust the remote processor for null terminating the name */
|
|
msg->name[RPMSG_NAME_SIZE - 1] = '\0';
|
|
|
|
strncpy(chinfo.name, msg->name, sizeof(chinfo.name));
|
|
chinfo.src = RPMSG_ADDR_ANY;
|
|
chinfo.dst = rpmsg32_to_cpu(rpdev, msg->addr);
|
|
|
|
dev_info(dev, "%sing channel %s addr 0x%x\n",
|
|
rpmsg32_to_cpu(rpdev, msg->flags) & RPMSG_NS_DESTROY ?
|
|
"destroy" : "creat", msg->name, chinfo.dst);
|
|
|
|
if (rpmsg32_to_cpu(rpdev, msg->flags) & RPMSG_NS_DESTROY) {
|
|
ret = rpmsg_release_channel(rpdev, &chinfo);
|
|
if (ret)
|
|
dev_err(dev, "rpmsg_destroy_channel failed: %d\n", ret);
|
|
} else {
|
|
newch = rpmsg_create_channel(rpdev, &chinfo);
|
|
if (!newch)
|
|
dev_err(dev, "rpmsg_create_channel failed\n");
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int rpmsg_ns_probe(struct rpmsg_device *rpdev)
|
|
{
|
|
struct rpmsg_endpoint *ns_ept;
|
|
struct rpmsg_channel_info ns_chinfo = {
|
|
.src = RPMSG_NS_ADDR,
|
|
.dst = RPMSG_NS_ADDR,
|
|
.name = "name_service",
|
|
};
|
|
|
|
/*
|
|
* Create the NS announcement service endpoint associated to the RPMsg
|
|
* device. The endpoint will be automatically destroyed when the RPMsg
|
|
* device will be deleted.
|
|
*/
|
|
ns_ept = rpmsg_create_ept(rpdev, rpmsg_ns_cb, NULL, ns_chinfo);
|
|
if (!ns_ept) {
|
|
dev_err(&rpdev->dev, "failed to create the ns ept\n");
|
|
return -ENOMEM;
|
|
}
|
|
rpdev->ept = ns_ept;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct rpmsg_driver rpmsg_ns_driver = {
|
|
.drv.name = KBUILD_MODNAME,
|
|
.probe = rpmsg_ns_probe,
|
|
};
|
|
|
|
static int rpmsg_ns_init(void)
|
|
{
|
|
int ret;
|
|
|
|
ret = register_rpmsg_driver(&rpmsg_ns_driver);
|
|
if (ret < 0)
|
|
pr_err("%s: Failed to register rpmsg driver\n", __func__);
|
|
|
|
return ret;
|
|
}
|
|
postcore_initcall(rpmsg_ns_init);
|
|
|
|
static void rpmsg_ns_exit(void)
|
|
{
|
|
unregister_rpmsg_driver(&rpmsg_ns_driver);
|
|
}
|
|
module_exit(rpmsg_ns_exit);
|
|
|
|
MODULE_DESCRIPTION("Name service announcement rpmsg driver");
|
|
MODULE_AUTHOR("Arnaud Pouliquen <arnaud.pouliquen@st.com>");
|
|
MODULE_ALIAS("rpmsg:" KBUILD_MODNAME);
|
|
MODULE_LICENSE("GPL v2");
|