diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2017-04-13 15:42:31 -0400 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2017-04-14 16:08:54 -0400 |
commit | a88086e09876f468356cfec5319ff62004e36a1b (patch) | |
tree | 3d4a3827e09b99da4c0a55b2a4d3d3b65aaebbd0 | |
parent | 00e043936e9a1c274c29366c7ecd9e17c79418e6 (diff) |
net: off by one in inet6_pton()
If "scope_len" is sizeof(scope_id) then we would put the NUL terminator
one space beyond the end of the buffer.
Fixes: b1a951fe469e ("net/utils: generic inet_pton_with_scope helper")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r-- | net/core/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/utils.c b/net/core/utils.c index f96cf527bb8f..32c467cf52d6 100644 --- a/net/core/utils.c +++ b/net/core/utils.c | |||
@@ -339,7 +339,7 @@ static int inet6_pton(struct net *net, const char *src, u16 port_num, | |||
339 | src + srclen != scope_delim && *scope_delim == '%') { | 339 | src + srclen != scope_delim && *scope_delim == '%') { |
340 | struct net_device *dev; | 340 | struct net_device *dev; |
341 | char scope_id[16]; | 341 | char scope_id[16]; |
342 | size_t scope_len = min_t(size_t, sizeof(scope_id), | 342 | size_t scope_len = min_t(size_t, sizeof(scope_id) - 1, |
343 | src + srclen - scope_delim - 1); | 343 | src + srclen - scope_delim - 1); |
344 | 344 | ||
345 | memcpy(scope_id, scope_delim + 1, scope_len); | 345 | memcpy(scope_id, scope_delim + 1, scope_len); |