4.15.7-200.fc26.gnu

5 files changed, 72 insertions, 8 deletions

diff --git a/freed-ora/current/f26/0001-ipmi_si-Fix-error-handling-of-platform-device.patch b/freed-ora/current/f26/0001-ipmi_si-Fix-error-handling-of-platform-device.patch
new file mode 100644
index 000000000..9a3619684
--- /dev/null
+++ b/freed-ora/current/f26/0001-ipmi_si-Fix-error-handling-of-platform-device.patch
@@ -0,0 +1,54 @@
+From 174134ac760275457bb0d1560a0dbe6cf8a12ad6 Mon Sep 17 00:00:00 2001
+From: Corey Minyard <cminyard@mvista.com>
+Date: Mon, 27 Nov 2017 08:18:33 -0600
+Subject: [PATCH] ipmi_si: Fix error handling of platform device
+
+Cleanup of platform devices created by the IPMI driver was not
+being done correctly and could result in a memory leak.  So
+create a local boolean to know how to clean up those platform
+devices.
+
+Reported-by: David Binderman <dcb314@hotmail.com>
+Signed-off-by: Corey Minyard <cminyard@mvista.com>
+---
+ drivers/char/ipmi/ipmi_si_intf.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
+index 71fad747c0c7..7499b0cd8326 100644
+--- a/drivers/char/ipmi/ipmi_si_intf.c
++++ b/drivers/char/ipmi/ipmi_si_intf.c
+@@ -2045,6 +2045,7 @@ static int try_smi_init(struct smi_info *new_smi)
+ 	int rv = 0;
+ 	int i;
+ 	char *init_name = NULL;
++	bool platform_device_registered = false;
+ 
+ 	pr_info(PFX "Trying %s-specified %s state machine at %s address 0x%lx, slave address 0x%x, irq %d\n",
+ 		ipmi_addr_src_to_str(new_smi->io.addr_source),
+@@ -2173,6 +2174,7 @@ static int try_smi_init(struct smi_info *new_smi)
+ 				rv);
+ 			goto out_err;
+ 		}
++		platform_device_registered = true;
+ 	}
+ 
+ 	dev_set_drvdata(new_smi->io.dev, new_smi);
+@@ -2279,10 +2281,11 @@ static int try_smi_init(struct smi_info *new_smi)
+ 	}
+ 
+ 	if (new_smi->pdev) {
+-		platform_device_unregister(new_smi->pdev);
++		if (platform_device_registered)
++			platform_device_unregister(new_smi->pdev);
++		else
++			platform_device_put(new_smi->pdev);
+ 		new_smi->pdev = NULL;
+-	} else if (new_smi->pdev) {
+-		platform_device_put(new_smi->pdev);
+ 	}
+ 
+ 	kfree(init_name);
+-- 
+2.14.3
+
diff --git a/freed-ora/current/f26/kernel.spec b/freed-ora/current/f26/kernel.spec
index 723af2437..5ff195dfd 100644
--- a/freed-ora/current/f26/kernel.spec
+++ b/freed-ora/current/f26/kernel.spec
@@ -92,7 +92,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 6
+%define stable_update 7
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -675,6 +675,9 @@ Patch652: iwlwifi-mvn.patch
 # CVE-2018-1000026 rhbz 1541846 1546744
 Patch653: CVE-2018-1000026.patch
 
+# rhbz 1549316
+Patch654: 0001-ipmi_si-Fix-error-handling-of-platform-device.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2022,6 +2025,13 @@ fi
 #
 #
 %changelog
+* Thu Mar  1 2018 Alexandre Oliva <lxoliva@fsfla.org> -libre
+- GNU Linux-libre 4.15.7-gnu.
+
+* Wed Feb 28 2018 Laura Abbott <labbott@redhat.com> - 4.15.7-200
+- Linux v4.15.7
+- Fix IPMI crash (rhbz 1549316)
+
 * Mon Feb 26 2018 Alexandre Oliva <lxoliva@fsfla.org> -libre
 - GNU Linux-libre 4.15.6-gnu.
 
diff --git a/freed-ora/current/f26/patch-4.15-gnu-4.15.6-gnu.xz.sign b/freed-ora/current/f26/patch-4.15-gnu-4.15.6-gnu.xz.sign
deleted file mode 100644
index ac3ef05bd..000000000
--- a/freed-ora/current/f26/patch-4.15-gnu-4.15.6-gnu.xz.sign
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iF0EABECAB0WIQRHRALIxYLa++OJxCe8t8+Hfn1HpwUCWpMldgAKCRC8t8+Hfn1H
-p8tsAJ9Dhgi7xRTG9jj/EBdEBoWalBi9VACeMp/92t159cUIwt40G3y2EgE3Dok=
-=BixV
------END PGP SIGNATURE-----
diff --git a/freed-ora/current/f26/patch-4.15-gnu-4.15.7-gnu.xz.sign b/freed-ora/current/f26/patch-4.15-gnu-4.15.7-gnu.xz.sign
new file mode 100644
index 000000000..fe62088e5
--- /dev/null
+++ b/freed-ora/current/f26/patch-4.15-gnu-4.15.7-gnu.xz.sign
@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iFwEABECAB0WIQRHRALIxYLa++OJxCe8t8+Hfn1HpwUCWpd3SwAKCRC8t8+Hfn1H
+pzUSAJ9OVp++Hr1My4M5YITBCiD1SdkxwwCYtvteMhK8Oijr7Qj3YFp/8J9Nng==
+=qcyp
+-----END PGP SIGNATURE-----
diff --git a/freed-ora/current/f26/sources b/freed-ora/current/f26/sources
index a3b3ba9c4..2c690f091 100644
--- a/freed-ora/current/f26/sources
+++ b/freed-ora/current/f26/sources
@@ -1,2 +1,2 @@
 SHA512 (linux-libre-4.15-gnu.tar.xz) = a55cc663c6fb1e1cfa7905282b368b5d5888bc2398f0acf37e5bb9a232ded04fd566b1980e654da26aaec005332e458581495184d6bd4cec669181085d4d78a5
-SHA512 (patch-4.15-gnu-4.15.6-gnu.xz) = 731ff892fac839e033680c70af4739f3695317e5a6def213083f134167708506b862ffd7165ecd167547f6370cf1c5fb5732b90ffaf5990055b09de0eecc9cb2
+SHA512 (patch-4.15-gnu-4.15.7-gnu.xz) = 0881f0d925214b4fe1ce575eb4ff32d6a403e50b9171746d440889e0f16498286b14a35340c5769ce1445b4b0233c171169e9581475dbeb97cbdb26bb8388f95