The following commit has been merged in the linux branch: commit 4223a4a155f245d41c350ed9eba4fc32e965c4da Author: Yinghai Lu yinghai@kernel.org Date: Tue Oct 20 14:13:46 2009 +0900
nfs: Fix nfs_parse_mount_options() kfree() leak
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 Cc: stable@kernel.org Signed-off-by: Linus Torvalds torvalds@linux-foundation.org
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index a2c18ac..90be551 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -1253,6 +1253,7 @@ static int nfs_parse_mount_options(char *raw, default: dfprintk(MOUNT, "NFS: unrecognized " "transport protocol\n"); + kfree(string); return 0; } break;