From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933315AbZKFWrf (ORCPT ); Fri, 6 Nov 2009 17:47:35 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760071AbZKFWWX (ORCPT ); Fri, 6 Nov 2009 17:22:23 -0500 Received: from kroah.org ([198.145.64.141]:56633 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759986AbZKFWWV (ORCPT ); Fri, 6 Nov 2009 17:22:21 -0500 X-Mailbox-Line: From gregkh@mini.kroah.org Fri Nov 6 14:15:39 2009 Message-Id: <20091106221539.517497730@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Fri, 06 Nov 2009 14:14:04 -0800 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Ingo Molnar , Trond Myklebust Subject: [06/99] nfs: Fix nfs_parse_mount_options() kfree() leak References: <20091106221358.309857998@mini.kroah.org> Content-Disposition: inline; filename=nfs-fix-nfs_parse_mount_options-kfree-leak.patch In-Reply-To: <20091106221850.GA15408@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.31-stable review patch. If anyone has any objections, please let us know. ------------------ From: Yinghai Lu 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 Reported-by: Pekka Enberg Signed-off-by: Ingo Molnar Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- fs/nfs/super.c | 1 + 1 file changed, 1 insertion(+) --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -1323,6 +1323,7 @@ static int nfs_parse_mount_options(char default: dfprintk(MOUNT, "NFS: unrecognized " "transport protocol\n"); + kfree(string); return 0; } break;