summaryrefslogtreecommitdiffstats
path: root/fs/dcache.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-01-26 12:37:55 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2014-01-26 12:37:55 -0500
commitf6500801522c61782d4990fa1ad96154cb397cd4 (patch)
tree681441a4ea0e816d49145c89c63645c677d12ce1 /fs/dcache.c
parenta8323da0366d3398eda62741d2ac1130c8a172ed (diff)
downloadblackbird-op-linux-f6500801522c61782d4990fa1ad96154cb397cd4.tar.gz
blackbird-op-linux-f6500801522c61782d4990fa1ad96154cb397cd4.zip
__dentry_path() fixes
* we need to save the starting point for restarts * reject pathologically short buffers outright Spotted-by: Denys Vlasenko <dvlasenk@redhat.com> Spotted-by: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/dcache.c')
-rw-r--r--fs/dcache.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/dcache.c b/fs/dcache.c
index fdbe23027810..265e0ce9769c 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -3116,19 +3116,22 @@ char *simple_dname(struct dentry *dentry, char *buffer, int buflen)
/*
* Write full pathname from the root of the filesystem into the buffer.
*/
-static char *__dentry_path(struct dentry *dentry, char *buf, int buflen)
+static char *__dentry_path(struct dentry *d, char *buf, int buflen)
{
+ struct dentry *dentry;
char *end, *retval;
int len, seq = 0;
int error = 0;
+ if (buflen < 2)
+ goto Elong;
+
rcu_read_lock();
restart:
+ dentry = d;
end = buf + buflen;
len = buflen;
prepend(&end, &len, "\0", 1);
- if (buflen < 1)
- goto Elong;
/* Get '/' right */
retval = end-1;
*retval = '/';
OpenPOWER on IntegriCloud