summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2012-03-30 21:21:57 -0700
committerJeremy Allison <jra@samba.org>2012-03-31 07:59:15 +0200
commit786cb132e8f27e58e3ac90889f6ea1c997441bd6 (patch)
tree264946be0ba97023265196373ea3dab5b53e6bc6
parentefd94d159883cb0841d8ac83223a1e63098a8d72 (diff)
downloadsamba-786cb132e8f27e58e3ac90889f6ea1c997441bd6.tar.gz
samba-786cb132e8f27e58e3ac90889f6ea1c997441bd6.tar.bz2
samba-786cb132e8f27e58e3ac90889f6ea1c997441bd6.zip
Fix an IPv6 breakage I introduced by adding an strlcpy truncation check. Found by Matthieu Patou <mat@samba.org>.
The truncate of the strlcpy() here was a *desired* side effect. strlcpy()/strlcat() should never be used like that. Be more explicit about the truncation and don't use strlcpy here. Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Sat Mar 31 07:59:16 CEST 2012 on sn-devel-104
-rw-r--r--lib/util/util_net.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/util/util_net.c b/lib/util/util_net.c
index 69e5324180..36b3fcbc4a 100644
--- a/lib/util/util_net.c
+++ b/lib/util/util_net.c
@@ -107,11 +107,18 @@ static bool interpret_string_addr_pref(struct sockaddr_storage *pss,
*/
if (p && (p > str) && ((scope_id = if_nametoindex(p+1)) != 0)) {
- size_t len = MIN(PTR_DIFF(p,str)+1, sizeof(addr));
- if (strlcpy(addr, str, len) >= len) {
- /* Truncate. */
+ /* Length of string we want to copy.
+ This is IP:v6:addr (removing the %ifname).
+ */
+ size_t len = PTR_DIFF(p,str);
+
+ if (len+1 > sizeof(addr)) {
+ /* string+nul too long for array. */
return false;
}
+ memcpy(addr, str, len);
+ addr[len] = '\0';
+
str = addr;
}
}