From 8ac2f5a9e9a44b77b95dfd52b14174029e687ed3 Mon Sep 17 00:00:00 2001 From: Konstantin Demin Date: Tue, 29 Oct 2024 05:12:06 +0300 Subject: [PATCH] sync with debian source https://salsa.debian.org/kernel-team/linux.git commit 17c66fb57bc427657ab2689fdaf18a3455aef8ce version 6.11.5-1 UNRELEASED --- debian/changelog | 15 ++++ ...c-Fix-IDMAC-operation-with-pages-big.patch | 29 ++++++++ ...s-fix-typo-causing-some-targets-not-.patch | 70 +++++++++++++++++++ debian/patches/series | 2 + 4 files changed, 116 insertions(+) create mode 100644 debian/patches/bugfix/all/Revert-mmc-dw_mmc-Fix-IDMAC-operation-with-pages-big.patch create mode 100644 debian/patches/bugfix/all/netfilter-xtables-fix-typo-causing-some-targets-not-.patch diff --git a/debian/changelog b/debian/changelog index e9ab52a..0efdaf9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +linux (6.11.5-1) UNRELEASED; urgency=medium + + * New upstream stable update: + https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.11.5 + + [ Aurelien Jarno ] + * Revert upstream commit causing data corrution (Closes: #1085425) + - Revert "mmc: dw_mmc: Fix IDMAC operation with pages bigger than 4K" + + [ Salvatore Bonaccorso ] + * netfilter: xtables: fix typo causing some targets not to load on IPv6 + (Closes: #1085953) + + -- Salvatore Bonaccorso Wed, 23 Oct 2024 11:00:05 +0200 + linux (6.11.4-1) unstable; urgency=medium * New upstream stable update: diff --git a/debian/patches/bugfix/all/Revert-mmc-dw_mmc-Fix-IDMAC-operation-with-pages-big.patch b/debian/patches/bugfix/all/Revert-mmc-dw_mmc-Fix-IDMAC-operation-with-pages-big.patch new file mode 100644 index 0000000..4afd8eb --- /dev/null +++ b/debian/patches/bugfix/all/Revert-mmc-dw_mmc-Fix-IDMAC-operation-with-pages-big.patch @@ -0,0 +1,29 @@ +From ae6a452692f8b02115019b0b62ac82ae2c432f59 Mon Sep 17 00:00:00 2001 +From: Aurelien Jarno +Date: Wed, 23 Oct 2024 21:28:33 +0200 +Subject: [PATCH] Revert "mmc: dw_mmc: Fix IDMAC operation with pages bigger + than 4K" + +This reverts commit 8396c793ffdf28bb8aee7cfe0891080f8cab7890. +--- + drivers/mmc/host/dw_mmc.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c +index 41e451235f637..e9f6e4e622901 100644 +--- a/drivers/mmc/host/dw_mmc.c ++++ b/drivers/mmc/host/dw_mmc.c +@@ -2957,8 +2957,8 @@ static int dw_mci_init_slot(struct dw_mci *host) + if (host->use_dma == TRANS_MODE_IDMAC) { + mmc->max_segs = host->ring_size; + mmc->max_blk_size = 65535; +- mmc->max_req_size = DW_MCI_DESC_DATA_LENGTH * host->ring_size; +- mmc->max_seg_size = mmc->max_req_size; ++ mmc->max_seg_size = 0x1000; ++ mmc->max_req_size = mmc->max_seg_size * host->ring_size; + mmc->max_blk_count = mmc->max_req_size / 512; + } else if (host->use_dma == TRANS_MODE_EDMAC) { + mmc->max_segs = 64; +-- +2.45.2 + diff --git a/debian/patches/bugfix/all/netfilter-xtables-fix-typo-causing-some-targets-not-.patch b/debian/patches/bugfix/all/netfilter-xtables-fix-typo-causing-some-targets-not-.patch new file mode 100644 index 0000000..470df89 --- /dev/null +++ b/debian/patches/bugfix/all/netfilter-xtables-fix-typo-causing-some-targets-not-.patch @@ -0,0 +1,70 @@ +From: Pablo Neira Ayuso +Date: Sun, 20 Oct 2024 14:49:51 +0200 +Subject: netfilter: xtables: fix typo causing some targets not to load on IPv6 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +Origin: https://git.kernel.org/linus/306ed1728e8438caed30332e1ab46b28c25fe3d8 +Bug-Debian: https://bugs.debian.org/1085953 + +- There is no NFPROTO_IPV6 family for mark and NFLOG. +- TRACE is also missing module autoload with NFPROTO_IPV6. + +This results in ip6tables failing to restore a ruleset. This issue has been +reported by several users providing incomplete patches. + +Very similar to Ilya Katsnelson's patch including a missing chunk in the +TRACE extension. + +Fixes: 0bfcb7b71e73 ("netfilter: xtables: avoid NFPROTO_UNSPEC where needed") +Reported-by: Ignat Korchagin +Reported-by: Ilya Katsnelson +Reported-by: Krzysztof Olędzki +Signed-off-by: Pablo Neira Ayuso +--- + net/netfilter/xt_NFLOG.c | 2 +- + net/netfilter/xt_TRACE.c | 1 + + net/netfilter/xt_mark.c | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/net/netfilter/xt_NFLOG.c b/net/netfilter/xt_NFLOG.c +index d80abd6ccaf8..6dcf4bc7e30b 100644 +--- a/net/netfilter/xt_NFLOG.c ++++ b/net/netfilter/xt_NFLOG.c +@@ -79,7 +79,7 @@ static struct xt_target nflog_tg_reg[] __read_mostly = { + { + .name = "NFLOG", + .revision = 0, +- .family = NFPROTO_IPV4, ++ .family = NFPROTO_IPV6, + .checkentry = nflog_tg_check, + .destroy = nflog_tg_destroy, + .target = nflog_tg, +diff --git a/net/netfilter/xt_TRACE.c b/net/netfilter/xt_TRACE.c +index f3fa4f11348c..a642ff09fc8e 100644 +--- a/net/netfilter/xt_TRACE.c ++++ b/net/netfilter/xt_TRACE.c +@@ -49,6 +49,7 @@ static struct xt_target trace_tg_reg[] __read_mostly = { + .target = trace_tg, + .checkentry = trace_tg_check, + .destroy = trace_tg_destroy, ++ .me = THIS_MODULE, + }, + #endif + }; +diff --git a/net/netfilter/xt_mark.c b/net/netfilter/xt_mark.c +index f76fe04fc9a4..65b965ca40ea 100644 +--- a/net/netfilter/xt_mark.c ++++ b/net/netfilter/xt_mark.c +@@ -62,7 +62,7 @@ static struct xt_target mark_tg_reg[] __read_mostly = { + { + .name = "MARK", + .revision = 2, +- .family = NFPROTO_IPV4, ++ .family = NFPROTO_IPV6, + .target = mark_tg, + .targetsize = sizeof(struct xt_mark_tginfo2), + .me = THIS_MODULE, +-- +2.45.2 + diff --git a/debian/patches/series b/debian/patches/series index 22aa052..3cc9bed 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -73,6 +73,8 @@ features/x86/x86-make-x32-syscall-support-conditional.patch bugfix/all/disable-some-marvell-phys.patch bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch bugfix/all/documentation-use-relative-source-paths-in-abi-documentation.patch +bugfix/all/Revert-mmc-dw_mmc-Fix-IDMAC-operation-with-pages-big.patch +bugfix/all/netfilter-xtables-fix-typo-causing-some-targets-not-.patch # Miscellaneous features