Attachment 270011 Details for Bug 401551 – Patch that adds extra validity checks to nfs_readdir_lookup.

[patch] Patch that adds extra validity checks to nfs_readdir_lookup.

linux-2.6-nfs-readdir-lookup.patch (text/plain), 1.42 KB, created by Fabio Olive Leite on 2007-11-27 18:17:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fabio Olive Leite

Created: 2007-11-27 18:17:27 UTC

Size: 1.42 KB

patch

obsolete

>--- linux-2.6.9/fs/nfs/dir.c.orig	2007-11-20 11:48:50.000000000 -0500
>+++ linux-2.6.9/fs/nfs/dir.c	2007-11-20 12:22:06.000000000 -0500
>@@ -1087,8 +1087,29 @@ static struct dentry *nfs_readdir_lookup
> 	}
> 	name.hash = full_name_hash(name.name, name.len);
> 	dentry = d_lookup(parent, &name);
>-	if (dentry != NULL)
>-		return dentry;
>+	if (dentry != NULL) {
>+		/* Is this a positive dentry that matches the readdir info? */
>+		if (dentry->d_inode != NULL &&
>+				(NFS_FILEID(dentry->d_inode) == entry->ino ||
>+				d_mountpoint(dentry))) {
>+			if (!desc->plus || entry->fh->size == 0)
>+				return dentry;
>+			if (nfs_compare_fh(NFS_FH(dentry->d_inode),
>+						entry->fh) == 0)
>+				goto out_renew;
>+		}
>+		/* No, so d_drop to allow one to be created */
>+		/* But first, log some data about the dentry found */
>+		dfprintk(VFS, "%s: dropping stale %s dentry!\n",
>+			__FUNCTION__,
>+			(dentry->d_inode == NULL) ? "negative" : "positive");
>+		dfprintk(VFS, "  dentry: %lx name: %s\n", dentry, name.name);
>+		dfprintk(VFS, "  parent: %lx name: %s\n", parent,
>+			parent->d_name.name);
>+		d_drop(dentry);
>+		dput(dentry);
>+	}
>+
> 	if (!desc->plus || !(entry->fattr->valid & NFS_ATTR_FATTR))
> 		return NULL;
> 	/* Note: caller is already holding the dir->i_sem! */
>@@ -1109,6 +1130,7 @@ static struct dentry *nfs_readdir_lookup
> 		dentry = alias;
> 	}
> 	nfs_renew_times(dentry);
>+out_renew:
> 	nfs_set_verifier(dentry, nfs_save_change_attribute(dir));
> 	return dentry;
> }

Actions: View | Diff

Attachments on bug 401551: 270011