diff options
| author |   Zhihao Cheng <chengzhihao1@huawei.com> | 2020-06-16 15:11:44 +0800 |
|---|---|---|
| committer |   Richard Weinberger <richard@nod.at> | 2020-12-13 22:12:32 +0100 |
| commit | a33e30a0e023e9d1866866ca895c7789f48445e7 (patch) | |
| tree | 383b2fd9b04365a17ed31c4b624d278cf8e23607 /fs/ubifs/commit.c | |
| parent | Revert "ubifs: Fix out-of-bounds memory access caused by abnormal value of node_len" (diff) | |
| download | linux-rng-a33e30a0e023e9d1866866ca895c7789f48445e7.tar.xz linux-rng-a33e30a0e023e9d1866866ca895c7789f48445e7.zip | |
ubifs: Pass node length in all node dumping callers
Function ubifs_dump_node() has been modified to avoid memory oob
accessing while dumping node, node length (corresponding to the
size of allocated memory for node) should be passed into all node
dumping callers.
Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'fs/ubifs/commit.c')
| -rw-r--r-- | fs/ubifs/commit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ubifs/commit.c b/fs/ubifs/commit.c index b5cdac9b0368..c4fc1047fc07 100644 --- a/fs/ubifs/commit.c +++ b/fs/ubifs/commit.c @@ -701,13 +701,13 @@ out: out_dump: ubifs_err(c, "dumping index node (iip=%d)", i->iip); - ubifs_dump_node(c, idx); + ubifs_dump_node(c, idx, ubifs_idx_node_sz(c, c->fanout)); list_del(&i->list); kfree(i); if (!list_empty(&list)) { i = list_entry(list.prev, struct idx_node, list); ubifs_err(c, "dumping parent index node"); - ubifs_dump_node(c, &i->idx); + ubifs_dump_node(c, &i->idx, ubifs_idx_node_sz(c, c->fanout)); } out_free: while (!list_empty(&list)) { |