From: Jesper Juhl Date: Mon, 30 Sep 2013 20:44:37 +0000 (+0200) Subject: staging: lustre: Don't leak 'buffer' in cfs_get_environ() X-Git-Tag: firefly_0821_release~176^2~5057^2~551 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b20204310ad18516146264830bc7b840b6052d57;p=firefly-linux-kernel-4.4.55.git staging: lustre: Don't leak 'buffer' in cfs_get_environ() If 'down_read_trylock' fails we'll curently leak the memory allocated to 'buffer'. Fix the leak by simply kfree'ing 'buffer' before returning '-EDEADLK'. Signed-off-by: Jesper Juhl Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.c index 6a26c6664f88..0bf8e5d87f1a 100644 --- a/drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.c +++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.c @@ -227,8 +227,10 @@ int cfs_get_environ(const char *key, char *value, int *val_len) * which is already holding mmap_sem for writes. If some other * thread gets the write lock in the meantime, this thread will * block, but at least it won't deadlock on itself. LU-1735 */ - if (down_read_trylock(&mm->mmap_sem) == 0) + if (down_read_trylock(&mm->mmap_sem) == 0) { + kfree(buffer); return -EDEADLK; + } up_read(&mm->mmap_sem); addr = mm->env_start;