p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

d_path: prepend_path() is unlikely to return non-zero 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2021-05-16 20:19:06 -04:00
parent 008673ff74
commit cf4febc1ad
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/d_path.c
View File

@ -187,7 +187,7 @@ char *__d_path(const struct path *path,
DECLARE_BUFFER(b, buf, buflen); DECLARE_BUFFER(b, buf, buflen);
prepend(&b, "", 1); prepend(&b, "", 1);
if (prepend_path(path, root, &b) > 0) if (unlikely(prepend_path(path, root, &b) > 0))
return NULL; return NULL;
return extract_string(&b); return extract_string(&b);
} }
@ -199,7 +199,7 @@ char *d_absolute_path(const struct path *path,
DECLARE_BUFFER(b, buf, buflen); DECLARE_BUFFER(b, buf, buflen);
prepend(&b, "", 1); prepend(&b, "", 1);
if (prepend_path(path, &root, &b) > 1) if (unlikely(prepend_path(path, &root, &b) > 1))
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
return extract_string(&b); return extract_string(&b);
} }
@ -396,7 +396,7 @@ SYSCALL_DEFINE2(getcwd, char __user *, buf, unsigned long, size)
DECLARE_BUFFER(b, page, PATH_MAX); DECLARE_BUFFER(b, page, PATH_MAX);
prepend(&b, "", 1); prepend(&b, "", 1);
if (prepend_path(&pwd, &root, &b) > 0) if (unlikely(prepend_path(&pwd, &root, &b) > 0))
prepend(&b, "(unreachable)", 13); prepend(&b, "(unreachable)", 13);
rcu_read_unlock(); rcu_read_unlock();