Perform the check for trailing slashes right in the fastpath check and
don't bother with any additional work.
Signed-off-by: Christian Brauner <brauner@xxxxxxxxxx>
---
fs/namei.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index 745415fcda57..08eb9a53beb7 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3618,6 +3618,9 @@ static struct dentry *lookup_fast_for_open(struct nameidata *nd, int open_flag)
struct dentry *dentry;
if (open_flag & O_CREAT) {
+ if (trailing_slashes(nd))
+ return ERR_PTR(-EISDIR);
+
/* Don't bother on an O_EXCL create */
if (open_flag & O_EXCL)
return NULL;
@@ -3684,20 +3687,13 @@ static const char *open_last_lookups(struct nameidata *nd,
bool unlazied;
/* can stay in rcuwalk if not auditing */
- if (dentry && audit_dummy_context()) {
- if (trailing_slashes(nd))
- return ERR_PTR(-EISDIR);
+ if (dentry && audit_dummy_context())
goto finish_lookup;
- }
unlazied = dentry ? try_to_unlazy_next(nd, dentry) :
try_to_unlazy(nd);
if (!unlazied)
return ERR_PTR(-ECHILD);
}
- if (trailing_slashes(nd)) {
- dput(dentry);
- return ERR_PTR(-EISDIR);
- }
if (dentry)
goto finish_lookup;
}
--
2.43.0
--37h7k3p7s7sj3yhb
Content-Type: text/x-diff; charset=utf-8
Content-Disposition: attachment;
filename="0003-fs-remove-audit-dummy-context-check.patch"
