shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

fs-util: replace use of FILENAME_MAX by PATH_MAX in readlinkat_malloc()

Browse Source 
While we are at it, let's also add an overflow check and do other
modernizations.
This commit is contained in:
Lennart Poettering 2021-03-08 22:43:50 +01:00
parent 932401fd61
commit db22003233
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/basic/fs-util.c
View File

@ -135,34 +135,34 @@ int rename_noreplace(int olddirfd, const char *oldpath, int newdirfd, const char
}
int readlinkat_malloc(int fd, const char *p, char **ret) {
size_t l = FILENAME_MAX+1;
int r;
size_t l = PATH_MAX;
assert(p);
assert(ret);
for (;;) {
char *c;
_cleanup_free_ char *c = NULL;
ssize_t n;
c = new(char, l);
c = new(char, l+1);
if (!c)
return -ENOMEM;
n = readlinkat(fd, p, c, l-1);
if (n < 0) {
r = -errno;
free(c);
return r;
}
n = readlinkat(fd, p, c, l);
if (n < 0)
return -errno;
if ((size_t) n < l-1) {
if ((size_t) n < l) {
c[n] = 0;
*ret = c;
*ret = TAKE_PTR(c);
return 0;
}
free(c);
if (l > (SSIZE_MAX-1)/2) /* readlinkat() returns an ssize_t, and we want an extra byte for a
* trailing NUL, hence do an overflow check relative to SSIZE_MAX-1
* here */
return -EFBIG;
l *= 2;
}
}