diff options
author | Stefan Hajnoczi <stefanha@redhat.com> | 2016-02-18 21:55:54 +0300 |
---|---|---|
committer | Jiri Slaby <jslaby@suse.cz> | 2016-03-03 14:46:07 +0300 |
commit | 6e234db52528f10632aa37c17e7bc164192c16f1 (patch) | |
tree | a35d326db5b8a818e2a5d7a954c8767a00757713 | |
parent | b16ad9e9cf5fe5f4eac472d60db935fce212a78e (diff) | |
download | linux-6e234db52528f10632aa37c17e7bc164192c16f1.tar.xz |
sunrpc/cache: fix off-by-one in qword_get()
commit b7052cd7bcf3c1478796e93e3dff2b44c9e82943 upstream.
The qword_get() function NUL-terminates its output buffer. If the input
string is in hex format \xXXXX... and the same length as the output
buffer, there is an off-by-one:
int qword_get(char **bpp, char *dest, int bufsize)
{
...
while (len < bufsize) {
...
*dest++ = (h << 4) | l;
len++;
}
...
*dest = '\0';
return len;
}
This patch ensures the NUL terminator doesn't fall outside the output
buffer.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-rw-r--r-- | net/sunrpc/cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c index 8a6e3b0d25d4..f3e2b7d8f325 100644 --- a/net/sunrpc/cache.c +++ b/net/sunrpc/cache.c @@ -1232,7 +1232,7 @@ int qword_get(char **bpp, char *dest, int bufsize) if (bp[0] == '\\' && bp[1] == 'x') { /* HEX STRING */ bp += 2; - while (len < bufsize) { + while (len < bufsize - 1) { int h, l; h = hex_to_bin(bp[0]); |