Commit 781d5eb4 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2019-11-25' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



 - A fix for a memory leak in the dma-buf support
 - One in mcde DSI support that leads to a pointer dereference

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20191125094336.GA14723@gilmour.lan
parents e42617b8 6645d42d

drivers/dma-buf/sync_file.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static struct sync_file *sync_file_merge(const char *name, struct sync_file *a, 
	a_fences = get_fences(a, &a_num_fences);

	b_fences = get_fences(b, &b_num_fences);

	if (a_num_fences > INT_MAX - b_num_fences)

		return NULL;

		goto err;



	num_fences = a_num_fences + b_num_fences;

drivers/gpu/drm/mcde/mcde_dsi.c

+4 −2
Original line number Diff line number Diff line
@@ -935,11 +935,13 @@ static int mcde_dsi_bind(struct device *dev, struct device *master, 
	for_each_available_child_of_node(dev->of_node, child) {

		panel = of_drm_find_panel(child);

		if (IS_ERR(panel)) {

			dev_err(dev, "failed to find panel try bridge (%lu)\n",

			dev_err(dev, "failed to find panel try bridge (%ld)\n",

				PTR_ERR(panel));

			panel = NULL;



			bridge = of_drm_find_bridge(child);

			if (IS_ERR(bridge)) {

				dev_err(dev, "failed to find bridge (%lu)\n",

				dev_err(dev, "failed to find bridge (%ld)\n",

					PTR_ERR(bridge));

				return PTR_ERR(bridge);

			}

CRA Git | Maintained and supported by SUSTech CRA and CCSE