Linux v4.16-rc2-64-gaf3e79d29555

4 files changed, 52 insertions, 3 deletions

diff --git a/floppy-Don-t-print-kernel-addresses-to-log-in-show_f.patch b/floppy-Don-t-print-kernel-addresses-to-log-in-show_f.patch
new file mode 100644
index 000000000..71cc04128
--- /dev/null
+++ b/floppy-Don-t-print-kernel-addresses-to-log-in-show_f.patch
@@ -0,0 +1,43 @@
+From b209bf23bc97b7758b9dc8f68d2a835295960226 Mon Sep 17 00:00:00 2001
+From: Brian Belleville <bbellevi@uci.edu>
+Date: Tue, 20 Feb 2018 14:54:25 -0800
+Subject: [PATCH] floppy: Don't print kernel addresses to log in show_floppy
+
+Outputting kernel addresses will reveal the locations of kernel code
+and data. Change the cases in show_floppy that print
+fd_timer.work.func and fd_timeout.work.func to use the %pf format
+specifier, which will print the symbol name, like what is done for the
+other function pointers printed by show_floppy. No longer output the
+value of cont. The variable cont is a pointer that can hold the
+address of kernel global variables.
+
+Signed-off-by: Brian Belleville <bbellevi@uci.edu>
+---
+ drivers/block/floppy.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
+index eae484acfbbc..e29d4174ea2c 100644
+--- a/drivers/block/floppy.c
++++ b/drivers/block/floppy.c
+@@ -1819,15 +1819,14 @@ static void show_floppy(void)
+ 	if (work_pending(&floppy_work))
+ 		pr_info("floppy_work.func=%pf\n", floppy_work.func);
+ 	if (delayed_work_pending(&fd_timer))
+-		pr_info("delayed work.function=%p expires=%ld\n",
++		pr_info("delayed work.function=%pf expires=%ld\n",
+ 		       fd_timer.work.func,
+ 		       fd_timer.timer.expires - jiffies);
+ 	if (delayed_work_pending(&fd_timeout))
+-		pr_info("timer_function=%p expires=%ld\n",
++		pr_info("timer_function=%pf expires=%ld\n",
+ 		       fd_timeout.work.func,
+ 		       fd_timeout.timer.expires - jiffies);
+ 
+-	pr_info("cont=%p\n", cont);
+ 	pr_info("current_req=%p\n", current_req);
+ 	pr_info("command_status=%d\n", command_status);
+ 	pr_info("\n");
+-- 
+2.16.2
+
diff --git a/gitrev b/gitrev
index 62e1aaaaa..a91e6808b 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-79c0ef3e85c015b0921a8fd5dd539d1480e9cd6c
+af3e79d29555b97dd096e2f8e36a0f50213808a8
diff --git a/kernel.spec b/kernel.spec
index 357b1c944..b0a1748f2 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 2
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -601,6 +601,9 @@ Patch313: arm-crypto-sunxi-ss-Add-MODULE_ALIAS-to-sun4i-ss.patch
 
 # 500 - Temp fixes/CVEs etc
 
+# CVE-2018-7273 rhbz 1547384 1547386
+Patch500: floppy-Don-t-print-kernel-addresses-to-log-in-show_f.patch
+
 # 600 - Patches for improved Bay and Cherry Trail device support
 # Below patches are submitted upstream, awaiting review / merging
 
@@ -1872,6 +1875,9 @@ fi
 #
 #
 %changelog
+* Wed Feb 21 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc2.git2.1
+- Linux v4.16-rc2-64-gaf3e79d29555
+
 * Tue Feb 20 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc2.git1.1
 - Linux v4.16-rc2-62-g79c0ef3e85c0
 - Reenable debugging options
diff --git a/sources b/sources
index b79821886..2640b900b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-4.15.tar.xz) = c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
 SHA512 (patch-4.16-rc2.xz) = 3b72039fee7a481ed6a491a5795b9f1184c8fb4597a96332b513856f82a4410bbffa5bf61b59ec7b6ed4f789b22027d3f20d91b024b9fd3afbbd9ff56499cb8e
-SHA512 (patch-4.16-rc2-git1.xz) = b23653b0deaa753447e98b871e036e2d8af3bd31e42ccfc6c511a3f9b9664d698cb7832497bbaab33521cb3bd48f9bba4a2ff5f458ced50794c876687b8e3b4e
+SHA512 (patch-4.16-rc2-git2.xz) = 4766e15bdb1d4af85c77733388a80934d9fab143c7170d2abe4e8b088930ef58db66d22f4f3d206e93a80d5bb15407f53142d9c86f6b684c715c181709642219