From 3628b61fa8ffd4ed0f11330add589df8aae1c094 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 1 Jun 2020 14:59:35 +0200 Subject: [PATCH] 4.9-stable patches added patches: netfilter-nf_conntrack_pptp-fix-compilation-warning-with-w-1-build.patch revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch --- ...x-compilation-warning-with-w-1-build.patch | 45 +++++++++++++++++++ ...d-thinkpad-s230u-to-i8042-nomux-list.patch | 41 +++++++++++++++++ queue-4.9/series | 2 + 3 files changed, 88 insertions(+) create mode 100644 queue-4.9/netfilter-nf_conntrack_pptp-fix-compilation-warning-with-w-1-build.patch create mode 100644 queue-4.9/revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch diff --git a/queue-4.9/netfilter-nf_conntrack_pptp-fix-compilation-warning-with-w-1-build.patch b/queue-4.9/netfilter-nf_conntrack_pptp-fix-compilation-warning-with-w-1-build.patch new file mode 100644 index 00000000000..78efe4e07f5 --- /dev/null +++ b/queue-4.9/netfilter-nf_conntrack_pptp-fix-compilation-warning-with-w-1-build.patch @@ -0,0 +1,45 @@ +From 4946ea5c1237036155c3b3a24f049fd5f849f8f6 Mon Sep 17 00:00:00 2001 +From: Pablo Neira Ayuso +Date: Wed, 27 May 2020 12:24:10 +0200 +Subject: netfilter: nf_conntrack_pptp: fix compilation warning with W=1 build + +From: Pablo Neira Ayuso + +commit 4946ea5c1237036155c3b3a24f049fd5f849f8f6 upstream. + +>> include/linux/netfilter/nf_conntrack_pptp.h:13:20: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers] +extern const char *const pptp_msg_name(u_int16_t msg); +^~~~~~ + +Reported-by: kbuild test robot +Fixes: 4c559f15efcc ("netfilter: nf_conntrack_pptp: prevent buffer overflows in debug code") +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Greg Kroah-Hartman + +--- + include/linux/netfilter/nf_conntrack_pptp.h | 2 +- + net/netfilter/nf_conntrack_pptp.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/include/linux/netfilter/nf_conntrack_pptp.h ++++ b/include/linux/netfilter/nf_conntrack_pptp.h +@@ -4,7 +4,7 @@ + + #include + +-extern const char *const pptp_msg_name(u_int16_t msg); ++const char *pptp_msg_name(u_int16_t msg); + + /* state of the control session */ + enum pptp_ctrlsess_state { +--- a/net/netfilter/nf_conntrack_pptp.c ++++ b/net/netfilter/nf_conntrack_pptp.c +@@ -90,7 +90,7 @@ static const char *const pptp_msg_name_a + [PPTP_SET_LINK_INFO] = "SET_LINK_INFO" + }; + +-const char *const pptp_msg_name(u_int16_t msg) ++const char *pptp_msg_name(u_int16_t msg) + { + if (msg > PPTP_MSG_MAX) + return pptp_msg_name_array[0]; diff --git a/queue-4.9/revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch b/queue-4.9/revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch new file mode 100644 index 00000000000..c19103745cf --- /dev/null +++ b/queue-4.9/revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch @@ -0,0 +1,41 @@ +From f4dec2d6160976b14e54be9c3950ce0f52385741 Mon Sep 17 00:00:00 2001 +From: Dmitry Torokhov +Date: Mon, 27 Apr 2020 18:06:02 -0700 +Subject: Revert "Input: i8042 - add ThinkPad S230u to i8042 nomux list" + +From: Dmitry Torokhov + +commit f4dec2d6160976b14e54be9c3950ce0f52385741 upstream. + +This reverts commit 18931506465a762ffd3f4803d36a18d336a67da9. From Kevin +Locke: + +"... nomux only appeared to fix the issue because the controller +continued working after warm reboots. After more thorough testing from +both warm and cold start, I now believe the entry should be added to +i8042_dmi_reset_table rather than i8042_dmi_nomux_table as i8042.reset=1 +alone is sufficient to avoid the issue from both states while +i8042.nomux is not." + +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/input/serio/i8042-x86ia64io.h | 7 ------- + 1 file changed, 7 deletions(-) + +--- a/drivers/input/serio/i8042-x86ia64io.h ++++ b/drivers/input/serio/i8042-x86ia64io.h +@@ -545,13 +545,6 @@ static const struct dmi_system_id __init + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"), + }, + }, +- { +- /* Lenovo ThinkPad Twist S230u */ +- .matches = { +- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), +- DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"), +- }, +- }, + { } + }; + diff --git a/queue-4.9/series b/queue-4.9/series index a8bb003ae47..e4b9bc197c6 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -52,3 +52,5 @@ netfilter-ipset-fix-subcounter-update-skip.patch netfilter-nf_conntrack_pptp-prevent-buffer-overflows-in-debug-code.patch qlcnic-fix-missing-release-in-qlcnic_83xx_interrupt_test.patch bonding-fix-reference-count-leak-in-bond_sysfs_slave_add.patch +revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch +netfilter-nf_conntrack_pptp-fix-compilation-warning-with-w-1-build.patch -- 2.47.3