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

Commit 123d5c01 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/sdvo: Cleanup connector on error path 



We weren't unlinking the freed connector from the drm lists, and so
hit some use-after-free if we failed to initialise the connector.

Reported-and-tested-by: default avatarWoody Suwalski <terraluna977@gmail.com>
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=18342


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 9b74f734

drivers/gpu/drm/i915/intel_sdvo.c

+2 −4
Original line number Diff line number Diff line
@@ -2170,8 +2170,7 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type) 
        return true;



err:

	intel_sdvo_destroy_enhance_property(connector);

	kfree(intel_sdvo_connector);

	intel_sdvo_destroy(connector);

	return false;

}
@@ -2243,8 +2242,7 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device) 
	return true;



err:

	intel_sdvo_destroy_enhance_property(connector);

	kfree(intel_sdvo_connector);

	intel_sdvo_destroy(connector);

	return false;

}