diff --git a/patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch b/patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch index 191f8a0..1d129bd 100644 --- a/patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch +++ b/patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch @@ -10,10 +10,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/dev.c b/net/core/dev.c -index 8a90dd55e844..3794b7c3a96f 100644 +index f2c6fc836f9d..8940c12333b0 100644 --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -9365,7 +9365,7 @@ static void netdev_wait_allrefs(struct net_device *dev) +@@ -9368,7 +9368,7 @@ static void netdev_wait_allrefs(struct net_device *dev) refcnt = netdev_refcnt_read(dev); if (refcnt && time_after(jiffies, warning_time + 10 * HZ)) { 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-focal b/submodules/ubuntu-focal index e709e61..206c12b 160000 --- a/submodules/ubuntu-focal +++ b/submodules/ubuntu-focal @@ -1 +1 @@ -Subproject commit e709e6174f73e746d276280e025ac431c962041e +Subproject commit 206c12bf2ef2d607a3942b8e1b7c8959b4e95ec8