From dd3e28d69ae3ec2926cf2f5c72748a11fd6bbbf1 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Mon, 31 Jan 2022 10:08:41 +0100 Subject: [PATCH] update to Ubuntu-5.13.0-29.32 Signed-off-by: Thomas Lamprecht --- ...ed-and-unbounded-work-into-separate.patch} | 0 ...ate-split-BTF-type-info-per-default.patch} | 8 ++-- patches/kernel/0011-vfs-fix.patch | 38 ------------------- submodules/ubuntu-impish | 2 +- 4 files changed, 5 insertions(+), 43 deletions(-) rename patches/kernel/{0009-io-wq-split-bounded-and-unbounded-work-into-separate.patch => 0008-io-wq-split-bounded-and-unbounded-work-into-separate.patch} (100%) rename patches/kernel/{0011-disable-split-btf.patch => 0009-do-not-generate-split-BTF-type-info-per-default.patch} (85%) delete mode 100644 patches/kernel/0011-vfs-fix.patch diff --git a/patches/kernel/0009-io-wq-split-bounded-and-unbounded-work-into-separate.patch b/patches/kernel/0008-io-wq-split-bounded-and-unbounded-work-into-separate.patch similarity index 100% rename from patches/kernel/0009-io-wq-split-bounded-and-unbounded-work-into-separate.patch rename to patches/kernel/0008-io-wq-split-bounded-and-unbounded-work-into-separate.patch diff --git a/patches/kernel/0011-disable-split-btf.patch b/patches/kernel/0009-do-not-generate-split-BTF-type-info-per-default.patch similarity index 85% rename from patches/kernel/0011-disable-split-btf.patch rename to patches/kernel/0009-do-not-generate-split-BTF-type-info-per-default.patch index 6b1d55c..3f848c1 100644 --- a/patches/kernel/0011-disable-split-btf.patch +++ b/patches/kernel/0009-do-not-generate-split-BTF-type-info-per-default.patch @@ -1,10 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Thu, 14 Sep 2017 11:09:58 +0200 -Subject: do not generate split BTF type info per default -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +Subject: [PATCH] do not generate split BTF type info per default This reverts commit a8ed1a0607cfa5478ff6009539f44790c4d0956d. @@ -13,6 +10,9 @@ https://github.com/openzfs/zfs/issues/12301#issuecomment-873303739 Signed-off-by: Thomas Lamprecht --- + lib/Kconfig.debug | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 25dc20175bba..7ff51a3f65e6 100644 --- a/lib/Kconfig.debug diff --git a/patches/kernel/0011-vfs-fix.patch b/patches/kernel/0011-vfs-fix.patch deleted file mode 100644 index dc95794..0000000 --- a/patches/kernel/0011-vfs-fix.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jamie Hill-Daniel -Date: Tue, 18 Jan 2022 08:06:04 +0100 -Subject: vfs: fs_context: fix up param length parsing in legacy_parse_param - -commit 722d94847de29310e8aa03fcbdb41fc92c521756 upstream. - -The "PAGE_SIZE - 2 - size" calculation in legacy_parse_param() is an -unsigned type so a large value of "size" results in a high positive -value instead of a negative value as expected. Fix this by getting rid -of the subtraction. - -Signed-off-by: Jamie Hill-Daniel -Signed-off-by: William Liu -Tested-by: Salvatore Bonaccorso -Tested-by: Thadeu Lima de Souza Cascardo -Acked-by: Dan Carpenter -Acked-by: Al Viro -Signed-off-by: Linus Torvalds -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Thomas Lamprecht ---- - fs/fs_context.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fs/fs_context.c b/fs/fs_context.c -index b7e43a780a625..24ce12f0db32e 100644 ---- a/fs/fs_context.c -+++ b/fs/fs_context.c -@@ -548,7 +548,7 @@ static int legacy_parse_param(struct fs_context *fc, struct fs_parameter *param) - param->key); - } - -- if (len > PAGE_SIZE - 2 - size) -+ if (size + len + 2 > PAGE_SIZE) - return invalf(fc, "VFS: Legacy: Cumulative options too large"); - if (strchr(param->key, ',') || - (param->type == fs_value_is_string && diff --git a/submodules/ubuntu-impish b/submodules/ubuntu-impish index f71c3af..ea234db 160000 --- a/submodules/ubuntu-impish +++ b/submodules/ubuntu-impish @@ -1 +1 @@ -Subproject commit f71c3af206e5a967bf6058be2b4e6cc8df42bc29 +Subproject commit ea234db8599f60b16db002b6b739e835c4204511