| Message ID | 1554692313-28882-1-git-send-email-wen.yang99@zte.com.cn (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] drm/meson: fix possible object reference leak | expand |
> v2->v1: convert a if statement into a ternary statement. Would you like to omit the arrow in such version information? > @@ -720,15 +720,10 @@ static bool meson_hdmi_connector_is_available(struct device *dev) > > /* If the endpoint node exists, consider it enabled */ > remote = of_graph_get_remote_port(ep); > - if (remote) { > - of_node_put(ep); > - return true; > - } > - > of_node_put(ep); > of_node_put(remote); Can a reordering of the passed variables be useful for such function calls? + of_node_put(remote); + of_node_put(ep); Regards, Markus
diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c index 563953e..826b98b 100644 --- a/drivers/gpu/drm/meson/meson_dw_hdmi.c +++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c @@ -720,15 +720,10 @@ static bool meson_hdmi_connector_is_available(struct device *dev) /* If the endpoint node exists, consider it enabled */ remote = of_graph_get_remote_port(ep); - if (remote) { - of_node_put(ep); - return true; - } - of_node_put(ep); of_node_put(remote); - return false; + return remote ? true : false; } static int meson_dw_hdmi_bind(struct device *dev, struct device *master,
The call to of_graph_get_remote_port returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage. Detected by coccinelle with the following warnings: drivers/gpu/drm/meson/meson_dw_hdmi.c:725:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 722, but without a corresponding object release within this function. Signed-off-by: Wen Yang <wen.yang99@zte.com.cn> Cc: Neil Armstrong <narmstrong@baylibre.com> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: Kevin Hilman <khilman@baylibre.com> Cc: dri-devel@lists.freedesktop.org Cc: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: Markus Elfring <Markus.Elfring@web.de> --- v2->v1: convert a if statement into a ternary statement. drivers/gpu/drm/meson/meson_dw_hdmi.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)