rebase patches on top of Ubuntu-5.4.0-81.91
(generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
		
							parent
							
								
									0a9202604f
								
							
						
					
					
						commit
						a9d3e3c380
					
				@ -75,7 +75,7 @@ index 359b54d2da21..00c9ace3711b 100644
 | 
				
			|||||||
 				Safety option to keep boot IRQs enabled. This
 | 
					 				Safety option to keep boot IRQs enabled. This
 | 
				
			||||||
 				should never be necessary.
 | 
					 				should never be necessary.
 | 
				
			||||||
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
 | 
					diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
 | 
				
			||||||
index 862038155fdf..78fb4b34c12d 100644
 | 
					index c17540b5c979..8f0d62e2a9cf 100644
 | 
				
			||||||
--- a/drivers/pci/quirks.c
 | 
					--- a/drivers/pci/quirks.c
 | 
				
			||||||
+++ b/drivers/pci/quirks.c
 | 
					+++ b/drivers/pci/quirks.c
 | 
				
			||||||
@@ -192,6 +192,106 @@ static int __init pci_apply_final_quirks(void)
 | 
					@@ -192,6 +192,106 @@ static int __init pci_apply_final_quirks(void)
 | 
				
			||||||
@ -185,7 +185,7 @@ index 862038155fdf..78fb4b34c12d 100644
 | 
				
			|||||||
 /*
 | 
					 /*
 | 
				
			||||||
  * Decoding should be disabled for a PCI device during BAR sizing to avoid
 | 
					  * Decoding should be disabled for a PCI device during BAR sizing to avoid
 | 
				
			||||||
  * conflict. But doing so may cause problems on host bridge and perhaps other
 | 
					  * conflict. But doing so may cause problems on host bridge and perhaps other
 | 
				
			||||||
@@ -4828,6 +4928,8 @@ static const struct pci_dev_acs_enabled {
 | 
					@@ -4915,6 +5015,8 @@ static const struct pci_dev_acs_enabled {
 | 
				
			||||||
 	{ PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs },
 | 
					 	{ PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs },
 | 
				
			||||||
 	/* APM X-Gene */
 | 
					 	/* APM X-Gene */
 | 
				
			||||||
 	{ PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs },
 | 
					 	{ PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs },
 | 
				
			||||||
 | 
				
			|||||||
@ -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