aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorChristian Marangi <ansuelsmth@gmail.com>2023-05-06 08:18:11 +0200
committerChristian Marangi <ansuelsmth@gmail.com>2023-05-12 03:15:35 +0200
commit5913ea1ba2fa7f5fc055c8ade361e06ddb666120 (patch)
tree36fa7ad55dd35d87e728ea7d1cbb5ba0eeb4ec6c /target
parent2b1de625eb0d335750c7118a1a2a95eb61514b89 (diff)
downloadupstream-5913ea1ba2fa7f5fc055c8ade361e06ddb666120.tar.gz
upstream-5913ea1ba2fa7f5fc055c8ade361e06ddb666120.tar.bz2
upstream-5913ea1ba2fa7f5fc055c8ade361e06ddb666120.zip
generic: 5.15: add pending patch fixing binfmt compilation warning
Add pending patch fixing binfmt compilation warning on some arch. This fix compilation warning: fs/binfmt_elf.c: In function 'parse_elf_properties.isra': fs/binfmt_elf.c:821:1: error: the frame size of 1040 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] 821 | } | ^ cc1: all warnings being treated as errors Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/pending-5.15/130-binfmt_elf-dynamically-allocate-note.data-in-parse_e.patch94
1 files changed, 94 insertions, 0 deletions
diff --git a/target/linux/generic/pending-5.15/130-binfmt_elf-dynamically-allocate-note.data-in-parse_e.patch b/target/linux/generic/pending-5.15/130-binfmt_elf-dynamically-allocate-note.data-in-parse_e.patch
new file mode 100644
index 0000000000..f04007e982
--- /dev/null
+++ b/target/linux/generic/pending-5.15/130-binfmt_elf-dynamically-allocate-note.data-in-parse_e.patch
@@ -0,0 +1,94 @@
+From ca71e00839fcdd26f122fb6d9e97903c9fe198f7 Mon Sep 17 00:00:00 2001
+From: Christian Marangi <ansuelsmth@gmail.com>
+Date: Sat, 6 May 2023 08:08:35 +0200
+Subject: [PATCH] binfmt_elf: dynamically allocate note.data in
+ parse_elf_properties
+
+Dynamically allocate note.data in parse_elf_properties to fix
+compilation warning on some arch.
+
+On some arch note.data exceet the stack limit for a single function and
+this cause the following compilation warning:
+fs/binfmt_elf.c: In function 'parse_elf_properties.isra':
+fs/binfmt_elf.c:821:1: error: the frame size of 1040 bytes is larger than 1024 bytes [-Werror=frame-larger-than=]
+ 821 | }
+ | ^
+cc1: all warnings being treated as errors
+
+Fix this by dynamically allocating the array.
+
+Fixes: 00e19ceec80b ("ELF: Add ELF program property parsing support")
+Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
+Cc: stable@vger.kernel.org # v5.8+
+---
+ fs/binfmt_elf.c | 32 +++++++++++++++++++++++---------
+ 1 file changed, 23 insertions(+), 9 deletions(-)
+
+--- a/fs/binfmt_elf.c
++++ b/fs/binfmt_elf.c
+@@ -768,7 +768,7 @@ static int parse_elf_properties(struct f
+ {
+ union {
+ struct elf_note nhdr;
+- char data[NOTE_DATA_SZ];
++ char *data;
+ } note;
+ loff_t pos;
+ ssize_t n;
+@@ -788,26 +788,38 @@ static int parse_elf_properties(struct f
+ if (phdr->p_filesz > sizeof(note))
+ return -ENOEXEC;
+
++ note.data = kcalloc(NOTE_DATA_SZ, sizeof(*note.data), GFP_KERNEL);
++ if (!note.data)
++ return -ENOMEM;
++
+ pos = phdr->p_offset;
+ n = kernel_read(f, &note, phdr->p_filesz, &pos);
+
+ BUILD_BUG_ON(sizeof(note) < sizeof(note.nhdr) + NOTE_NAME_SZ);
+- if (n < 0 || n < sizeof(note.nhdr) + NOTE_NAME_SZ)
+- return -EIO;
++ if (n < 0 || n < sizeof(note.nhdr) + NOTE_NAME_SZ) {
++ ret = -EIO;
++ goto exit;
++ }
+
+ if (note.nhdr.n_type != NT_GNU_PROPERTY_TYPE_0 ||
+ note.nhdr.n_namesz != NOTE_NAME_SZ ||
+ strncmp(note.data + sizeof(note.nhdr),
+- GNU_PROPERTY_TYPE_0_NAME, n - sizeof(note.nhdr)))
+- return -ENOEXEC;
++ GNU_PROPERTY_TYPE_0_NAME, n - sizeof(note.nhdr))) {
++ ret = -ENOEXEC;
++ goto exit;
++ }
+
+ off = round_up(sizeof(note.nhdr) + NOTE_NAME_SZ,
+ ELF_GNU_PROPERTY_ALIGN);
+- if (off > n)
+- return -ENOEXEC;
+-
+- if (note.nhdr.n_descsz > n - off)
+- return -ENOEXEC;
++ if (off > n) {
++ ret = -ENOEXEC;
++ goto exit;
++ }
++
++ if (note.nhdr.n_descsz > n - off) {
++ ret = -ENOEXEC;
++ goto exit;
++ }
+ datasz = off + note.nhdr.n_descsz;
+
+ have_prev_type = false;
+@@ -817,6 +829,8 @@ static int parse_elf_properties(struct f
+ have_prev_type = true;
+ } while (!ret);
+
++exit:
++ kfree(note.data);
+ return ret == -ENOENT ? 0 : ret;
+ }
+