The dev_set_name() function can fail and return an error code. Ignoring these failures leads to undefined behavior as the device lacks a proper name, which may cause subsequent operations like device_register() or sysfs interactions to crash or behave unpredictably.
Add error checking across all rpmsg drivers to ensure proper error propagation and resource cleanup. Signed-off-by: Zhongqiu Han <[email protected]> --- drivers/rpmsg/qcom_glink_smem.c | 8 +++++++- drivers/rpmsg/qcom_smd.c | 8 +++++++- drivers/rpmsg/rpmsg_char.c | 5 ++++- drivers/rpmsg/rpmsg_core.c | 8 ++++++-- drivers/rpmsg/rpmsg_ctrl.c | 5 ++++- 5 files changed, 28 insertions(+), 6 deletions(-) diff --git a/drivers/rpmsg/qcom_glink_smem.c b/drivers/rpmsg/qcom_glink_smem.c index 7a982c60a8dd..843bf04eecb3 100644 --- a/drivers/rpmsg/qcom_glink_smem.c +++ b/drivers/rpmsg/qcom_glink_smem.c @@ -239,7 +239,13 @@ struct qcom_glink_smem *qcom_glink_smem_register(struct device *parent, dev->parent = parent; dev->of_node = node; dev->release = qcom_glink_smem_release; - dev_set_name(dev, "%s:%pOFn", dev_name(parent->parent), node); + ret = dev_set_name(dev, "%s:%pOFn", dev_name(parent->parent), node); + if (ret) { + pr_err("failed to set device name\n"); + put_device(dev); + return ERR_PTR(ret); + } + ret = device_register(dev); if (ret) { pr_err("failed to register glink edge\n"); diff --git a/drivers/rpmsg/qcom_smd.c b/drivers/rpmsg/qcom_smd.c index 2793096aba45..61f580ee04ec 100644 --- a/drivers/rpmsg/qcom_smd.c +++ b/drivers/rpmsg/qcom_smd.c @@ -1494,7 +1494,13 @@ struct qcom_smd_edge *qcom_smd_register_edge(struct device *parent, edge->dev.release = qcom_smd_edge_release; edge->dev.of_node = node; edge->dev.groups = qcom_smd_edge_groups; - dev_set_name(&edge->dev, "%s:%pOFn", dev_name(parent), node); + ret = dev_set_name(&edge->dev, "%s:%pOFn", dev_name(parent), node); + if (ret) { + pr_err("failed to set device name\n"); + put_device(&edge->dev); + return ERR_PTR(ret); + } + ret = device_register(&edge->dev); if (ret) { pr_err("failed to register smd edge\n"); diff --git a/drivers/rpmsg/rpmsg_char.c b/drivers/rpmsg/rpmsg_char.c index 073d56858b88..89d232d80df2 100644 --- a/drivers/rpmsg/rpmsg_char.c +++ b/drivers/rpmsg/rpmsg_char.c @@ -450,7 +450,10 @@ static int rpmsg_chrdev_eptdev_add(struct rpmsg_eptdev *eptdev, struct rpmsg_cha if (ret < 0) goto free_minor_ida; dev->id = ret; - dev_set_name(dev, "rpmsg%d", ret); + + ret = dev_set_name(dev, "rpmsg%d", ret); + if (ret) + goto free_ept_ida; ret = cdev_device_add(&eptdev->cdev, &eptdev->dev); if (ret) diff --git a/drivers/rpmsg/rpmsg_core.c b/drivers/rpmsg/rpmsg_core.c index a5dd09f19b14..49737d69b44c 100644 --- a/drivers/rpmsg/rpmsg_core.c +++ b/drivers/rpmsg/rpmsg_core.c @@ -553,8 +553,12 @@ int rpmsg_register_device_override(struct rpmsg_device *rpdev, if (driver_override) strscpy_pad(rpdev->id.name, driver_override, RPMSG_NAME_SIZE); - dev_set_name(dev, "%s.%s.%d.%d", dev_name(dev->parent), - rpdev->id.name, rpdev->src, rpdev->dst); + ret = dev_set_name(dev, "%s.%s.%d.%d", dev_name(dev->parent), + rpdev->id.name, rpdev->src, rpdev->dst); + if (ret) { + pr_err("failed to set device name\n"); + return ret; + } dev->bus = &rpmsg_bus; diff --git a/drivers/rpmsg/rpmsg_ctrl.c b/drivers/rpmsg/rpmsg_ctrl.c index 28f57945ccd9..3e2cfd16df6a 100644 --- a/drivers/rpmsg/rpmsg_ctrl.c +++ b/drivers/rpmsg/rpmsg_ctrl.c @@ -165,7 +165,10 @@ static int rpmsg_ctrldev_probe(struct rpmsg_device *rpdev) if (ret < 0) goto free_minor_ida; dev->id = ret; - dev_set_name(&ctrldev->dev, "rpmsg_ctrl%d", ret); + + ret = dev_set_name(&ctrldev->dev, "rpmsg_ctrl%d", ret); + if (ret) + goto free_ctrl_ida; ret = cdev_device_add(&ctrldev->cdev, &ctrldev->dev); if (ret) -- 2.43.0
