svn commit: r290988 - stable/10/sys/dev/sound/midi

[Tai-hwa Liang]

Author: avatar
Date: Tue Nov 17 15:20:12 2015
New Revision: 290988
URL: https://svnweb.freebsd.org/changeset/base/290988

Log:
  MFC r289888:
  - Plugging a memory leak when malloc() failed during initialisation;
  - Plugging another memory leak inside the destructor.
  
  Reviewed by:	matk

Modified:
  stable/10/sys/dev/sound/midi/midi.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sound/midi/midi.c
==============================================================================
--- stable/10/sys/dev/sound/midi/midi.c	Tue Nov 17 15:18:59 2015	(r290987)
+++ stable/10/sys/dev/sound/midi/midi.c	Tue Nov 17 15:20:12 2015	(r290988)
@@ -319,6 +319,8 @@ midi_init(kobj_class_t cls, int unit, in
 		goto err0;
 
 	m->synth = malloc(sizeof(*m->synth), M_MIDI, M_NOWAIT | M_ZERO);
+	if (m->synth == NULL)
+		goto err1;
 	kobj_init((kobj_t)m->synth, &midisynth_class);
 	m->synth->m = m;
 	kobj_init((kobj_t)m, cls);
@@ -327,7 +329,7 @@ midi_init(kobj_class_t cls, int unit, in
 
 	MIDI_DEBUG(1, printf("midiinit queues %d/%d.\n", inqsize, outqsize));
 	if (!inqsize && !outqsize)
-		goto err1;
+		goto err2;
 
 	mtx_init(&m->lock, "raw midi", NULL, 0);
 	mtx_init(&m->qlock, "q raw midi", NULL, 0);
@@ -352,7 +354,7 @@ midi_init(kobj_class_t cls, int unit, in
 
 	if ((inqsize && !MIDIQ_BUF(m->inq)) ||
 	    (outqsize && !MIDIQ_BUF(m->outq)))
-		goto err2;
+		goto err3;
 
 
 	m->busy = 0;
@@ -362,7 +364,7 @@ midi_init(kobj_class_t cls, int unit, in
 	m->cookie = cookie;
 
 	if (MPU_INIT(m, cookie))
-		goto err2;
+		goto err3;
 
 	mtx_unlock(&m->lock);
 	mtx_unlock(&m->qlock);
@@ -378,13 +380,14 @@ midi_init(kobj_class_t cls, int unit, in
 
 	return m;
 
-err2:	mtx_destroy(&m->qlock);
+err3:	mtx_destroy(&m->qlock);
 	mtx_destroy(&m->lock);
 
 	if (MIDIQ_BUF(m->inq))
 		free(MIDIQ_BUF(m->inq), M_MIDI);
 	if (MIDIQ_BUF(m->outq))
 		free(MIDIQ_BUF(m->outq), M_MIDI);
+err2:	free(m->synth, M_MIDI);
 err1:	free(m, M_MIDI);
 err0:	mtx_unlock(&midistat_lock);
 	MIDI_DEBUG(1, printf("midi_init ended in error\n"));
@@ -1388,6 +1391,7 @@ midi_destroy(struct snd_midi *m, int mid
 	free(MIDIQ_BUF(m->outq), M_MIDI);
 	mtx_destroy(&m->qlock);
 	mtx_destroy(&m->lock);
+	free(m->synth, M_MIDI);
 	free(m, M_MIDI);
 	return 0;
 }