Baokun Li
51dbb5e36d
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-08 14:39:52 +02:00
..
2022-01-20 09:17:50 +01:00
2020-10-24 12:26:05 -07:00
2021-03-04 11:38:37 +01:00
2021-09-30 10:11:01 +02:00
2020-10-16 11:11:22 -07:00
2020-09-18 16:45:50 -04:00
2021-01-06 14:56:52 +01:00
2022-03-08 19:09:38 +01:00
2021-03-30 14:32:07 +02:00
2022-02-01 17:25:39 +01:00
2022-03-08 19:09:29 +01:00
2022-03-02 11:42:52 +01:00
2020-09-18 16:45:50 -04:00
2021-11-18 14:03:54 +01:00
2022-01-27 10:54:02 +01:00
2022-02-01 17:25:39 +01:00
2022-01-27 10:54:10 +01:00
2021-05-26 12:06:55 +02:00
2020-11-25 16:55:02 +01:00
2020-09-18 16:45:50 -04:00
2021-12-01 09:19:05 +01:00
2022-03-28 09:57:07 +02:00
2021-10-09 14:40:56 +02:00
2022-03-16 14:16:03 +01:00
2022-04-08 14:39:51 +02:00
2020-09-18 16:45:50 -04:00
2021-09-18 13:40:15 +02:00
2022-03-16 14:16:01 +01:00
2021-12-08 09:03:18 +01:00
2021-07-31 08:16:12 +02:00
2021-05-19 10:13:10 +02:00
2021-04-14 08:42:06 +02:00
2020-09-18 16:45:50 -04:00
2021-07-28 14:35:46 +02:00
2021-09-30 10:11:04 +02:00
2021-11-12 14:58:33 +01:00
2022-02-01 17:25:41 +01:00
2022-04-08 14:39:52 +02:00
2021-11-18 14:04:15 +01:00
2021-01-27 11:55:29 +01:00
2021-09-18 13:40:30 +02:00
2020-09-18 16:45:50 -04:00
2022-02-23 12:01:05 +01:00
2020-12-30 11:53:45 +01:00
2022-04-08 14:39:51 +02:00
2021-09-26 14:09:01 +02:00
2022-02-05 12:37:56 +01:00
2021-07-14 16:55:38 +02:00
2022-03-23 09:13:27 +01:00
2020-09-22 23:39:45 -04:00
2022-01-20 09:17:50 +01:00
2021-12-22 09:30:58 +01:00
2022-02-23 12:00:56 +01:00
2021-07-14 16:56:12 +02:00
2021-09-30 10:11:08 +02:00
2020-09-18 16:45:50 -04:00
2022-02-23 12:00:59 +01:00
2020-10-16 11:11:22 -07:00
2021-08-12 13:22:19 +02:00
2020-10-24 12:26:05 -07:00
2021-05-19 10:13:10 +02:00
2020-10-02 12:02:30 +02:00
2020-09-18 16:45:50 -04:00
2022-03-02 11:42:54 +01:00
2022-01-27 10:54:24 +01:00
2022-02-01 17:25:39 +01:00
2020-10-24 12:26:05 -07:00
2020-09-10 14:03:31 -07:00
2021-10-17 10:43:33 +02:00
2021-10-06 15:55:46 +02:00
2022-01-11 15:25:01 +01:00
2021-12-22 09:30:57 +01:00
2021-12-14 11:32:40 +01:00
2020-10-16 11:11:21 -07:00
2021-10-06 15:55:59 +02:00
2020-08-24 08:49:13 +10:00
2021-03-17 17:06:35 +01:00
2021-06-03 09:00:45 +02:00
2020-10-18 09:27:09 -07:00
2021-09-26 14:08:56 +02:00
2020-10-14 14:54:45 -07:00
2021-07-14 16:56:13 +02:00
2020-07-29 16:14:27 +02:00
2021-04-14 08:41:58 +02:00
2021-05-11 14:47:12 +02:00
2021-09-08 08:49:00 +02:00
2021-09-15 09:50:27 +02:00
2020-10-17 15:05:30 -06:00
2022-02-23 12:00:56 +01:00
2022-02-08 18:30:36 +01:00
2020-10-13 18:38:27 -07:00
2020-07-29 16:14:27 +02:00
2021-07-14 16:56:31 +02:00
2020-08-23 17:36:59 -05:00
2020-08-04 21:02:38 -04:00
2021-11-26 10:39:22 +01:00
2021-07-31 08:16:11 +02:00
2022-03-19 13:44:46 +01:00
2021-09-18 13:40:06 +02:00
2021-02-13 13:54:56 +01:00
2020-07-31 08:16:01 +02:00
2021-02-17 11:02:21 +01:00
2021-10-27 09:56:51 +02:00
2020-11-22 10:48:22 -08:00
2021-03-20 10:43:44 +01:00
2020-10-23 11:33:41 -07:00
2022-02-01 17:25:48 +01:00
2021-08-26 08:35:57 -04:00
2021-07-14 16:55:59 +02:00
2022-03-16 14:16:02 +01:00
2021-03-17 17:06:13 +01:00
2020-12-30 11:54:02 +01:00
2020-10-23 11:33:41 -07:00
2021-04-21 13:00:54 +02:00
2020-10-15 09:48:49 -07:00
2022-01-29 10:26:11 +01:00
2021-07-20 16:05:59 +02:00
2021-12-14 11:32:40 +01:00
2020-10-24 12:40:18 -07:00
2021-05-11 14:47:33 +02:00
2020-08-27 16:06:47 -04:00
2022-02-23 12:00:59 +01:00
2021-10-27 09:56:51 +02:00
2020-07-31 08:16:01 +02:00
2020-10-13 18:38:27 -07:00