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

Commit 6749c9f0 authored by Adam Richter's avatar Adam Richter Committed by Daniel Vetter
Browse files

drm: fix mutex leak in drm_dp_get_mst_branch_device 



In Linux 4.3-rc5, there is an error case in drm_dp_get_branch_device
that returns without releasing mgr->lock, resulting a spew of kernel
messages about a kernel work function possibly having leaked a mutex
and presumably more serious adverse consequences later.  This patch
changes the error to "goto out" to unlock the mutex before returning.

Signed-off-by: default avatarAdam J. Richter <adam_richter2004@yahoo.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 2afa701d

drivers/gpu/drm/drm_dp_mst_topology.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -1182,17 +1182,18 @@ static struct drm_dp_mst_branch *drm_dp_get_mst_branch_device(struct drm_dp_mst_ 




		list_for_each_entry(port, &mstb->ports, next) {

		list_for_each_entry(port, &mstb->ports, next) {

			if (port->port_num == port_num) {

			if (port->port_num == port_num) {

				if (!port->mstb) {

				mstb = port->mstb;

				if (!mstb) {

					DRM_ERROR("failed to lookup MSTB with lct %d, rad %02x\n", lct, rad[0]);

					DRM_ERROR("failed to lookup MSTB with lct %d, rad %02x\n", lct, rad[0]);

					return NULL;

					goto out;

				}

				}





				mstb = port->mstb;

				break;

				break;

			}

			}

		}

		}

	}

	}

	kref_get(&mstb->kref);

	kref_get(&mstb->kref);

out:

	mutex_unlock(&mgr->lock);

	mutex_unlock(&mgr->lock);

	return mstb;

	return mstb;

}

}