kernel/relay.c: fix memleak on destroy relay channel
PATCH 1/1 kernel/relay.c: fix memleak on destroy relay channel
kmemleak report memory leak as follows:
unreferenced object 0x607ee4e5f948 (size 8):
comm "syz-executor.1", pid 2098, jiffies 4295031601 (age 288.468s) hex dump (first 8 bytes):
00 00 00 00 00 00 00 00 ........
backtrace:
[<00000000ca1de2fa>] relay_open kernel/relay.c:583 [inline] [<00000000ca1de2fa>] relay_open+0xb6/0x970 kernel/relay.c:563 [<0000000038ae5a4b>] do_blk_trace_setup+0x4a8/0xb20 kernel/trace/blktrace.c:557 [<00000000d5e778e9>] __blk_trace_setup+0xb6/0x150 kernel/trace/blktrace.c:597 [<0000000038fdf803>] blk_trace_ioctl+0x146/0x280 kernel/trace/blktrace.c:738 [<00000000ce25a0ca>] blkdev_ioctl+0xb2/0x6a0 block/ioctl.c:613 [<00000000579e47e0>] block_ioctl+0xe5/0x120 fs/block_dev.c:1871 [<00000000b1588c11>] vfs_ioctl fs/ioctl.c:48 [inline] [<00000000b1588c11>] __do_sys_ioctl fs/ioctl.c:753 [inline] [<00000000b1588c11>] __se_sys_ioctl fs/ioctl.c:739 [inline] [<00000000b1588c11>] __x64_sys_ioctl+0x170/0x1ce fs/ioctl.c:739 [<0000000088fc9942>] do_syscall_64+0x33/0x40 arch/x86/entry/common.c:46 [<000000004f6dd57a>] entry_SYSCALL_64_after_hwframe+0x44/0xa9
'chan->buf' is malloced in relay_open() by alloc_percpu() but not free while destroy the relay channel. Fix it by adding free_percpu() before return from relay_destroy_channel().
--- kernel/relay.c | 1 + 1 file changed, 1 insertion(+)
kernel/relay.c +1 -0
@@ -197,6 +197,7 @@ static struct rchan_buf *relay_create_buf(struct rchan *chan)static void relay_destroy_channel (struct kref *kref) { struct rchan *chan = container_of(kref, struct rchan, kref); +free_percpu (chan->buf);kfree (chan); }
Signature · 1 line
2.25.1
Quoting Wei Yongjun (2020-08-17 13:28:26)
Quoted 37 lines
kmemleak report memory leak as follows:
unreferenced object
0x607ee4e5f948(size 8):
comm "syz-executor.1", pid 2098, jiffies 4295031601 (age 288.468s) hex dump (first 8 bytes):
00 00 00 00 00 00 00 00 ........
backtrace:[<00000000ca1de2fa>] relay_open kernel/relay.c:583 [inline] [<00000000ca1de2fa>] relay_open+0xb6/0x970 kernel/relay.c:563 [<0000000038ae5a4b>] do_blk_trace_setup+0x4a8/0xb20 kernel/trace/blktrace.c:557 [<00000000d5e778e9>] __blk_trace_setup+0xb6/0x150 kernel/trace/blktrace.c:597 [<0000000038fdf803>] blk_trace_ioctl+0x146/0x280 kernel/trace/blktrace.c:738 [<00000000ce25a0ca>] blkdev_ioctl+0xb2/0x6a0 block/ioctl.c:613 [<00000000579e47e0>] block_ioctl+0xe5/0x120 fs/block_dev.c:1871 [<00000000b1588c11>] vfs_ioctl fs/ioctl.c:48 [inline] [<00000000b1588c11>] __do_sys_ioctl fs/ioctl.c:753 [inline] [<00000000b1588c11>] __se_sys_ioctl fs/ioctl.c:739 [inline] [<00000000b1588c11>] __x64_sys_ioctl+0x170/0x1ce fs/ioctl.c:739 [<0000000088fc9942>] do_syscall_64+0x33/0x40 arch/x86/entry/common.c:46 [<000000004f6dd57a>] entry_SYSCALL_64_after_hwframe+0x44/0xa9'
chan->buf' is malloced inrelay_open()byalloc_percpu()but not free while destroy the relay channel. Fix it by addingfree_percpu()before return fromrelay_destroy_channel().Fixes 017c59c042d0 ("relay: Use per CPU constructs for the relay channel buffer pointers")Reported-by Hulk Robot <[email protected]>Signed-off-by Wei Yongjun <[email protected]>--- kernel/relay.c | 1 + 1 file changed, 1 insertion(+)kernel/relay.c +0
-0
kernel/relay.c static struct rchan_buf *relay_create_buf(struct rchan *chan) · line 201
Quoted 5 lines
kernel/relay.c +1
-0@@ -197,6 +197,7 @@ static struct rchan_buf *relay_create_buf(struct rchan *chan)static void relay_destroy_channel (struct kref *kref) { struct rchan *chan = container_of(kref, struct rchan, kref); +free_percpu (chan->buf);kfree (chan);
That catches the error path for relay_open as well, and the fixes is correct. Worth a cc:stable, #v4.9+?
-Chris