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

torvalds · torvalds · commit b20078fd69a3 · 2021-10-24T09:36:06.000-10:00
Pull autofs fix from Al Viro:
 "Fix for a braino of mine (in getting rid of open-coded
  dentry_path_raw() in autofs a couple of cycles ago).

  Mea culpa...  Obvious -stable fodder"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  autofs: fix wait name hash calculation in autofs_wait()
diff --git a/fs/autofs/waitq.c b/fs/autofs/waitq.c
@@ -358,7 +358,7 @@ int autofs_wait(struct autofs_sb_info *sbi,
 		qstr.len = strlen(p);
 		offset = p - name;
 	}
-	qstr.hash = full_name_hash(dentry, name, qstr.len);
+	qstr.hash = full_name_hash(dentry, qstr.name, qstr.len);
 
 	if (mutex_lock_interruptible(&sbi->wq_mutex)) {
 		kfree(name);

Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ int autofs_wait(struct autofs_sb_info *sbi,`
`358`	`358`	`qstr.len = strlen(p);`
`359`	`359`	`offset = p - name;`
`360`	`360`	`}`
`361`		`- qstr.hash = full_name_hash(dentry, name, qstr.len);`
	`361`	`+ qstr.hash = full_name_hash(dentry, qstr.name, qstr.len);`
`362`	`362`
`363`	`363`	`if (mutex_lock_interruptible(&sbi->wq_mutex)) {`
`364`	`364`	`kfree(name);`