Commit bc29d3a6 authored Apr 04, 2019 by Wen Yang Committed by Eric Anholt Apr 04, 2019

drm/pl111: fix possible object reference leak

The call to of_find_matching_node_and_match 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/pl111/pl111_versatile.c:333:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 317, but without a corresponding object release within this function.
drivers/gpu/drm/pl111/pl111_versatile.c:340:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 317, but without a corresponding object release within this function.
drivers/gpu/drm/pl111/pl111_versatile.c:346:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 317, but without a corresponding object release within this function.
drivers/gpu/drm/pl111/pl111_versatile.c:354:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 317, but without a corresponding object release within this function.
drivers/gpu/drm/pl111/pl111_versatile.c:395:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 317, but without a corresponding object release within this function.
drivers/gpu/drm/pl111/pl111_versatile.c:402:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 317, but without a corresponding object release within this function.

Signed-off-by: Wen Yang <wen.yang99@zte.com.cn>
Cc: Eric Anholt <eric@anholt.net> (supporter:DRM DRIVER FOR ARM PL111 CLCD)
Cc: David Airlie <airlied@linux.ie> (maintainer:DRM DRIVERS)
Cc: Daniel Vetter <daniel@ffwll.ch> (maintainer:DRM DRIVERS)
Cc: dri-devel@lists.freedesktop.org (open list:DRM DRIVERS)
Cc: linux-kernel@vger.kernel.org (open list)
Signed-off-by: Eric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/1554307455-40361-6-git-send-email-wen.yang99@zte.com.cn

parent e31b97ef

drivers/gpu/drm/pl111/pl111_versatile.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -330,6 +330,7 @@ int pl111_versatile_init(struct device dev, struct pl111_drm_dev_private priv)
		ret = vexpress_muxfpga_init();
		if (ret) {
		dev_err(dev, "unable to initialize muxfpga driver\n");
		of_node_put(np);
		return ret;
		}

		@@ -337,17 +338,20 @@ int pl111_versatile_init(struct device dev, struct pl111_drm_dev_private priv)
		pdev = of_find_device_by_node(np);
		if (!pdev) {
		dev_err(dev, "can't find the sysreg device, deferring\n");
		of_node_put(np);
		return -EPROBE_DEFER;
		}
		map = dev_get_drvdata(&pdev->dev);
		if (!map) {
		dev_err(dev, "sysreg has not yet probed\n");
		platform_device_put(pdev);
		of_node_put(np);
		return -EPROBE_DEFER;
		}
		} else {
		map = syscon_node_to_regmap(np);
		}
		of_node_put(np);

		if (IS_ERR(map)) {
		dev_err(dev, "no Versatile syscon regmap\n");

Admin message