From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754545Ab1HRB0W (ORCPT ); Wed, 17 Aug 2011 21:26:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47921 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751813Ab1HRB0U (ORCPT ); Wed, 17 Aug 2011 21:26:20 -0400 Date: Wed, 17 Aug 2011 21:29:04 -0400 From: Jeff Layton To: "J. R. Okajima" Cc: smfrench@gmail.com, linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org, kirk w Subject: Re: Q: cifs, freeing volume_info->UNCip Message-ID: <20110817212904.45b79409@corrin.poochiereds.net> In-Reply-To: <7087.1313450537@jrobl> References: <7087.1313450537@jrobl> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 16 Aug 2011 08:22:17 +0900 "J. R. Okajima" wrote: > > Hello, > > CIFS cleanup_volume_info_contents() looks like having a memory > corruption problem. > When UNCip is set to "&vol->UNC[2]" in cifs_parse_mount_options(), it > should not be kfree()-ed in cleanup_volume_info_contents(). > > If it is correct and the code in mainline is not fixed yet, then here is > a patch. > > diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c > index ccc1afa..e0ea721 100644 > --- a/fs/cifs/connect.c > +++ b/fs/cifs/connect.c > @@ -2838,7 +2838,8 @@ cleanup_volume_info_contents(struct smb_vol *volume_info) > kfree(volume_info->username); > kzfree(volume_info->password); > kfree(volume_info->UNC); > - kfree(volume_info->UNCip); > + if (volume_info->UNCip != volume_info->UNC + 2) > + kfree(volume_info->UNCip); > kfree(volume_info->domainname); > kfree(volume_info->iocharset); > kfree(volume_info->prepath); > > Looks correct, nice catch. Reviewed-by: Jeff Layton