Baokun Li
455f4a2349
jffs2: fix memory leak in jffs2_scan_medium
...
commit 9cdd3128874f5fe759e2c4e1360ab7fb96a8d1df upstream.
If an error is returned in jffs2_scan_eraseblock() and some memory
has been added to the jffs2_summary *s, we can observe the following
kmemleak report:
--------------------------------------------
unreferenced object 0xffff88812b889c40 (size 64):
comm "mount", pid 692, jiffies 4294838325 (age 34.288s)
hex dump (first 32 bytes):
40 48 b5 14 81 88 ff ff 01 e0 31 00 00 00 50 00 @H........1...P.
00 00 01 00 00 00 01 00 00 00 02 00 00 00 09 08 ................
backtrace:
[<ffffffffae93a3a3>] __kmalloc+0x613/0x910
[<ffffffffaf423b9c>] jffs2_sum_add_dirent_mem+0x5c/0xa0
[<ffffffffb0f3afa8>] jffs2_scan_medium.cold+0x36e5/0x4794
[<ffffffffb0f3dbe1>] jffs2_do_mount_fs.cold+0xa7/0x2267
[<ffffffffaf40acf3>] jffs2_do_fill_super+0x383/0xc30
[<ffffffffaf40c00a>] jffs2_fill_super+0x2ea/0x4c0
[<ffffffffb0315d64>] mtd_get_sb+0x254/0x400
[<ffffffffb0315f5f>] mtd_get_sb_by_nr+0x4f/0xd0
[<ffffffffb0316478>] get_tree_mtd+0x498/0x840
[<ffffffffaf40bd15>] jffs2_get_tree+0x25/0x30
[<ffffffffae9f358d>] vfs_get_tree+0x8d/0x2e0
[<ffffffffaea7a98f>] path_mount+0x50f/0x1e50
[<ffffffffaea7c3d7>] do_mount+0x107/0x130
[<ffffffffaea7c5c5>] __se_sys_mount+0x1c5/0x2f0
[<ffffffffaea7c917>] __x64_sys_mount+0xc7/0x160
[<ffffffffb10142f5>] do_syscall_64+0x45/0x70
unreferenced object 0xffff888114b54840 (size 32):
comm "mount", pid 692, jiffies 4294838325 (age 34.288s)
hex dump (first 32 bytes):
c0 75 b5 14 81 88 ff ff 02 e0 02 00 00 00 02 00 .u..............
00 00 84 00 00 00 44 00 00 00 6b 6b 6b 6b 6b a5 ......D...kkkkk.
backtrace:
[<ffffffffae93be24>] kmem_cache_alloc_trace+0x584/0x880
[<ffffffffaf423b04>] jffs2_sum_add_inode_mem+0x54/0x90
[<ffffffffb0f3bd44>] jffs2_scan_medium.cold+0x4481/0x4794
[...]
unreferenced object 0xffff888114b57280 (size 32):
comm "mount", pid 692, jiffies 4294838393 (age 34.357s)
hex dump (first 32 bytes):
10 d5 6c 11 81 88 ff ff 08 e0 05 00 00 00 01 00 ..l.............
00 00 38 02 00 00 28 00 00 00 6b 6b 6b 6b 6b a5 ..8...(...kkkkk.
backtrace:
[<ffffffffae93be24>] kmem_cache_alloc_trace+0x584/0x880
[<ffffffffaf423c34>] jffs2_sum_add_xattr_mem+0x54/0x90
[<ffffffffb0f3a24f>] jffs2_scan_medium.cold+0x298c/0x4794
[...]
unreferenced object 0xffff8881116cd510 (size 16):
comm "mount", pid 692, jiffies 4294838395 (age 34.355s)
hex dump (first 16 bytes):
00 00 00 00 00 00 00 00 09 e0 60 02 00 00 6b a5 ..........`...k.
backtrace:
[<ffffffffae93be24>] kmem_cache_alloc_trace+0x584/0x880
[<ffffffffaf423cc4>] jffs2_sum_add_xref_mem+0x54/0x90
[<ffffffffb0f3b2e3>] jffs2_scan_medium.cold+0x3a20/0x4794
[...]
--------------------------------------------
Therefore, we should call jffs2_sum_reset_collected(s) on exit to
release the memory added in s. In addition, a new tag "out_buf" is
added to prevent the NULL pointer reference caused by s being NULL.
(thanks to Zhang Yi for this analysis)
Fixes: e631ddba5887 ("[JFFS2] Add erase block summary support (mount time improvement)")
Cc: stable@vger.kernel.org
Co-developed-with: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: Baokun Li <libaokun1@huawei.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2022-04-15 14:17:59 +02:00
..
2020-11-05 11:43:34 +01:00
2021-03-04 10:26:48 +01:00
2021-09-30 10:09:22 +02:00
2019-10-25 00:03:11 -04:00
2019-08-30 07:27:17 -07:00
2021-01-06 14:48:39 +01:00
2022-03-08 19:07:50 +01:00
2020-11-05 11:43:36 +01:00
2021-10-27 09:54:27 +02:00
2022-03-08 19:07:45 +01:00
2019-09-19 09:42:37 -07:00
2022-03-02 11:41:10 +01:00
2019-11-23 21:44:49 -05:00
2021-09-12 08:56:38 +02:00
2022-01-27 09:19:36 +01:00
2022-02-01 17:24:34 +01:00
2022-01-27 09:19:40 +01:00
2021-05-26 12:05:19 +02:00
2020-12-02 08:49:53 +01:00
2019-08-30 07:27:17 -07:00
2021-11-21 13:38:51 +01:00
2019-11-10 11:56:05 -05:00
2021-10-09 14:39:49 +02:00
2022-03-16 13:21:48 +01:00
2022-04-15 14:17:59 +02:00
2020-06-17 16:40:36 +02:00
2019-08-30 07:27:17 -07:00
2021-09-22 12:26:25 +02:00
2022-03-16 13:21:47 +01:00
2021-12-08 09:01:08 +01:00
2021-07-31 08:19:38 +02:00
2021-05-19 10:08:29 +02:00
2021-04-14 08:24:14 +02:00
2019-08-30 08:11:25 -07:00
2021-07-28 13:31:01 +02:00
2021-09-15 09:47:35 +02:00
2021-11-12 14:43:03 +01:00
2020-11-18 19:20:30 +01:00
2022-04-15 14:17:59 +02:00
2021-11-17 09:48:42 +01:00
2020-08-19 08:16:12 +02:00
2021-09-22 12:26:34 +02:00
2020-08-21 13:05:37 +02:00
2022-02-23 11:59:59 +01:00
2020-12-30 11:51:22 +01:00
2022-04-15 14:17:59 +02:00
2021-09-26 14:07:13 +02:00
2020-06-17 16:40:24 +02:00
2021-12-14 14:48:58 +01:00
2022-03-23 09:12:06 +01:00
2019-08-30 08:11:25 -07:00
2022-01-20 09:19:17 +01:00
2021-12-22 09:29:40 +01:00
2021-12-01 09:23:31 +01:00
2021-03-04 10:26:45 +01:00
2021-09-30 10:09:26 +02:00
2019-08-30 07:27:17 -07:00
2022-02-23 11:59:55 +01:00
2020-10-29 09:57:53 +01:00
2021-08-12 13:21:05 +02:00
2020-08-26 10:40:51 +02:00
2021-05-19 10:08:29 +02:00
2021-03-07 12:20:48 +01:00
2019-08-30 07:27:18 -07:00
2022-03-02 11:41:13 +01:00
2022-01-27 09:19:49 +01:00
2022-02-01 17:24:34 +01:00
2020-08-21 13:05:37 +02:00
2019-09-17 11:48:24 -04:00
2021-10-06 15:42:30 +02:00
2022-01-11 15:23:32 +01:00
2021-12-14 14:49:02 +01:00
2020-02-11 04:35:12 -08:00
2021-10-06 15:42:35 +02:00
2020-09-03 11:26:39 +02:00
2021-03-17 17:03:57 +01:00
2021-05-22 11:38:29 +02:00
2020-11-05 11:43:24 +01:00
2020-01-14 20:08:18 +01:00
2020-01-09 10:20:05 +01:00
2020-12-11 13:23:30 +01:00
2020-10-29 09:57:45 +01:00
2021-07-14 16:53:25 +02:00
2020-10-01 13:17:19 +02:00
2021-04-14 08:24:11 +02:00
2020-01-12 12:21:37 +01:00
2020-02-11 04:35:37 -08:00
2020-10-07 08:01:31 +02:00
2021-10-27 09:54:27 +02:00
2021-09-15 09:47:28 +02:00
2019-08-19 11:00:39 -04:00
2022-03-02 11:41:18 +01:00
2020-04-17 10:50:21 +02:00
2022-02-08 18:24:29 +01:00
2019-09-12 21:06:14 -04:00
2021-07-14 16:53:35 +02:00
2020-03-25 08:25:58 +01:00
2021-07-31 08:19:37 +02:00
2021-01-30 13:54:10 +01:00
2019-12-17 19:55:30 +01:00
2019-09-18 16:59:14 -07:00
2020-11-24 13:29:19 +01:00
2020-03-25 08:25:41 +01:00
2019-09-18 16:59:14 -07:00
2020-01-17 19:48:21 +01:00
2022-02-01 17:24:39 +01:00
2021-08-26 08:36:22 -04:00
2020-03-18 07:17:51 +01:00
2021-08-12 13:21:02 +02:00
2020-05-02 08:48:44 +02:00
2021-03-17 17:03:33 +01:00
2019-09-06 21:28:49 +02:00
2020-02-11 04:35:23 -08:00
2021-04-21 12:56:16 +02:00
2022-01-29 10:25:11 +01:00
2021-07-20 16:10:54 +02:00
2021-12-14 14:49:02 +01:00
2019-12-17 19:56:52 +01:00
2019-10-03 14:21:35 -07:00
2022-02-23 11:59:55 +01:00
2021-09-22 12:26:26 +02:00
2020-02-11 04:35:12 -08:00
2020-08-11 15:33:39 +02:00