Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afd6d4f5 authored by Navid Emamdoost's avatar Navid Emamdoost Committed by Sam Ravnborg
Browse files

drm/panel: check failure cases in the probe func 



The following function calls may fail and return NULL, so the null check
is added.
of_graph_get_next_endpoint
of_graph_get_remote_port_parent
of_graph_get_remote_port

Update: Thanks to Sam Ravnborg, for suggession on the use of goto to avoid
leaking endpoint.

Signed-off-by: default avatarNavid Emamdoost <navid.emamdoost@gmail.com>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190724195534.9303-1-navid.emamdoost@gmail.com
parent 67fe62dc

drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c

+13 −0
Original line number Original line Diff line number Diff line
@@ -399,7 +399,13 @@ static int rpi_touchscreen_probe(struct i2c_client *i2c, 




	/* Look up the DSI host.  It needs to probe before we do. */

	/* Look up the DSI host.  It needs to probe before we do. */

	endpoint = of_graph_get_next_endpoint(dev->of_node, NULL);

	endpoint = of_graph_get_next_endpoint(dev->of_node, NULL);

	if (!endpoint)

		return -ENODEV;



	dsi_host_node = of_graph_get_remote_port_parent(endpoint);

	dsi_host_node = of_graph_get_remote_port_parent(endpoint);

	if (!dsi_host_node)

		goto error;



	host = of_find_mipi_dsi_host_by_node(dsi_host_node);

	host = of_find_mipi_dsi_host_by_node(dsi_host_node);

	of_node_put(dsi_host_node);

	of_node_put(dsi_host_node);

	if (!host) {

	if (!host) {
@@ -408,6 +414,9 @@ static int rpi_touchscreen_probe(struct i2c_client *i2c, 
	}

	}





	info.node = of_graph_get_remote_port(endpoint);

	info.node = of_graph_get_remote_port(endpoint);

	if (!info.node)

		goto error;



	of_node_put(endpoint);

	of_node_put(endpoint);





	ts->dsi = mipi_dsi_device_register_full(host, &info);

	ts->dsi = mipi_dsi_device_register_full(host, &info);
@@ -428,6 +437,10 @@ static int rpi_touchscreen_probe(struct i2c_client *i2c, 
		return ret;

		return ret;





	return 0;

	return 0;



error:

	of_node_put(endpoint);

	return -ENODEV;

}

}





static int rpi_touchscreen_remove(struct i2c_client *i2c)

static int rpi_touchscreen_remove(struct i2c_client *i2c)