rebase patches on top of Ubuntu-5.11.0-26.28
(generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
23ab73881f
commit
bf5098de79
@ -10,10 +10,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/net/core/dev.c b/net/core/dev.c
|
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
|
--- a/net/core/dev.c
|
||||||
+++ b/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);
|
refcnt = netdev_refcnt_read(dev);
|
||||||
|
|
||||||
if (refcnt && time_after(jiffies, warning_time + 10 * HZ)) {
|
if (refcnt && time_after(jiffies, warning_time + 10 * HZ)) {
|
||||||
|
@ -1,34 +0,0 @@
|
|||||||
From 8cae8cd89f05f6de223d63e6d15e31c8ba9cf53b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Eric Sandeen <sandeen@redhat.com>
|
|
||||||
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 <viro@zeniv.linux.org.uk>
|
|
||||||
Reported-by: Qualys Security Advisory <qsa@qualys.com>
|
|
||||||
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
|
|
||||||
Cc: stable@kernel.org
|
|
||||||
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
|
||||||
---
|
|
||||||
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
|
|
Loading…
Reference in New Issue
Block a user