From: Thomas Lamprecht Date: Wed, 21 Jul 2021 16:22:17 +0000 (+0200) Subject: rebase patches on top of Ubuntu-5.11.0-26.28 X-Git-Url: https://git.proxmox.com/?p=pve-kernel.git;a=commitdiff_plain;h=bf5098de79f71650ba58e56869b4dd1441d7af7b rebase patches on top of Ubuntu-5.11.0-26.28 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht --- diff --git a/patches/kernel/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch b/patches/kernel/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch index 4ed84b1..6d8dd3e 100644 --- a/patches/kernel/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch +++ b/patches/kernel/0005-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 76e593a4cc30..c1e9097e7a08 100644 +index b91b76890cbc..cb7ffc3e848b 100644 --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -10346,7 +10346,7 @@ static void netdev_wait_allrefs(struct net_device *dev) +@@ -10365,7 +10365,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/0007-seq-file-disallow-extremely-large.patch b/patches/kernel/0007-seq-file-disallow-extremely-large.patch deleted file mode 100644 index fe4be93..0000000 --- a/patches/kernel/0007-seq-file-disallow-extremely-large.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8cae8cd89f05f6de223d63e6d15e31c8ba9cf53b Mon Sep 17 00:00:00 2001 -From: Eric Sandeen -Date: Tue, 13 Jul 2021 17:49:23 +0200 -Subject: seq_file: disallow extremely large seq buffer allocations - -There is no reasonable need for a buffer larger than this, and it avoids -int overflow pitfalls. - -Fixes: 058504edd026 ("fs/seq_file: fallback to vmalloc allocation") -Suggested-by: Al Viro -Reported-by: Qualys Security Advisory -Signed-off-by: Eric Sandeen -Cc: stable@kernel.org -Signed-off-by: Linus Torvalds ---- - fs/seq_file.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/fs/seq_file.c b/fs/seq_file.c -index b117b212ef288..4a2cda04d3e29 100644 ---- a/fs/seq_file.c -+++ b/fs/seq_file.c -@@ -32,6 +32,9 @@ static void seq_set_overflow(struct seq_file *m) - - static void *seq_buf_alloc(unsigned long size) - { -+ if (unlikely(size > MAX_RW_COUNT)) -+ return NULL; -+ - return kvmalloc(size, GFP_KERNEL_ACCOUNT); - } - --- -cgit 1.2.3-1.el7