Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

torvalds · torvalds · commit 01183609ab61 · 2015-08-01T17:42:14.000-07:00
Pull VFS fix from Al Viro:
 "Spurious ENOTDIR fix"

This should fix the problems reported by Dominique Martinet and Hugh
Dickins.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  link_path_walk(): be careful when failing with ENOTDIR
diff --git a/fs/namei.c b/fs/namei.c
@@ -1954,8 +1954,13 @@ static int link_path_walk(const char *name, struct nameidata *nd)
 				continue;
 			}
 		}
-		if (unlikely(!d_can_lookup(nd->path.dentry)))
+		if (unlikely(!d_can_lookup(nd->path.dentry))) {
+			if (nd->flags & LOOKUP_RCU) {
+				if (unlazy_walk(nd, NULL, 0))
+					return -ECHILD;
+			}
 			return -ENOTDIR;
+		}
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1954,8 +1954,13 @@ static int link_path_walk(const char name, struct nameidata nd)`
`1954`	`1954`	`continue;`
`1955`	`1955`	`}`
`1956`	`1956`	`}`
`1957`		`- if (unlikely(!d_can_lookup(nd->path.dentry)))`
	`1957`	`+ if (unlikely(!d_can_lookup(nd->path.dentry))) {`
	`1958`	`+ if (nd->flags & LOOKUP_RCU) {`
	`1959`	`+ if (unlazy_walk(nd, NULL, 0))`
	`1960`	`+ return -ECHILD;`
	`1961`	`+ }`
`1958`	`1962`	`return -ENOTDIR;`
	`1963`	`+ }`
`1959`	`1964`	`}`
`1960`	`1965`	`}`
`1961`	`1966`