Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba413ab2 authored by Jim Meyering's avatar Jim Meyering Committed by Eric Van Hensbergen
Browse files

fs/9p: avoid debug OOPS when reading a long symlink 



Reading a symlink longer than the given buffer, a p9_debug use would
try to print the link name (not NUL-terminated) using a %s format.
Use %.*s instead, and replace the strncpy+strnlen with functionally
equivalent strlen+memcpy.

Signed-off-by: default avatarJim Meyering <meyering@redhat.com>
Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
parent 4cbe5a55

fs/9p/vfs_inode.c

+4 −4
Original line number Diff line number Diff line
@@ -1276,12 +1276,12 @@ static int v9fs_readlink(struct dentry *dentry, char *buffer, int buflen) 
	}



	/* copy extension buffer into buffer */

	strncpy(buffer, st->extension, buflen);

	retval = min(strlen(st->extension)+1, (size_t)buflen);

	memcpy(buffer, st->extension, retval);



	p9_debug(P9_DEBUG_VFS, "%s -> %s (%s)\n",

		 dentry->d_name.name, st->extension, buffer);

	p9_debug(P9_DEBUG_VFS, "%s -> %s (%.*s)\n",

		 dentry->d_name.name, st->extension, buflen, buffer);



	retval = strnlen(buffer, buflen);

done:

	p9stat_free(st);

	kfree(st);