Merge branch 'master' into net-next
This commit is contained in:
commit
0aefb9fa41
|
|
@ -172,7 +172,7 @@ static int netns_map_add(int nsid, const char *name)
|
||||||
if (netns_map_get_by_nsid(nsid) != NULL)
|
if (netns_map_get_by_nsid(nsid) != NULL)
|
||||||
return -EEXIST;
|
return -EEXIST;
|
||||||
|
|
||||||
c = malloc(sizeof(*c) + strlen(name));
|
c = malloc(sizeof(*c) + strlen(name) + 1);
|
||||||
if (c == NULL) {
|
if (c == NULL) {
|
||||||
perror("malloc");
|
perror("malloc");
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue