diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-10 15:00:47 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-10 15:00:47 (GMT) |
commit | 9557c3cfdaa792c7db04b86f47b5dd1e6dc5ec4f (patch) | |
tree | 7e3ec6a4ae1417c417156978f3bb792842ef04f0 /kernel | |
parent | 147d9e7bcad3b8d5465f6eea6292731e7f35dee8 (diff) | |
parent | 18aba41cbfbcd138e9f6d8d446427d8b7691c194 (diff) | |
download | linux-9557c3cfdaa792c7db04b86f47b5dd1e6dc5ec4f.tar.xz |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"7 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm/fadvise.c: do not discard partial pages with POSIX_FADV_DONTNEED
mm: introduce dedicated WQ_MEM_RECLAIM workqueue to do lru_add_drain_all
kernel/relay.c: fix potential memory leak
mm: thp: broken page count after commit aa88b68c3b1d
revert "mm: memcontrol: fix possible css ref leak on oom"
kasan: change memory hot-add error messages to info messages
mm/hugetlb: fix huge page reserve accounting for private mappings
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/relay.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/relay.c b/kernel/relay.c index 074994b..04d7cf3 100644 --- a/kernel/relay.c +++ b/kernel/relay.c @@ -614,6 +614,7 @@ free_bufs: kref_put(&chan->kref, relay_destroy_channel); mutex_unlock(&relay_channels_mutex); + kfree(chan); return NULL; } EXPORT_SYMBOL_GPL(relay_open); |