[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20170413194231.GD591@mwanda>
Date: Thu, 13 Apr 2017 22:42:31 +0300
From: Dan Carpenter <dan.carpenter@...cle.com>
To: "David S. Miller" <davem@...emloft.net>, Jens Axboe <axboe@...com>,
Sagi Grimberg <sagi@...mberg.me>
Cc: Wei Tang <tangwei@...s.chinamobile.com>,
Alexey Dobriyan <adobriyan@...il.com>, netdev@...r.kernel.org,
linux-block@...r.kernel.org, kernel-janitors@...r.kernel.org
Subject: [PATCH block-tree] 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@...cle.com>
---
This one goes through Jens' tree not through net-dev.
diff --git a/net/core/utils.c b/net/core/utils.c
index da1089ea5389..93066bd0305a 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,
src + srclen != scope_delim && *scope_delim == '%') {
struct net_device *dev;
char scope_id[16];
- size_t scope_len = min_t(size_t, sizeof(scope_id),
+ size_t scope_len = min_t(size_t, sizeof(scope_id) - 1,
src + srclen - scope_delim - 1);
memcpy(scope_id, scope_delim + 1, scope_len);
Powered by blists - more mailing lists