summaryrefslogtreecommitdiff
path: root/fs/nfs
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2009-10-20 14:13:46 +0900
committerGreg Kroah-Hartman <gregkh@suse.de>2009-11-09 16:21:48 -0800
commit9c367e53d2780b5131baecd1874835ce8ddc4ed0 (patch)
tree3b99b182aa2ef1feb0528c5a5557bb889348a6f5 /fs/nfs
parent7613217197c8927891e554c1734c1c417b22672b (diff)
nfs: Fix nfs_parse_mount_options() kfree() leak
commit 4223a4a155f245d41c350ed9eba4fc32e965c4da upstream. Fix a (small) memory leak in one of the error paths of the NFS mount options parsing code. Regression introduced in 2.6.30 by commit a67d18f (NFS: load the rpc/rdma transport module automatically). Reported-by: Yinghai Lu <yinghai@kernel.org> Reported-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/super.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 0b4cbdc60abd..832a24397b28 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1323,6 +1323,7 @@ static int nfs_parse_mount_options(char *raw,
default:
dfprintk(MOUNT, "NFS: unrecognized "
"transport protocol\n");
+ kfree(string);
return 0;
}
break;