From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 13 Dec 2007 05:16:59 +0000 (-0800)
Subject: 2.6.22 patch added
X-Git-Tag: v2.6.23.10~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=329006bb1652e05a03eeeff468fea114cb596afd;p=thirdparty%2Fkernel%2Fstable-queue.git

2.6.22 patch added
---

diff --git a/queue-2.6.22/knfsd-validate-filehandle-type-in-fsid_source.patch b/queue-2.6.22/knfsd-validate-filehandle-type-in-fsid_source.patch
new file mode 100644
index 00000000000..dcf1fee45f4
--- /dev/null
+++ b/queue-2.6.22/knfsd-validate-filehandle-type-in-fsid_source.patch
@@ -0,0 +1,62 @@
+From b8da0d1c27f144bce999c653467106f3f0d5a308 Mon Sep 17 00:00:00 2001
+From: Neil Brown <neilb@suse.de>
+Date: Wed, 5 Sep 2007 17:22:13 -0400
+Subject: knfsd: Validate filehandle type in fsid_source
+Message-ID: <6101e8c40712021314l74838974idc3e895c2d9c50e5@mail.gmail.com>
+
+From: Neil Brown <neilb@suse.de>
+
+patch b8da0d1c27f144bce999c653467106f3f0d5a308 in mainline.
+
+fsid_source decided where to get the 'fsid' number to
+return for a GETATTR based on the type of filehandle.
+It can be from the device, from the fsid, or from the
+UUID.
+
+It is possible for the filehandle to be inconsistent
+with the export information, so make sure the export information
+actually has the info implied by the value returned by
+fsid_source.
+
+Signed-off-by: Neil Brown <neilb@suse.de>
+Cc: "Luiz Fernando N. Capitulino" <lcapitulino@gmail.com>
+Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Oliver Pintr <oliver.pntr@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ fs/nfsd/nfsfh.c |   20 +++++++++++++++-----
+ 1 file changed, 15 insertions(+), 5 deletions(-)
+
+--- a/fs/nfsd/nfsfh.c
++++ b/fs/nfsd/nfsfh.c
+@@ -565,13 +565,23 @@ enum fsid_source fsid_source(struct svc_
+ 	case FSID_DEV:
+ 	case FSID_ENCODE_DEV:
+ 	case FSID_MAJOR_MINOR:
+-		return FSIDSOURCE_DEV;
++		if (fhp->fh_export->ex_dentry->d_inode->i_sb->s_type->fs_flags
++		    & FS_REQUIRES_DEV)
++			return FSIDSOURCE_DEV;
++		break;
+ 	case FSID_NUM:
+-		return FSIDSOURCE_FSID;
+-	default:
+ 		if (fhp->fh_export->ex_flags & NFSEXP_FSID)
+ 			return FSIDSOURCE_FSID;
+-		else
+-			return FSIDSOURCE_UUID;
++		break;
++	default:
++		break;
+ 	}
++	/* either a UUID type filehandle, or the filehandle doesn't
++	 * match the export.
++	 */
++	if (fhp->fh_export->ex_flags & NFSEXP_FSID)
++		return FSIDSOURCE_FSID;
++	if (fhp->fh_export->ex_uuid)
++		return FSIDSOURCE_UUID;
++	return FSIDSOURCE_DEV;
+ }
diff --git a/queue-2.6.22/series b/queue-2.6.22/series
index e4014d260d9..b9308addc34 100644
--- a/queue-2.6.22/series
+++ b/queue-2.6.22/series
@@ -27,3 +27,4 @@ rxrpc-add-missing-select-on-crypto.patch
 ipv6-restore-ipv6-when-mtu-is-big-enough.patch
 decnet-dn_nl_deladdr-almost-always-returns-no-error.patch
 bridge-lost-call-to-br_fdb_fini-in-br_init-error-path.patch
+knfsd-validate-filehandle-type-in-fsid_source.patch