Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

torvalds · torvalds · commit 77a73eecd47c · 2020-04-06T08:38:52.000-07:00
Pull vfs pathwalk fix from Al Viro:
 "Dumb braino in legitimize_path()..."

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix a braino in legitimize_path()
diff --git a/fs/namei.c b/fs/namei.c
@@ -610,7 +610,7 @@ static bool __legitimize_path(struct path *path, unsigned seq, unsigned mseq)
 static inline bool legitimize_path(struct nameidata *nd,
 			    struct path *path, unsigned seq)
 {
-	return __legitimize_path(path, nd->m_seq, seq);
+	return __legitimize_path(path, seq, nd->m_seq);
 }
 
 static bool legitimize_links(struct nameidata *nd)

Original file line number	Diff line number	Diff line change
`@@ -610,7 +610,7 @@ static bool __legitimize_path(struct path *path, unsigned seq, unsigned mseq)`
`610`	`610`	`static inline bool legitimize_path(struct nameidata *nd,`
`611`	`611`	`struct path *path, unsigned seq)`
`612`	`612`	`{`
`613`		`- return __legitimize_path(path, nd->m_seq, seq);`
	`613`	`+ return __legitimize_path(path, seq, nd->m_seq);`
`614`	`614`	`}`
`615`	`615`
`616`	`616`	`static bool legitimize_links(struct nameidata *nd)`