ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am cc451785: Fix incorrectly sized buffer.

Browse source 
* commit 'cc451785fe4426566f6c4a6a5156d4fb40bcc22d':
  Fix incorrectly sized buffer.
This commit is contained in:
Erik Kline 2015-07-28 10:08:17 +00:00 • committed by Android Git Automerger
commit 9c298f820a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libsysutils/src/NetlinkEvent.cpp
View file

@ -463,19 +463,19 @@ bool NetlinkEvent::parseNdUserOptMessage(const struct nlmsghdr *nh) {
// Construct "SERVERS=<comma-separated string of DNS addresses>".
static const char kServerTag[] = "SERVERS=";
static const int kTagLength = strlen(kServerTag);
static const size_t kTagLength = strlen(kServerTag);
// Reserve sufficient space for an IPv6 link-local address: all but the
// last address are followed by ','; the last is followed by '\0'.
static const int kMaxSingleAddressLength =
static const size_t kMaxSingleAddressLength =
INET6_ADDRSTRLEN + strlen("%") + IFNAMSIZ + strlen(",");
const int bufsize = kTagLength + numaddrs * (INET6_ADDRSTRLEN + 1);
const size_t bufsize = kTagLength + numaddrs * kMaxSingleAddressLength;
char *buf = (char *) malloc(bufsize);
if (!buf) {
SLOGE("RDNSS option: out of memory\n");
return false;
}
strcpy(buf, kServerTag);
int pos = kTagLength;
size_t pos = kTagLength;
struct in6_addr *addrs = (struct in6_addr *) (rndss_opt + 1);
for (int i = 0; i < numaddrs; i++) {