diff options
author | Stefan Hajnoczi <stefanha@redhat.com> | 2016-02-18 19:55:54 +0100 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2016-02-23 19:20:16 +0100 |
commit | b7052cd7bcf3c1478796e93e3dff2b44c9e82943 (patch) | |
tree | 2264d2685b4de8bd3807e80bdafac468265acf5e /net/sunrpc | |
parent | Linux 4.5-rc4 (diff) | |
download | linux-b7052cd7bcf3c1478796e93e3dff2b44c9e82943.tar.xz linux-b7052cd7bcf3c1478796e93e3dff2b44c9e82943.zip |
sunrpc/cache: fix off-by-one in qword_get()
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>
Cc: stable@vger.kernel.org
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'net/sunrpc')
-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 2b32fd602669..273bc3a35425 100644 --- a/net/sunrpc/cache.c +++ b/net/sunrpc/cache.c @@ -1225,7 +1225,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]); |