Commit 2cac7cbf authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab

media: rcar-csi2: Allocate v4l2_async_subdev dynamically

v4l2_async_notifier_add_subdev() requires the asd to be allocated
dynamically, but the rcar-csi2 driver embeds it in the rcar_csi2
structure. This causes memory corruption when the notifier is destroyed
at remove time with v4l2_async_notifier_cleanup().

Fix this issue by registering the asd with
v4l2_async_notifier_add_fwnode_subdev(), which allocates it dynamically
internally.

Fixes: 769afd21 ("media: rcar-csi2: add Renesas R-Car MIPI CSI-2 receiver driver")
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 468e986d
...@@ -362,7 +362,6 @@ struct rcar_csi2 { ...@@ -362,7 +362,6 @@ struct rcar_csi2 {
struct media_pad pads[NR_OF_RCAR_CSI2_PAD]; struct media_pad pads[NR_OF_RCAR_CSI2_PAD];
struct v4l2_async_notifier notifier; struct v4l2_async_notifier notifier;
struct v4l2_async_subdev asd;
struct v4l2_subdev *remote; struct v4l2_subdev *remote;
unsigned int remote_pad; unsigned int remote_pad;
...@@ -872,6 +871,8 @@ static int rcsi2_parse_v4l2(struct rcar_csi2 *priv, ...@@ -872,6 +871,8 @@ static int rcsi2_parse_v4l2(struct rcar_csi2 *priv,
static int rcsi2_parse_dt(struct rcar_csi2 *priv) static int rcsi2_parse_dt(struct rcar_csi2 *priv)
{ {
struct v4l2_async_subdev *asd;
struct fwnode_handle *fwnode;
struct device_node *ep; struct device_node *ep;
struct v4l2_fwnode_endpoint v4l2_ep = { .bus_type = 0 }; struct v4l2_fwnode_endpoint v4l2_ep = { .bus_type = 0 };
int ret; int ret;
...@@ -895,24 +896,19 @@ static int rcsi2_parse_dt(struct rcar_csi2 *priv) ...@@ -895,24 +896,19 @@ static int rcsi2_parse_dt(struct rcar_csi2 *priv)
return ret; return ret;
} }
priv->asd.match.fwnode = fwnode = fwnode_graph_get_remote_endpoint(of_fwnode_handle(ep));
fwnode_graph_get_remote_endpoint(of_fwnode_handle(ep));
priv->asd.match_type = V4L2_ASYNC_MATCH_FWNODE;
of_node_put(ep); of_node_put(ep);
v4l2_async_notifier_init(&priv->notifier); dev_dbg(priv->dev, "Found '%pOF'\n", to_of_node(fwnode));
ret = v4l2_async_notifier_add_subdev(&priv->notifier, &priv->asd);
if (ret) {
fwnode_handle_put(priv->asd.match.fwnode);
return ret;
}
v4l2_async_notifier_init(&priv->notifier);
priv->notifier.ops = &rcar_csi2_notify_ops; priv->notifier.ops = &rcar_csi2_notify_ops;
dev_dbg(priv->dev, "Found '%pOF'\n", asd = v4l2_async_notifier_add_fwnode_subdev(&priv->notifier, fwnode,
to_of_node(priv->asd.match.fwnode)); sizeof(*asd));
fwnode_handle_put(fwnode);
if (IS_ERR(asd))
return PTR_ERR(asd);
ret = v4l2_async_subdev_notifier_register(&priv->subdev, ret = v4l2_async_subdev_notifier_register(&priv->subdev,
&priv->notifier); &priv->notifier);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment