From: Sasha Levin Date: Sat, 26 Jan 2019 18:26:58 +0000 (-0500) Subject: patches for 4.9 X-Git-Tag: v4.9.154~65 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7c5454ef19c8af3473d86a4855034be9b901c6a;p=thirdparty%2Fkernel%2Fstable-queue.git patches for 4.9 Signed-off-by: Sasha Levin --- diff --git a/queue-4.9/ipfrag-really-prevent-allocation-on-netns-exit.patch b/queue-4.9/ipfrag-really-prevent-allocation-on-netns-exit.patch new file mode 100644 index 00000000000..b021894b9bc --- /dev/null +++ b/queue-4.9/ipfrag-really-prevent-allocation-on-netns-exit.patch @@ -0,0 +1,39 @@ +From 25151b82e9062a4d0266916648e4f76e162f81c8 Mon Sep 17 00:00:00 2001 +From: Paolo Abeni +Date: Fri, 6 Jul 2018 12:30:20 +0200 +Subject: ipfrag: really prevent allocation on netns exit + +[ Upstream commit f6f2a4a2eb92bc73671204198bb2f8ab53ff59fb ] + +Setting the low threshold to 0 has no effect on frags allocation, +we need to clear high_thresh instead. + +The code was pre-existent to commit 648700f76b03 ("inet: frags: +use rhashtables for reassembly units"), but before the above, +such assignment had a different role: prevent concurrent eviction +from the worker and the netns cleanup helper. + +Fixes: 648700f76b03 ("inet: frags: use rhashtables for reassembly units") +Signed-off-by: Paolo Abeni +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/ipv4/inet_fragment.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c +index 5a8c26c9872d..0fb49dedc9fb 100644 +--- a/net/ipv4/inet_fragment.c ++++ b/net/ipv4/inet_fragment.c +@@ -90,7 +90,7 @@ static void inet_frags_free_cb(void *ptr, void *arg) + + void inet_frags_exit_net(struct netns_frags *nf) + { +- nf->low_thresh = 0; /* prevent creation of new frags */ ++ nf->high_thresh = 0; /* prevent creation of new frags */ + + rhashtable_free_and_destroy(&nf->rhashtable, inet_frags_free_cb, NULL); + } +-- +2.19.1 + diff --git a/queue-4.9/mmc-kconfig-enable-config_mmc_sdhci_io_accessors.patch b/queue-4.9/mmc-kconfig-enable-config_mmc_sdhci_io_accessors.patch new file mode 100644 index 00000000000..34e79e592af --- /dev/null +++ b/queue-4.9/mmc-kconfig-enable-config_mmc_sdhci_io_accessors.patch @@ -0,0 +1,36 @@ +From 5ff661be31de316f812d2e637f6dda54321ccdca Mon Sep 17 00:00:00 2001 +From: Vijay Viswanath +Date: Fri, 25 Jan 2019 17:11:41 +0200 +Subject: mmc: Kconfig: Enable CONFIG_MMC_SDHCI_IO_ACCESSORS + +commit 99d570da309813f67e9c741edeff55bafc6c1d5e upstream. + +Enable CONFIG_MMC_SDHCI_IO_ACCESSORS so that SDHC controller specific +register read and write APIs, if registered, can be used. + +Signed-off-by: Vijay Viswanath +Acked-by: Adrian Hunter +Signed-off-by: Ulf Hansson +Cc: Koen Vandeputte +Cc: Loic Poulain +Signed-off-by: Georgi Djakov +Signed-off-by: Sasha Levin +--- + drivers/mmc/host/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig +index 5274f503a39a..33de3eece02d 100644 +--- a/drivers/mmc/host/Kconfig ++++ b/drivers/mmc/host/Kconfig +@@ -399,6 +399,7 @@ config MMC_SDHCI_MSM + tristate "Qualcomm SDHCI Controller Support" + depends on ARCH_QCOM || (ARM && COMPILE_TEST) + depends on MMC_SDHCI_PLTFM ++ select MMC_SDHCI_IO_ACCESSORS + help + This selects the Secure Digital Host Controller Interface (SDHCI) + support present in Qualcomm SOCs. The controller supports +-- +2.19.1 + diff --git a/queue-4.9/series b/queue-4.9/series index ce5814f07af..5225dccd148 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -4,3 +4,5 @@ openvswitch-avoid-oob-read-when-parsing-flow-nlattrs.patch vhost-log-dirty-page-correctly.patch net-ipv4-fix-memory-leak-in-network-namespace-dismantle.patch net_sched-refetch-skb-protocol-for-each-filter.patch +ipfrag-really-prevent-allocation-on-netns-exit.patch +mmc-kconfig-enable-config_mmc_sdhci_io_accessors.patch