diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-05 16:28:49 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-05 16:28:49 +0100 |
| commit | 92690845587b8a444700ec444050fc0e0c118dcd (patch) | |
| tree | 6696cf18791af72353963dda218dce20b0f92b5c | |
| parent | c1c01887f13dc0eb996a3678b6b17c97fac65e08 (diff) | |
| parent | 85835e68c44c2b671df0e670a7b077c78402ac3c (diff) | |
| download | kernel-92690845587b8a444700ec444050fc0e0c118dcd.tar.gz kernel-92690845587b8a444700ec444050fc0e0c118dcd.tar.xz kernel-92690845587b8a444700ec444050fc0e0c118dcd.zip | |
Merge remote-tracking branch 'origin/f31' into f31-user-thl-vanilla-fedora
| -rw-r--r-- | 0001-ASoC-SOF-ipc-Fix-memory-leak-in-sof_set_get_large_ct.patch | 37 | ||||
| -rw-r--r-- | kernel.spec | 6 |
2 files changed, 3 insertions, 40 deletions
diff --git a/0001-ASoC-SOF-ipc-Fix-memory-leak-in-sof_set_get_large_ct.patch b/0001-ASoC-SOF-ipc-Fix-memory-leak-in-sof_set_get_large_ct.patch deleted file mode 100644 index 2ebcb13ab..000000000 --- a/0001-ASoC-SOF-ipc-Fix-memory-leak-in-sof_set_get_large_ct.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 45c1380358b12bf2d1db20a5874e9544f56b34ab Mon Sep 17 00:00:00 2001 -From: Navid Emamdoost <navid.emamdoost@gmail.com> -Date: Sun, 27 Oct 2019 16:53:24 -0500 -Subject: [PATCH] ASoC: SOF: ipc: Fix memory leak in - sof_set_get_large_ctrl_data - -In the implementation of sof_set_get_large_ctrl_data() there is a memory -leak in case an error. Release partdata if sof_get_ctrl_copy_params() -fails. - -Fixes: 54d198d5019d ("ASoC: SOF: Propagate sof_get_ctrl_copy_params() error properly") -Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> -Link: https://lore.kernel.org/r/20191027215330.12729-1-navid.emamdoost@gmail.com -Signed-off-by: Mark Brown <broonie@kernel.org> ---- - sound/soc/sof/ipc.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/sound/soc/sof/ipc.c b/sound/soc/sof/ipc.c -index b2f359d2f7e5..086eeeab8679 100644 ---- a/sound/soc/sof/ipc.c -+++ b/sound/soc/sof/ipc.c -@@ -572,8 +572,10 @@ static int sof_set_get_large_ctrl_data(struct snd_sof_dev *sdev, - else - err = sof_get_ctrl_copy_params(cdata->type, partdata, cdata, - sparams); -- if (err < 0) -+ if (err < 0) { -+ kfree(partdata); - return err; -+ } - - msg_bytes = sparams->msg_bytes; - pl_size = sparams->pl_size; --- -2.23.0 - diff --git a/kernel.spec b/kernel.spec index 4754b1712..abc90a657 100644 --- a/kernel.spec +++ b/kernel.spec @@ -694,9 +694,6 @@ Patch531: 0001-crypto-ccp-Release-all-allocated-memory-if-sha-type-.patch # CVE-2019-18809 rhbz 1777449 1777451 Patch532: 0001-media-usb-fix-memory-leak-in-af9005_identify_state.patch -# CVE-2019-18811 rhbz 1777455 1777456 -Patch533: 0001-ASoC-SOF-ipc-Fix-memory-leak-in-sof_set_get_large_ct.patch - # CVE-2019-18812 rhbz 1777458 1777459 Patch534: 0001-ASoC-SOF-Fix-memory-leak-in-sof_dfsentry_write.patch @@ -1910,6 +1907,9 @@ fi # # %changelog +* Thu Dec 05 2019 Laura Abbott <labbott@redhat.com> - 5.3.15-300 +- Linux v5.3.15 + * Wed Dec 04 2019 Laura Abbott <labbott@redhat.com> - Add powerpc virt fix (rhbz 1769600) |