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

d_path: don't bother with return value of prepend() 

Only simple_dname() checks it, and there we can simply do those
calls and check for overflow (by looking of negative buflen)
in the end.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2021-05-17 22:05:23 -04:00
parent a0378fb9b3
commit d8548232ea
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/d_path.c
View File

@ -8,14 +8,13 @@
#include <linux/prefetch.h> #include <linux/prefetch.h>
#include "mount.h" #include "mount.h"
static int prepend(char **buffer, int *buflen, const char *str, int namelen) static void prepend(char **buffer, int *buflen, const char *str, int namelen)
{ {
*buflen -= namelen; *buflen -= namelen;
if (*buflen < 0) if (likely(*buflen >= 0)) {
return -ENAMETOOLONG; *buffer -= namelen;
*buffer -= namelen; memcpy(*buffer, str, namelen);
memcpy(*buffer, str, namelen); }
return 0;
} }
/** /**
@ -298,11 +297,10 @@ char *simple_dname(struct dentry *dentry, char *buffer, int buflen)
{ {
char *end = buffer + buflen; char *end = buffer + buflen;
/* these dentries are never renamed, so d_lock is not needed */ /* these dentries are never renamed, so d_lock is not needed */
if (prepend(&end, &buflen, " (deleted)", 11) || prepend(&end, &buflen, " (deleted)", 11);
prepend(&end, &buflen, dentry->d_name.name, dentry->d_name.len) || prepend(&end, &buflen, dentry->d_name.name, dentry->d_name.len);
prepend(&end, &buflen, "/", 1)) prepend(&end, &buflen, "/", 1);
end = ERR_PTR(-ENAMETOOLONG); return buflen >= 0 ? end : ERR_PTR(-ENAMETOOLONG);
return end;
} }
/* /*