Skip to contentSkip to conversation

Patch "kcm: fix /proc memory leak" has been added to the 4.6-stable tree

PATCH [email protected] 1 participant 1 message Jul 6, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

kcm: fix /proc memory leak

to the 4.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
kcm-fix-proc-memory-leak.patch
and it can be found in the queue-4.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Wed Jul 6 16:50:56 PDT 2016

From: Jiri Slaby <[email protected]>
Date: Mon, 20 Jun 2016 11:36:28 +0200
Subject: kcm: fix /proc memory leak

From: Jiri Slaby <[email protected]>

[ Upstream commit d19af0a76444fde629667ecb823c0ee28f9f67d8 ]

Every open of /proc/net/kcm leaks 16 bytes of memory as is reported by kmemleak:
unreferenced object 0xffff88059c0e3458 (size 192):
comm "cat", pid 1401, jiffies 4294935742 (age 310.720s) hex dump (first 32 bytes):

    28 45 71 96 05 88 ff ff 00 10 00 00 00 00 00 00  (Eq.............
    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
  backtrace:
    [<ffffffff8156a2de>] kmem_cache_alloc_trace+0x16e/0x230
    [<ffffffff8162a479>] seq_open+0x79/0x1d0
    [<ffffffffa0578510>] kcm_seq_open+0x0/0x30 [kcm]
    [<ffffffff8162a479>] seq_open+0x79/0x1d0
    [<ffffffff8162a8cf>] __seq_open_private+0x2f/0xa0
    [<ffffffff81712548>] seq_open_net+0x38/0xa0

...

It is caused by a missing free in the ->release path. So fix it by providing seq_release_net as the ->release method.

Fixes cd6e111bf5 (kcm: Add statistics and proc interfaces)
Cc "David S. Miller" <[email protected]>
Cc Tom Herbert <[email protected]>
---
 net/kcm/kcmproc.c |    1 +
 1 file changed, 1 insertion(+)
net/kcm/kcmproc.c +1 -0
@@ -241,6 +241,7 @@ static const struct file_operations kcm_
 	.open		= kcm_seq_open,
 	.read		= seq_read,
 	.llseek		= seq_lseek,
+	.release	= seq_release_net,
 };
 
 static struct kcm_seq_muxinfo kcm_seq_muxinfo = {

Patches currently in stable-queue which might be from [email protected] are

queue-4.6/kcm-fix-proc-memory-leak.patch