]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 12:25:25 +0000 (14:25 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 12:25:25 +0000 (14:25 +0200)
added patches:
seq_file-disallow-extremely-large-seq-buffer-allocations.patch

queue-4.14/seq_file-disallow-extremely-large-seq-buffer-allocations.patch [new file with mode: 0644]
queue-4.14/series

diff --git a/queue-4.14/seq_file-disallow-extremely-large-seq-buffer-allocations.patch b/queue-4.14/seq_file-disallow-extremely-large-seq-buffer-allocations.patch
new file mode 100644 (file)
index 0000000..174377e
--- /dev/null
@@ -0,0 +1,35 @@
+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
+
+From: Eric Sandeen <sandeen@redhat.com>
+
+commit 8cae8cd89f05f6de223d63e6d15e31c8ba9cf53b upstream.
+
+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>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/seq_file.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/fs/seq_file.c
++++ b/fs/seq_file.c
+@@ -26,6 +26,9 @@ static void seq_set_overflow(struct seq_
+ static void *seq_buf_alloc(unsigned long size)
+ {
++      if (unlikely(size > MAX_RW_COUNT))
++              return NULL;
++
+       return kvmalloc(size, GFP_KERNEL);
+ }
index 44e861f218beb01cefda1629d09fece662f9b09b..8e5914000bcf5d5788447305b5d54774b07f5bc8 100644 (file)
@@ -312,3 +312,4 @@ mips-always-link-byteswap-helpers-into-decompressor.patch
 mips-disable-branch-profiling-in-boot-decompress.o.patch
 mips-vdso-invalid-gic-access-through-vdso.patch
 net-bridge-multicast-fix-pim-hello-router-port-marking-race.patch
+seq_file-disallow-extremely-large-seq-buffer-allocations.patch