mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-30 22:05:19 +00:00
Code Issues Releases Wiki Activity

netdev-dpdk: Consistently use xstrdup() instead of strdup().

Browse Source 
This avoids a segmentation fault in case of memory allocation failure.

Found by inspection.

Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Aaron Conole <aconole@redhat.com>
This commit is contained in:
Ben Pfaff
2016-01-11 15:04:08 -08:00
parent 8ea171aba0
commit 0d4af148a3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/netdev-dpdk.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2015 Nicira, Inc.
* Copyright (c) 2014, 2015, 2016 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -2126,7 +2126,7 @@ process_vhost_flags(char *flag, char *default_val, int size,
*/
if (!strcmp(argv[1], flag) && (strlen(argv[2]) <= size)) {
changed = 1;
*new_val = strdup(argv[2]);
*new_val = xstrdup(argv[2]);
VLOG_INFO("User-provided %s in use: %s", flag, *new_val);
} else {
VLOG_INFO("No %s provided - defaulting to %s", flag, default_val);
@@ -2159,10 +2159,10 @@ dpdk_init(int argc, char **argv)
}
#ifdef VHOST_CUSE
if (process_vhost_flags("-cuse_dev_name", strdup("vhost-net"),
if (process_vhost_flags("-cuse_dev_name", xstrdup("vhost-net"),
PATH_MAX, argv, &cuse_dev_name)) {
#else
if (process_vhost_flags("-vhost_sock_dir", strdup(ovs_rundir()),
if (process_vhost_flags("-vhost_sock_dir", xstrdup(ovs_rundir()),
NAME_MAX, argv, &vhost_sock_dir)) {
struct stat s;
int err;