summaryrefslogtreecommitdiff
path: root/drivers/rpmsg/mtk_rpmsg.c
diff options
context:
space:
mode:
authorNicolas Boichat <drinkcat@chromium.org>2020-09-03 03:05:58 +0300
committerBjorn Andersson <bjorn.andersson@linaro.org>2020-09-15 06:43:24 +0300
commit231331b2dbd71487159a0400d9ffd967eb0d0e08 (patch)
tree9e4c301e2904354a19adb9e9ac659af32ba9accf /drivers/rpmsg/mtk_rpmsg.c
parente69ee0cf655e8e0c4a80f4319e36019b74f17639 (diff)
downloadlinux-231331b2dbd71487159a0400d9ffd967eb0d0e08.tar.xz
rpmsg: Avoid double-free in mtk_rpmsg_register_device
If rpmsg_register_device fails, it will call mtk_rpmsg_release_device which already frees mdev. Fixes: 7017996951fd ("rpmsg: add rpmsg support for mt8183 SCP.") Signed-off-by: Nicolas Boichat <drinkcat@chromium.org> Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> Link: https://lore.kernel.org/r/20200903080547.v3.1.I56cf27cd59f4013bd074dc622c8b8248b034a4cc@changeid Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'drivers/rpmsg/mtk_rpmsg.c')
-rw-r--r--drivers/rpmsg/mtk_rpmsg.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/rpmsg/mtk_rpmsg.c b/drivers/rpmsg/mtk_rpmsg.c
index 83f2b8804ee9..96a17ec29140 100644
--- a/drivers/rpmsg/mtk_rpmsg.c
+++ b/drivers/rpmsg/mtk_rpmsg.c
@@ -200,7 +200,6 @@ static int mtk_rpmsg_register_device(struct mtk_rpmsg_rproc_subdev *mtk_subdev,
struct rpmsg_device *rpdev;
struct mtk_rpmsg_device *mdev;
struct platform_device *pdev = mtk_subdev->pdev;
- int ret;
mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
if (!mdev)
@@ -219,13 +218,7 @@ static int mtk_rpmsg_register_device(struct mtk_rpmsg_rproc_subdev *mtk_subdev,
rpdev->dev.parent = &pdev->dev;
rpdev->dev.release = mtk_rpmsg_release_device;
- ret = rpmsg_register_device(rpdev);
- if (ret) {
- kfree(mdev);
- return ret;
- }
-
- return 0;
+ return rpmsg_register_device(rpdev);
}
static void mtk_register_device_work_function(struct work_struct *register_work)