Merge branch 'master' into net-next

This commit is contained in:
Stephen Hemminger 2016-02-17 17:36:17 -08:00
commit 0aefb9fa41
1 changed files with 1 additions and 1 deletions

View File

@ -172,7 +172,7 @@ static int netns_map_add(int nsid, const char *name)
if (netns_map_get_by_nsid(nsid) != NULL)
return -EEXIST;
c = malloc(sizeof(*c) + strlen(name));
c = malloc(sizeof(*c) + strlen(name) + 1);
if (c == NULL) {
perror("malloc");
return -ENOMEM;