Skip to contentSkip to conversation

net: off by one in inet6_pton()

PATCH In review Dan Carpenter 3 participants 3 messages Apr 13, 2017 – Apr 20, 2017

Subsystems (4)
Networking Network drivers Block layer Kernel janitors
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 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 <[email protected]>

---
This one goes through Jens' tree not through net-dev.

net/core/utils.c +1 -1
index da1089ea5389..93066bd0305a 100644
@@ -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);
#1 lore raw
Quoted 2 lines · Dan Carpenter

If "scope_len" is sizeof(scope_id) then we would put the NUL terminator one space beyond the end of the buffer.

Added, thanks Dan.

Signature · 1 line
Jens Axboe