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