aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-06-10 08:00:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-06-10 08:00:47 -0700
commit9557c3cfdaa792c7db04b86f47b5dd1e6dc5ec4f (patch)
tree7e3ec6a4ae1417c417156978f3bb792842ef04f0 /kernel
parentMerge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma (diff)
parentmm/fadvise.c: do not discard partial pages with POSIX_FADV_DONTNEED (diff)
downloadlinux-dev-9557c3cfdaa792c7db04b86f47b5dd1e6dc5ec4f.tar.xz
linux-dev-9557c3cfdaa792c7db04b86f47b5dd1e6dc5ec4f.zip
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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/relay.c b/kernel/relay.c
index 074994bcfa9b..04d7cf3ef8cf 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);