android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: fix up rpmsg_device ABI break

Browse Source 
In commit e70898ae1a42 ("rpmsg: Fix kfree() of static memory on setting
driver_override") a pointer was changed to const, which messes with the
CRC and ABI checks.  As the code is fine if this is left as not-const,
just put it back to preserve the abi.

Bug: 161946584
Fixes: e70898ae1a42 ("rpmsg: Fix kfree() of static memory on setting driver_override")
Change-Id: I9a87b9cf412191d9872b48f1f876a81df6701de0
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
(cherry picked from commit 4f2270e2bca1854ebe8be23a82f665eaa27ee831)
Signed-off-by: Lee Jones <joneslee@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-11-26 12:55:14 +00:00 committed by Lee Jones
parent 72b5689f02
commit ced76f823f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/rpmsg/rpmsg_core.c
View File

@ -586,7 +586,7 @@ int rpmsg_register_device_override(struct rpmsg_device *rpdev,
device_initialize(dev);
if (driver_override) {
ret = driver_set_override(dev, &rpdev->driver_override,
ret = driver_set_override(dev, (const char **)&rpdev->driver_override,
driver_override,
strlen(driver_override));
if (ret) {

2
include/linux/rpmsg.h
View File

@ -53,7 +53,7 @@ struct rpmsg_channel_info {
struct rpmsg_device {
struct device dev;
struct rpmsg_device_id id;
const char *driver_override;
char *driver_override;
u32 src;
u32 dst;
struct rpmsg_endpoint *ept;