mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +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>
100 lines
3.8 KiB
C
100 lines
3.8 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* remote processor messaging bus internals
|
|
*
|
|
* Copyright (C) 2011 Texas Instruments, Inc.
|
|
* Copyright (C) 2011 Google, Inc.
|
|
*
|
|
* Ohad Ben-Cohen <ohad@wizery.com>
|
|
* Brian Swetland <swetland@google.com>
|
|
*/
|
|
|
|
#ifndef __RPMSG_INTERNAL_H__
|
|
#define __RPMSG_INTERNAL_H__
|
|
|
|
#include <linux/rpmsg.h>
|
|
#include <linux/poll.h>
|
|
|
|
#define to_rpmsg_device(d) container_of(d, struct rpmsg_device, dev)
|
|
#define to_rpmsg_driver(d) container_of(d, struct rpmsg_driver, drv)
|
|
|
|
extern struct class *rpmsg_class;
|
|
|
|
/**
|
|
* struct rpmsg_device_ops - indirection table for the rpmsg_device operations
|
|
* @create_channel: create backend-specific channel, optional
|
|
* @release_channel: release backend-specific channel, optional
|
|
* @create_ept: create backend-specific endpoint, required
|
|
* @announce_create: announce presence of new channel, optional
|
|
* @announce_destroy: announce destruction of channel, optional
|
|
*
|
|
* Indirection table for the operations that a rpmsg backend should implement.
|
|
* @announce_create and @announce_destroy are optional as the backend might
|
|
* advertise new channels implicitly by creating the endpoints.
|
|
*/
|
|
struct rpmsg_device_ops {
|
|
struct rpmsg_device *(*create_channel)(struct rpmsg_device *rpdev,
|
|
struct rpmsg_channel_info *chinfo);
|
|
int (*release_channel)(struct rpmsg_device *rpdev,
|
|
struct rpmsg_channel_info *chinfo);
|
|
struct rpmsg_endpoint *(*create_ept)(struct rpmsg_device *rpdev,
|
|
rpmsg_rx_cb_t cb, void *priv,
|
|
struct rpmsg_channel_info chinfo);
|
|
|
|
int (*announce_create)(struct rpmsg_device *ept);
|
|
int (*announce_destroy)(struct rpmsg_device *ept);
|
|
};
|
|
|
|
/**
|
|
* struct rpmsg_endpoint_ops - indirection table for rpmsg_endpoint operations
|
|
* @destroy_ept: see @rpmsg_destroy_ept(), required
|
|
* @send: see @rpmsg_send(), required
|
|
* @sendto: see @rpmsg_sendto(), optional
|
|
* @send_offchannel: see @rpmsg_send_offchannel(), optional
|
|
* @trysend: see @rpmsg_trysend(), required
|
|
* @trysendto: see @rpmsg_trysendto(), optional
|
|
* @trysend_offchannel: see @rpmsg_trysend_offchannel(), optional
|
|
* @poll: see @rpmsg_poll(), optional
|
|
* @get_mtu: see @rpmsg_get_mtu(), optional
|
|
*
|
|
* Indirection table for the operations that a rpmsg backend should implement.
|
|
* In addition to @destroy_ept, the backend must at least implement @send and
|
|
* @trysend, while the variants sending data off-channel are optional.
|
|
*/
|
|
struct rpmsg_endpoint_ops {
|
|
void (*destroy_ept)(struct rpmsg_endpoint *ept);
|
|
|
|
int (*send)(struct rpmsg_endpoint *ept, void *data, int len);
|
|
int (*sendto)(struct rpmsg_endpoint *ept, void *data, int len, u32 dst);
|
|
int (*send_offchannel)(struct rpmsg_endpoint *ept, u32 src, u32 dst,
|
|
void *data, int len);
|
|
|
|
int (*trysend)(struct rpmsg_endpoint *ept, void *data, int len);
|
|
int (*trysendto)(struct rpmsg_endpoint *ept, void *data, int len, u32 dst);
|
|
int (*trysend_offchannel)(struct rpmsg_endpoint *ept, u32 src, u32 dst,
|
|
void *data, int len);
|
|
__poll_t (*poll)(struct rpmsg_endpoint *ept, struct file *filp,
|
|
poll_table *wait);
|
|
ssize_t (*get_mtu)(struct rpmsg_endpoint *ept);
|
|
};
|
|
|
|
struct device *rpmsg_find_device(struct device *parent,
|
|
struct rpmsg_channel_info *chinfo);
|
|
|
|
struct rpmsg_device *rpmsg_create_channel(struct rpmsg_device *rpdev,
|
|
struct rpmsg_channel_info *chinfo);
|
|
int rpmsg_release_channel(struct rpmsg_device *rpdev,
|
|
struct rpmsg_channel_info *chinfo);
|
|
/**
|
|
* rpmsg_ctrldev_register_device() - register a char device for control 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 chrdev.
|
|
*/
|
|
static inline int rpmsg_ctrldev_register_device(struct rpmsg_device *rpdev)
|
|
{
|
|
return rpmsg_register_device_override(rpdev, "rpmsg_ctrl");
|
|
}
|
|
|
|
#endif
|