Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Hocko <mhocko@suse.com>2018-11-02 12:38:07 +0100
committerMichal Hocko <mhocko@suse.com>2018-11-02 12:38:07 +0100
commite1918010b9b65a49ae68bf0dfc830f917b65c5e7 (patch)
tree6e5b98db5a3d96a01c09cc337b0b7bbe5c79a481
parentd2e32578adde6aed89c1b1ed3544ba24507b758d (diff)
parentc1c57b89d813ac6d85dc2782516c9bd428c9290d (diff)
Merge remote-tracking branch 'origin/users/bpetkov/SLE11-SP4/for-next' into users/mhocko/SLE11-SP4/for-next
-rw-r--r--blacklist.conf3
-rw-r--r--patches.fixes/firmware-ihex2fw-c-restore-missing-default-in-switch-statement.patch39
-rw-r--r--series.conf3
3 files changed, 45 insertions, 0 deletions
diff --git a/blacklist.conf b/blacklist.conf
index cf9a6db65e..b7f6aeda28 100644
--- a/blacklist.conf
+++ b/blacklist.conf
@@ -294,3 +294,6 @@ c183813fcee44a249339b7c46e1ad271ca1870aa # opimization
ad608fbcf166fec809e402d548761768f602702c # breaks kABI
10fe570fc16721d78afdba9689720094527c1ba3 # only relevant for pvops Xen
d3b6f9ffca9598381f63119f1cce77508fd37f64 # a merge commit
+f594bae08183fb6b57db55387794ece3e1edf6f6 # documentation
+a98959fdbda1849a01b2150bb635ed559ec06700 # fix for a corner case which should not be observable in practice
+fd0f50db2eb72555ef8f70af14c1e3ee2079b32c # documentation
diff --git a/patches.fixes/firmware-ihex2fw-c-restore-missing-default-in-switch-statement.patch b/patches.fixes/firmware-ihex2fw-c-restore-missing-default-in-switch-statement.patch
new file mode 100644
index 0000000000..9937386b1d
--- /dev/null
+++ b/patches.fixes/firmware-ihex2fw-c-restore-missing-default-in-switch-statement.patch
@@ -0,0 +1,39 @@
+From: Nicolas Iooss <nicolas.iooss_linux@m4x.org>
+Date: Thu, 16 Apr 2015 12:44:02 -0700
+Subject: firmware/ihex2fw.c: restore missing default in switch statement
+Git-commit: d43698e8abb58a6ac47d16e0f47bb55f452e4fc4
+Patch-mainline: v4.1-rc1
+References: bsc#1114460
+
+Commit 2473238eac95 ("ihex: add support for CS:IP/EIP records") removes
+the "default:" statement in the switch block, making the "return
+usage();" line dead code and ihex2fw silently ignoring unknown options.
+Restore this statement.
+
+This bug was found by building with HOSTCC=clang and adding
+-Wunreachable-code-return to HOSTCFLAGS.
+
+Fixes: 2473238eac95 ("ihex: add support for CS:IP/EIP records")
+Signed-off-by: Nicolas Iooss <nicolas.iooss_linux@m4x.org>
+Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
+Cc: David Woodhouse <dwmw2@infradead.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Acked-by: Borislav Petkov <bp@suse.de>
+---
+ firmware/ihex2fw.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/firmware/ihex2fw.c b/firmware/ihex2fw.c
+index cf38e159131a..08d90e25abf0 100644
+--- a/firmware/ihex2fw.c
++++ b/firmware/ihex2fw.c
+@@ -86,6 +86,7 @@ int main(int argc, char **argv)
+ case 'j':
+ include_jump = 1;
+ break;
++ default:
+ return usage();
+ }
+ }
+
diff --git a/series.conf b/series.conf
index 5fe2759fa6..e978a294b0 100644
--- a/series.conf
+++ b/series.conf
@@ -22221,6 +22221,9 @@
patches.drivers/HID-usbhid-fix-out-of-bounds-bug.patch
patches.drivers/HID-hid-cypress-validate-length-of-report.patch
+ # bsc#1114460
+ patches.fixes/firmware-ihex2fw-c-restore-missing-default-in-switch-statement.patch
+
########################################################
# Other drivers we have added to the tree
########################################################