summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2018-09-13 21:31:18 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-29 03:06:03 -0700
commitff6805037d838dd003b6fb88b9b0232b3d05bc07 (patch)
tree6eb5ca116b543d5df527f92809d2c866d29170d0
parent08f4f8b938092a9b4b99eeff3ee6828e5cc20373 (diff)
downloadlinux-stable-ff6805037d838dd003b6fb88b9b0232b3d05bc07.tar.gz
linux-stable-ff6805037d838dd003b6fb88b9b0232b3d05bc07.tar.bz2
linux-stable-ff6805037d838dd003b6fb88b9b0232b3d05bc07.zip
ALSA: oxfw: fix memory leak of private data
commit 498fe23aad8e3b5a9554f55719c537603b4476ea upstream. Although private data of sound card instance is usually allocated in the tail of the instance, drivers in ALSA firewire stack allocate the private data before allocating the instance. In this case, the private data should be released explicitly at .private_free callback of the instance. This commit fixes memory leak following to the above design. Fixes: 6c29230e2a5f ('ALSA: oxfw: delayed registration of sound card') Cc: <stable@vger.kernel.org> # v4.7+ Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--sound/firewire/oxfw/oxfw.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
index 79b294263259..a315d5b6b86b 100644
--- a/sound/firewire/oxfw/oxfw.c
+++ b/sound/firewire/oxfw/oxfw.c
@@ -136,6 +136,7 @@ static void oxfw_free(struct snd_oxfw *oxfw)
kfree(oxfw->spec);
mutex_destroy(&oxfw->mutex);
+ kfree(oxfw);
}
/*