svn commit: r299622 - stable/10/sys/dev/drm2

[Garrett Cooper]

Author: ngie
Date: Fri May 13 08:39:33 2016
New Revision: 299622
URL: https://svnweb.freebsd.org/changeset/base/299622

Log:
  MFC r298334:
  r298334 (by cem):
  
  drm2(4): Fix double-free in low-memory error path
  
  Reallocf frees 'block'; don't attempt to free it again.
  
  CID:		1091165

Modified:
  stable/10/sys/dev/drm2/drm_edid.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/drm2/drm_edid.c
==============================================================================
--- stable/10/sys/dev/drm2/drm_edid.c	Fri May 13 08:36:33 2016	(r299621)
+++ stable/10/sys/dev/drm2/drm_edid.c	Fri May 13 08:39:33 2016	(r299622)
@@ -353,8 +353,10 @@ drm_do_get_edid(struct drm_connector *co
 
 	new = reallocf(block, (block[0x7e] + 1) * EDID_LENGTH, DRM_MEM_KMS,
 	    M_NOWAIT);
-	if (!new)
+	if (!new) {
+		block = NULL;
 		goto out;
+	}
 	block = new;
 
 	for (j = 1; j <= block[0x7e]; j++) {