Commit 33217379 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux 

* 'for-2.6.28' of git://linux-nfs.org/~bfields/linux:
  nfsd: clean up expkey_parse error cases
  nfsd: Drop reference in expkey_parse error cases
  nfsd: Fix memory leak in nfsd_getxattr
  NFSD: Fix BUG during NFSD shutdown processing
parents feeedc6c 30bc4dfd

fs/nfsd/export.c

+10 −9
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen) 
	int fsidtype;

	char *ep;

	struct svc_expkey key;

	struct svc_expkey *ek;

	struct svc_expkey *ek = NULL;



	if (mesg[mlen-1] != '\n')

		return -EINVAL;
@@ -107,7 +107,8 @@ static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen) 


	buf = kmalloc(PAGE_SIZE, GFP_KERNEL);

	err = -ENOMEM;

	if (!buf) goto out;

	if (!buf)

		goto out;



	err = -EINVAL;

	if ((len=qword_get(&mesg, buf, PAGE_SIZE)) <= 0)
@@ -151,16 +152,16 @@ static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen) 


	/* now we want a pathname, or empty meaning NEGATIVE  */

	err = -EINVAL;

	if ((len=qword_get(&mesg, buf, PAGE_SIZE)) < 0)

	len = qword_get(&mesg, buf, PAGE_SIZE);

	if (len < 0)

		goto out;

	dprintk("Path seems to be <%s>\n", buf);

	err = 0;

	if (len == 0) {

		set_bit(CACHE_NEGATIVE, &key.h.flags);

		ek = svc_expkey_update(&key, ek);

		if (ek)

			cache_put(&ek->h, &svc_expkey_cache);

		else err = -ENOMEM;

		if (!ek)

			err = -ENOMEM;

	} else {

		struct nameidata nd;

		err = path_lookup(buf, 0, &nd);
@@ -171,14 +172,14 @@ static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen) 
		key.ek_path = nd.path;



		ek = svc_expkey_update(&key, ek);

		if (ek)

			cache_put(&ek->h, &svc_expkey_cache);

		else

		if (!ek)

			err = -ENOMEM;

		path_put(&nd.path);

	}

	cache_flush();

 out:

	if (ek)

		cache_put(&ek->h, &svc_expkey_cache);

	if (dom)

		auth_domain_put(dom);

	kfree(buf);

fs/nfsd/nfssvc.c

+4 −0
Original line number Diff line number Diff line
@@ -249,6 +249,10 @@ static int nfsd_init_socks(int port) 
	if (error < 0)

		return error;



	error = lockd_up();

	if (error < 0)

		return error;



	error = svc_create_xprt(nfsd_serv, "tcp", port,

					SVC_SOCK_DEFAULTS);

	if (error < 0)

fs/nfsd/vfs.c

+5 −1
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap, 
static ssize_t nfsd_getxattr(struct dentry *dentry, char *key, void **buf)

{

	ssize_t buflen;

	ssize_t ret;



	buflen = vfs_getxattr(dentry, key, NULL, 0);

	if (buflen <= 0)
@@ -419,7 +420,10 @@ static ssize_t nfsd_getxattr(struct dentry *dentry, char *key, void **buf) 
	if (!*buf)

		return -ENOMEM;



	return vfs_getxattr(dentry, key, *buf, buflen);

	ret = vfs_getxattr(dentry, key, *buf, buflen);

	if (ret < 0)

		kfree(*buf);

	return ret;

}

#endif