linux-kernel - Re: [patch] nfsd: clean up mnt_want

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20080701192429.GE23080@fieldses.org>
Date:	Tue, 1 Jul 2008 15:24:29 -0400
From:	"J. Bruce Fields" <bfields@...ldses.org>
To:	Miklos Szeredi <miklos@...redi.hu>
Cc:	akpm@...ux-foundation.org, linux-kernel@...r.kernel.org,
	linux-fsdevel@...r.kernel.org, hch@...radead.org
Subject: Re: [patch] nfsd: clean up mnt_want_write calls

On Tue, Jul 01, 2008 at 03:38:35PM +0200, Miklos Szeredi wrote:
> From: Miklos Szeredi <mszeredi@...e.cz>
> 
> Multiple mnt_want_write() calls in the switch statement looks really
> ugly.

Looks right to me; applied for 2.6.27; thanks, Miklos!

--b.

> 
> Signed-off-by: Miklos Szeredi <mszeredi@...e.cz>
> Acked-by: Christoph Hellwig <hch@...radead.org>
> ---
>  fs/nfsd/vfs.c |   25 +++++++++++--------------
>  1 file changed, 11 insertions(+), 14 deletions(-)
> 
> Index: linux-2.6/fs/nfsd/vfs.c
> ===================================================================
> --- linux-2.6.orig/fs/nfsd/vfs.c	2008-06-13 13:26:49.000000000 +0200
> +++ linux-2.6/fs/nfsd/vfs.c	2008-06-13 13:26:52.000000000 +0200
> @@ -1248,36 +1248,34 @@ nfsd_create(struct svc_rqst *rqstp, stru
>  		iap->ia_mode = 0;
>  	iap->ia_mode = (iap->ia_mode & S_IALLUGO) | type;
>  
> +	err = nfserr_inval;
> +	if (!S_ISREG(type) && !S_ISDIR(type) && !special_file(type)) {
> +		printk(KERN_WARNING "nfsd: bad file type %o in nfsd_create\n",
> +		       type);
> +		goto out;
> +	}
> +
> +	host_err = mnt_want_write(fhp->fh_export->ex_path.mnt);
> +	if (host_err)
> +		goto out_nfserr;
> +
>  	/*
>  	 * Get the dir op function pointer.
>  	 */
>  	err = 0;
>  	switch (type) {
>  	case S_IFREG:
> -		host_err = mnt_want_write(fhp->fh_export->ex_path.mnt);
> -		if (host_err)
> -			goto out_nfserr;
>  		host_err = vfs_create(dirp, dchild, iap->ia_mode, NULL);
>  		break;
>  	case S_IFDIR:
> -		host_err = mnt_want_write(fhp->fh_export->ex_path.mnt);
> -		if (host_err)
> -			goto out_nfserr;
>  		host_err = vfs_mkdir(dirp, dchild, iap->ia_mode);
>  		break;
>  	case S_IFCHR:
>  	case S_IFBLK:
>  	case S_IFIFO:
>  	case S_IFSOCK:
> -		host_err = mnt_want_write(fhp->fh_export->ex_path.mnt);
> -		if (host_err)
> -			goto out_nfserr;
>  		host_err = vfs_mknod(dirp, dchild, iap->ia_mode, rdev);
>  		break;
> -	default:
> -	        printk("nfsd: bad file type %o in nfsd_create\n", type);
> -		host_err = -EINVAL;
> -		goto out_nfserr;
>  	}
>  	if (host_err < 0) {
>  		mnt_drop_write(fhp->fh_export->ex_path.mnt);
> @@ -1289,7 +1287,6 @@ nfsd_create(struct svc_rqst *rqstp, stru
>  		write_inode_now(dchild->d_inode, 1);
>  	}
>  
> -
>  	err2 = nfsd_create_setattr(rqstp, resfhp, iap);
>  	if (err2)
>  		err = err2;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/