Linux v5.3.15

3 files changed, 5 insertions, 42 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 2805f3e8f..a674f002a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -56,7 +56,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 14
+%define stable_update 15
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -676,9 +676,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
 
@@ -1889,6 +1886,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)
 
diff --git a/sources b/sources
index 37ff8495b..1d14d7de7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (linux-5.3.tar.xz) = 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d
-SHA512 (patch-5.3.14.xz) = 96ccee690694a03beffc26edde7e1d9d2e43acdc33098d56c0965cdccb321337d34190ebab0b64663b03d4aa76edb1474dd86b0943385a572aa595fc76b5ec8b
+SHA512 (patch-5.3.15.xz) = d9c258a5519552831956b53b68aa16e93b4b5a4edfdf7dfb315405e419b084ca31c53bd7e8b486d6f6ab5d70f8535ccf8881d30392b34fd7b3c19f2e31e785a6