mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-01 11:36:49 +00:00
e3b120f682
Added patch:
generic/backport-5.15/430-v6.3-udf-Allocate-name-buffer-in-directory-iterator-on-he.patch
This patch fixes the following compile warning:
```
CC [M] fs/udf/namei.o
fs/udf/namei.c: In function 'udf_rename':
fs/udf/namei.c:878:1: error: the frame size of 1144 bytes is larger than 1024 bytes [-Werror=frame-larger-than=]
878 | }
| ^
cc1: all warnings being treated as errors
make[7]: *** [scripts/Makefile.build:289: fs/udf/namei.o] Error 1
```
Link: https://github.com/openwrt/openwrt/pull/16882
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
96 lines
3.0 KiB
Diff
96 lines
3.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jan Kara <jack@suse.cz>
|
|
Date: Tue, 20 Dec 2022 12:38:45 +0100
|
|
Subject: udf: Allocate name buffer in directory iterator on heap
|
|
|
|
commit 0aba4860b0d0216a1a300484ff536171894d49d8 upstream.
|
|
|
|
Currently we allocate name buffer in directory iterators (struct
|
|
udf_fileident_iter) on stack. These structures are relatively large
|
|
(some 360 bytes on 64-bit architectures). For udf_rename() which needs
|
|
to keep three of these structures in parallel the stack usage becomes
|
|
rather heavy - 1536 bytes in total. Allocate the name buffer in the
|
|
iterator from heap to avoid excessive stack usage.
|
|
|
|
Link: https://lore.kernel.org/all/202212200558.lK9x1KW0-lkp@intel.com
|
|
Reported-by: kernel test robot <lkp@intel.com>
|
|
Signed-off-by: Jan Kara <jack@suse.cz>
|
|
[Add extra include linux/slab.h]
|
|
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
---
|
|
fs/udf/directory.c | 24 ++++++++++++++++--------
|
|
fs/udf/udfdecl.h | 2 +-
|
|
2 files changed, 17 insertions(+), 9 deletions(-)
|
|
|
|
--- a/fs/udf/directory.c
|
|
+++ b/fs/udf/directory.c
|
|
@@ -19,6 +19,7 @@
|
|
#include <linux/bio.h>
|
|
#include <linux/crc-itu-t.h>
|
|
#include <linux/iversion.h>
|
|
+#include <linux/slab.h>
|
|
|
|
static int udf_verify_fi(struct udf_fileident_iter *iter)
|
|
{
|
|
@@ -248,9 +249,14 @@ int udf_fiiter_init(struct udf_fileident
|
|
iter->elen = 0;
|
|
iter->epos.bh = NULL;
|
|
iter->name = NULL;
|
|
+ iter->namebuf = kmalloc(UDF_NAME_LEN_CS0, GFP_KERNEL);
|
|
+ if (!iter->namebuf)
|
|
+ return -ENOMEM;
|
|
|
|
- if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB)
|
|
- return udf_copy_fi(iter);
|
|
+ if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) {
|
|
+ err = udf_copy_fi(iter);
|
|
+ goto out;
|
|
+ }
|
|
|
|
if (inode_bmap(dir, iter->pos >> dir->i_blkbits, &iter->epos,
|
|
&iter->eloc, &iter->elen, &iter->loffset) !=
|
|
@@ -260,17 +266,17 @@ int udf_fiiter_init(struct udf_fileident
|
|
udf_err(dir->i_sb,
|
|
"position %llu not allocated in directory (ino %lu)\n",
|
|
(unsigned long long)pos, dir->i_ino);
|
|
- return -EFSCORRUPTED;
|
|
+ err = -EFSCORRUPTED;
|
|
+ goto out;
|
|
}
|
|
err = udf_fiiter_load_bhs(iter);
|
|
if (err < 0)
|
|
- return err;
|
|
+ goto out;
|
|
err = udf_copy_fi(iter);
|
|
- if (err < 0) {
|
|
+out:
|
|
+ if (err < 0)
|
|
udf_fiiter_release(iter);
|
|
- return err;
|
|
- }
|
|
- return 0;
|
|
+ return err;
|
|
}
|
|
|
|
int udf_fiiter_advance(struct udf_fileident_iter *iter)
|
|
@@ -307,6 +313,8 @@ void udf_fiiter_release(struct udf_filei
|
|
brelse(iter->bh[0]);
|
|
brelse(iter->bh[1]);
|
|
iter->bh[0] = iter->bh[1] = NULL;
|
|
+ kfree(iter->namebuf);
|
|
+ iter->namebuf = NULL;
|
|
}
|
|
|
|
static void udf_copy_to_bufs(void *buf1, int len1, void *buf2, int len2,
|
|
--- a/fs/udf/udfdecl.h
|
|
+++ b/fs/udf/udfdecl.h
|
|
@@ -99,7 +99,7 @@ struct udf_fileident_iter {
|
|
struct extent_position epos; /* Position after the above extent */
|
|
struct fileIdentDesc fi; /* Copied directory entry */
|
|
uint8_t *name; /* Pointer to entry name */
|
|
- uint8_t namebuf[UDF_NAME_LEN_CS0]; /* Storage for entry name in case
|
|
+ uint8_t *namebuf; /* Storage for entry name in case
|
|
* the name is split between two blocks
|
|
*/
|
|
};
|