Skip to content

Commit 97b67e6

Browse files
cypharbrauner
authored andcommitted
dcache: permit dynamic_dname()s up to NAME_MAX
dynamic_dname() has had an implicit limit of 64 characters since it was introduced in commit c23fbb6 ("VFS: delay the dentry name generation on sockets and pipes"), however it seems that this was a fairly arbitrary number (suspiciously it was double the previously hardcoded buffer size). NAME_MAX seems like a more reasonable and consistent limit for d_name lengths. While we're at it, we can also remove the unnecessary stack-allocated array and just memmove() the formatted string to the end of the buffer. It should also be noted that at least one driver (in particular, liveupdate's usage of anon_inode for session files) already exceeded this limit without noticing that readlink(/proc/self/fd/$n) always returns -ENAMETOOLONG, so this fixes those drivers as well. Fixes: 0153094 ("liveupdate: luo_session: add sessions support") Fixes: c23fbb6 ("VFS: delay the dentry name generation on sockets and pipes") Signed-off-by: Aleksa Sarai <aleksa@amutable.com> Link: https://patch.msgid.link/20260401-dynamic-dname-name_max-v1-1-8ca20ab2642e@amutable.com Tested-by: Luca Boccassi <luca.boccassi@gmail.com> Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent 4639f1c commit 97b67e6

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

fs/d_path.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -301,18 +301,19 @@ EXPORT_SYMBOL(d_path);
301301
char *dynamic_dname(char *buffer, int buflen, const char *fmt, ...)
302302
{
303303
va_list args;
304-
char temp[64];
304+
char *start;
305305
int sz;
306306

307307
va_start(args, fmt);
308-
sz = vsnprintf(temp, sizeof(temp), fmt, args) + 1;
308+
sz = vsnprintf(buffer, buflen, fmt, args) + 1;
309309
va_end(args);
310310

311-
if (sz > sizeof(temp) || sz > buflen)
311+
if (sz > NAME_MAX || sz > buflen)
312312
return ERR_PTR(-ENAMETOOLONG);
313313

314-
buffer += buflen - sz;
315-
return memcpy(buffer, temp, sz);
314+
/* Move the formatted d_name to the end of the buffer. */
315+
start = buffer + (buflen - sz);
316+
return memmove(start, buffer, sz);
316317
}
317318

318319
char *simple_dname(struct dentry *dentry, char *buffer, int buflen)

0 commit comments

Comments
 (0)