DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Convert os_zalloc() for an array to use os_calloc()

Browse source 
Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2012-08-13 20:44:21 +03:00
parent 64a2f2ece1
commit f9884c096a
16 changed files with 49 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hostapd/main.c
View file

@ -181,7 +181,7 @@ static struct hostapd_iface * hostapd_init(const char *config_file)
hapd_iface->conf = conf; hapd_iface->conf = conf;
hapd_iface->num_bss = conf->num_bss; hapd_iface->num_bss = conf->num_bss;
hapd_iface->bss = os_zalloc(conf->num_bss * hapd_iface->bss = os_calloc(conf->num_bss,
sizeof(struct hostapd_data *)); sizeof(struct hostapd_data *));
if (hapd_iface->bss == NULL) if (hapd_iface->bss == NULL)
goto fail; goto fail;
@ -254,7 +254,7 @@ static int hostapd_driver_init(struct hostapd_iface *iface)
params.use_pae_group_addr = hapd->conf->use_pae_group_addr; params.use_pae_group_addr = hapd->conf->use_pae_group_addr;
params.num_bridge = hapd->iface->num_bss; params.num_bridge = hapd->iface->num_bss;
params.bridge = os_zalloc(hapd->iface->num_bss * sizeof(char *)); params.bridge = os_calloc(hapd->iface->num_bss, sizeof(char *));
if (params.bridge == NULL) if (params.bridge == NULL)
return -1; return -1;
for (i = 0; i < hapd->iface->num_bss; i++) { for (i = 0; i < hapd->iface->num_bss; i++) {
@ -411,7 +411,7 @@ static int hostapd_global_init(struct hapd_interfaces *interfaces,
wpa_printf(MSG_ERROR, "No drivers enabled"); wpa_printf(MSG_ERROR, "No drivers enabled");
return -1; return -1;
} }
global.drv_priv = os_zalloc(global.drv_count * sizeof(void *)); global.drv_priv = os_calloc(global.drv_count, sizeof(void *));
if (global.drv_priv == NULL) if (global.drv_priv == NULL)
return -1; return -1;
@ -592,7 +592,7 @@ int main(int argc, char *argv[])
wpa_debug_open_file(log_file); wpa_debug_open_file(log_file);
interfaces.count = argc - optind; interfaces.count = argc - optind;
interfaces.iface = os_zalloc(interfaces.count * interfaces.iface = os_calloc(interfaces.count,
sizeof(struct hostapd_iface *)); sizeof(struct hostapd_iface *));
if (interfaces.iface == NULL) { if (interfaces.iface == NULL) {
wpa_printf(MSG_ERROR, "malloc failed"); wpa_printf(MSG_ERROR, "malloc failed");

4
src/ap/hw_features.c
View file

@ -138,7 +138,7 @@ int hostapd_prepare_rates(struct hostapd_iface *iface,
iface->num_rates = 0; iface->num_rates = 0;
iface->current_rates = iface->current_rates =
os_zalloc(mode->num_rates * sizeof(struct hostapd_rate_data)); os_calloc(mode->num_rates, sizeof(struct hostapd_rate_data));
if (!iface->current_rates) { if (!iface->current_rates) {
wpa_printf(MSG_ERROR, "Failed to allocate memory for rate " wpa_printf(MSG_ERROR, "Failed to allocate memory for rate "
"table."); "table.");
@ -470,7 +470,7 @@ static void ieee80211n_scan_channels_2g4(struct hostapd_iface *iface,
affected_start, affected_end); affected_start, affected_end);
mode = iface->current_mode; mode = iface->current_mode;
params->freqs = os_zalloc((mode->num_channels + 1) * sizeof(int)); params->freqs = os_calloc(mode->num_channels + 1, sizeof(int));
if (params->freqs == NULL) if (params->freqs == NULL)
return; return;
pos = 0; pos = 0;

2
src/ap/ieee802_1x.c
View file

@ -1205,7 +1205,7 @@ static void ieee802_1x_store_radius_class(struct hostapd_data *hapd,
if (count <= 0) if (count <= 0)
return; return;
nclass = os_zalloc(count * sizeof(struct radius_attr_data)); nclass = os_calloc(count, sizeof(struct radius_attr_data));
if (nclass == NULL) if (nclass == NULL)
return; return;

2
src/drivers/driver_ndis.c
View file

@ -858,7 +858,7 @@ static struct wpa_scan_results * wpa_driver_ndis_get_scan_results(void *priv)
os_free(b); os_free(b);
return NULL; return NULL;
} }
results->res = os_zalloc(count * sizeof(struct wpa_scan_res *)); results->res = os_calloc(count, sizeof(struct wpa_scan_res *));
if (results->res == NULL) { if (results->res == NULL) {
os_free(results); os_free(results);
os_free(b); os_free(b);

5
src/drivers/driver_nl80211.c
View file

@ -4843,7 +4843,8 @@ static int phy_info_handler(struct nl_msg *msg, void *arg)
mode->num_channels++; mode->num_channels++;
} }
mode->channels = os_zalloc(mode->num_channels * sizeof(struct hostapd_channel_data)); mode->channels = os_calloc(mode->num_channels,
sizeof(struct hostapd_channel_data));
if (!mode->channels) if (!mode->channels)
return NL_SKIP; return NL_SKIP;
@ -4905,7 +4906,7 @@ static int phy_info_handler(struct nl_msg *msg, void *arg)
mode->num_rates++; mode->num_rates++;
} }
mode->rates = os_zalloc(mode->num_rates * sizeof(int)); mode->rates = os_calloc(mode->num_rates, sizeof(int));
if (!mode->rates) if (!mode->rates)
return NL_SKIP; return NL_SKIP;

2
src/drivers/driver_privsep.c
View file

@ -152,7 +152,7 @@ wpa_driver_privsep_get_scan_results2(void *priv)
return NULL; return NULL;
} }
results->res = os_zalloc(num * sizeof(struct wpa_scan_res *)); results->res = os_calloc(num, sizeof(struct wpa_scan_res *));
if (results->res == NULL) { if (results->res == NULL) {
os_free(results); os_free(results);
os_free(buf); os_free(buf);

18
src/drivers/driver_test.c
View file

@ -1478,7 +1478,7 @@ static struct wpa_scan_results * wpa_driver_test_get_scan_results2(void *priv)
if (res == NULL) if (res == NULL)
return NULL; return NULL;
res->res = os_zalloc(drv->num_scanres * sizeof(struct wpa_scan_res *)); res->res = os_calloc(drv->num_scanres, sizeof(struct wpa_scan_res *));
if (res->res == NULL) { if (res->res == NULL) {
os_free(res); os_free(res);
return NULL; return NULL;
@ -2570,15 +2570,14 @@ wpa_driver_test_get_hw_feature_data(void *priv, u16 *num_modes, u16 *flags)
*num_modes = 3; *num_modes = 3;
*flags = 0; *flags = 0;
modes = os_zalloc(*num_modes * sizeof(struct hostapd_hw_modes)); modes = os_calloc(*num_modes, sizeof(struct hostapd_hw_modes));
if (modes == NULL) if (modes == NULL)
return NULL; return NULL;
modes[0].mode = HOSTAPD_MODE_IEEE80211G; modes[0].mode = HOSTAPD_MODE_IEEE80211G;
modes[0].num_channels = 11; modes[0].num_channels = 11;
modes[0].num_rates = 12; modes[0].num_rates = 12;
modes[0].channels = modes[0].channels = os_calloc(11, sizeof(struct hostapd_channel_data));
os_zalloc(11 * sizeof(struct hostapd_channel_data)); modes[0].rates = os_calloc(modes[0].num_rates, sizeof(int));
modes[0].rates = os_zalloc(modes[0].num_rates * sizeof(int));
if (modes[0].channels == NULL || modes[0].rates == NULL) if (modes[0].channels == NULL || modes[0].rates == NULL)
goto fail; goto fail;
for (i = 0; i < 11; i++) { for (i = 0; i < 11; i++) {
@ -2602,9 +2601,8 @@ wpa_driver_test_get_hw_feature_data(void *priv, u16 *num_modes, u16 *flags)
modes[1].mode = HOSTAPD_MODE_IEEE80211B; modes[1].mode = HOSTAPD_MODE_IEEE80211B;
modes[1].num_channels = 11; modes[1].num_channels = 11;
modes[1].num_rates = 4; modes[1].num_rates = 4;
modes[1].channels = modes[1].channels = os_calloc(11, sizeof(struct hostapd_channel_data));
os_zalloc(11 * sizeof(struct hostapd_channel_data)); modes[1].rates = os_calloc(modes[1].num_rates, sizeof(int));
modes[1].rates = os_zalloc(modes[1].num_rates * sizeof(int));
if (modes[1].channels == NULL || modes[1].rates == NULL) if (modes[1].channels == NULL || modes[1].rates == NULL)
goto fail; goto fail;
for (i = 0; i < 11; i++) { for (i = 0; i < 11; i++) {
@ -2620,8 +2618,8 @@ wpa_driver_test_get_hw_feature_data(void *priv, u16 *num_modes, u16 *flags)
modes[2].mode = HOSTAPD_MODE_IEEE80211A; modes[2].mode = HOSTAPD_MODE_IEEE80211A;
modes[2].num_channels = 1; modes[2].num_channels = 1;
modes[2].num_rates = 8; modes[2].num_rates = 8;
modes[2].channels = os_zalloc(sizeof(struct hostapd_channel_data)); modes[2].channels = os_calloc(1, sizeof(struct hostapd_channel_data));
modes[2].rates = os_zalloc(modes[2].num_rates * sizeof(int)); modes[2].rates = os_calloc(modes[2].num_rates, sizeof(int));
if (modes[2].channels == NULL || modes[2].rates == NULL) if (modes[2].channels == NULL || modes[2].rates == NULL)
goto fail; goto fail;
modes[2].channels[0].chan = 60; modes[2].channels[0].chan = 60;

6
src/radius/radius.c
View file

@ -78,8 +78,8 @@ static void radius_msg_set_hdr(struct radius_msg *msg, u8 code, u8 identifier)
static int radius_msg_initialize(struct radius_msg *msg) static int radius_msg_initialize(struct radius_msg *msg)
{ {
msg->attr_pos = msg->attr_pos = os_calloc(RADIUS_DEFAULT_ATTR_COUNT,
os_zalloc(RADIUS_DEFAULT_ATTR_COUNT * sizeof(*msg->attr_pos)); sizeof(*msg->attr_pos));
if (msg->attr_pos == NULL) if (msg->attr_pos == NULL)
return -1; return -1;
@ -1534,7 +1534,7 @@ int radius_copy_class(struct radius_class_data *dst,
if (src->attr == NULL) if (src->attr == NULL)
return 0; return 0;
dst->attr = os_zalloc(src->count * sizeof(struct radius_attr_data)); dst->attr = os_calloc(src->count, sizeof(struct radius_attr_data));
if (dst->attr == NULL) if (dst->attr == NULL)
return -1; return -1;

24
wlantest/wlantest_cli.c
View file

@ -170,7 +170,7 @@ static char ** get_bssid_list(int s)
if (bssid == NULL) if (bssid == NULL)
return NULL; return NULL;
res = os_zalloc((len / ETH_ALEN + 1) * sizeof(char *)); res = os_calloc(len / ETH_ALEN + 1, sizeof(char *));
if (res == NULL) if (res == NULL)
return NULL; return NULL;
for (i = 0; i < len / ETH_ALEN; i++) { for (i = 0; i < len / ETH_ALEN; i++) {
@ -208,7 +208,7 @@ static char ** get_sta_list(int s, const u8 *bssid, int add_bcast)
if (addr == NULL) if (addr == NULL)
return NULL; return NULL;
res = os_zalloc((len / ETH_ALEN + 1 + add_bcast) * sizeof(char *)); res = os_calloc(len / ETH_ALEN + 1 + add_bcast, sizeof(char *));
if (res == NULL) if (res == NULL)
return NULL; return NULL;
for (i = 0; i < len / ETH_ALEN; i++) { for (i = 0; i < len / ETH_ALEN; i++) {
@ -623,7 +623,7 @@ static char ** complete_get_sta_counter(int s, const char *str, int pos)
case 1: case 1:
/* counter list */ /* counter list */
count = sizeof(sta_counters) / sizeof(sta_counters[0]); count = sizeof(sta_counters) / sizeof(sta_counters[0]);
res = os_zalloc(count * sizeof(char *)); res = os_calloc(count, sizeof(char *));
if (res == NULL) if (res == NULL)
return NULL; return NULL;
for (i = 0; sta_counters[i].name; i++) { for (i = 0; sta_counters[i].name; i++) {
@ -722,7 +722,7 @@ static char ** complete_get_bss_counter(int s, const char *str, int pos)
case 1: case 1:
/* counter list */ /* counter list */
count = sizeof(bss_counters) / sizeof(bss_counters[0]); count = sizeof(bss_counters) / sizeof(bss_counters[0]);
res = os_zalloc(count * sizeof(char *)); res = os_calloc(count, sizeof(char *));
if (res == NULL) if (res == NULL)
return NULL; return NULL;
for (i = 0; bss_counters[i].name; i++) { for (i = 0; bss_counters[i].name; i++) {
@ -836,7 +836,7 @@ static char ** complete_get_tdls_counter(int s, const char *str, int pos)
case 1: case 1:
/* counter list */ /* counter list */
count = sizeof(tdls_counters) / sizeof(tdls_counters[0]); count = sizeof(tdls_counters) / sizeof(tdls_counters[0]);
res = os_zalloc(count * sizeof(char *)); res = os_calloc(count, sizeof(char *));
if (res == NULL) if (res == NULL)
return NULL; return NULL;
for (i = 0; tdls_counters[i].name; i++) { for (i = 0; tdls_counters[i].name; i++) {
@ -972,7 +972,7 @@ static char ** complete_inject(int s, const char *str, int pos)
case 1: case 1:
/* frame list */ /* frame list */
count = sizeof(inject_frames) / sizeof(inject_frames[0]); count = sizeof(inject_frames) / sizeof(inject_frames[0]);
res = os_zalloc(count * sizeof(char *)); res = os_calloc(count, sizeof(char *));
if (res == NULL) if (res == NULL)
break; break;
for (i = 0; inject_frames[i].name; i++) { for (i = 0; inject_frames[i].name; i++) {
@ -982,7 +982,7 @@ static char ** complete_inject(int s, const char *str, int pos)
} }
break; break;
case 2: case 2:
res = os_zalloc(5 * sizeof(char *)); res = os_calloc(5, sizeof(char *));
if (res == NULL) if (res == NULL)
break; break;
res[0] = os_strdup("normal"); res[0] = os_strdup("normal");
@ -999,7 +999,7 @@ static char ** complete_inject(int s, const char *str, int pos)
break; break;
break; break;
case 3: case 3:
res = os_zalloc(3 * sizeof(char *)); res = os_calloc(3, sizeof(char *));
if (res == NULL) if (res == NULL)
break; break;
res[0] = os_strdup("ap"); res[0] = os_strdup("ap");
@ -1122,7 +1122,7 @@ static char ** complete_send(int s, const char *str, int pos)
switch (arg) { switch (arg) {
case 1: case 1:
res = os_zalloc(5 * sizeof(char *)); res = os_calloc(5, sizeof(char *));
if (res == NULL) if (res == NULL)
break; break;
res[0] = os_strdup("normal"); res[0] = os_strdup("normal");
@ -1299,7 +1299,7 @@ static char ** complete_info_sta(int s, const char *str, int pos)
case 1: case 1:
/* counter list */ /* counter list */
count = sizeof(sta_infos) / sizeof(sta_infos[0]); count = sizeof(sta_infos) / sizeof(sta_infos[0]);
res = os_zalloc(count * sizeof(char *)); res = os_calloc(count, sizeof(char *));
if (res == NULL) if (res == NULL)
return NULL; return NULL;
for (i = 0; sta_infos[i].name; i++) { for (i = 0; sta_infos[i].name; i++) {
@ -1404,7 +1404,7 @@ static char ** complete_info_bss(int s, const char *str, int pos)
case 1: case 1:
/* counter list */ /* counter list */
count = sizeof(bss_infos) / sizeof(bss_infos[0]); count = sizeof(bss_infos) / sizeof(bss_infos[0]);
res = os_zalloc(count * sizeof(char *)); res = os_calloc(count, sizeof(char *));
if (res == NULL) if (res == NULL)
return NULL; return NULL;
for (i = 0; bss_infos[i].name; i++) { for (i = 0; bss_infos[i].name; i++) {
@ -1584,7 +1584,7 @@ static char ** wlantest_cli_cmd_list(void)
count = sizeof(wlantest_cli_commands) / count = sizeof(wlantest_cli_commands) /
sizeof(wlantest_cli_commands[0]); sizeof(wlantest_cli_commands[0]);
res = os_zalloc(count * sizeof(char *)); res = os_calloc(count, sizeof(char *));
if (res == NULL) if (res == NULL)
return NULL; return NULL;

2
wpa_supplicant/ap.c
View file

@ -514,7 +514,7 @@ int wpa_supplicant_create_ap(struct wpa_supplicant *wpa_s,
#endif /* CONFIG_P2P */ #endif /* CONFIG_P2P */
hapd_iface->num_bss = conf->num_bss; hapd_iface->num_bss = conf->num_bss;
hapd_iface->bss = os_zalloc(conf->num_bss * hapd_iface->bss = os_calloc(conf->num_bss,
sizeof(struct hostapd_data *)); sizeof(struct hostapd_data *));
if (hapd_iface->bss == NULL) { if (hapd_iface->bss == NULL) {
wpa_supplicant_ap_deinit(wpa_s); wpa_supplicant_ap_deinit(wpa_s);

4
wpa_supplicant/config.c
View file

@ -907,7 +907,7 @@ static int * wpa_config_parse_freqs(const struct parse_data *data,
used = 0; used = 0;
len = 10; len = 10;
freqs = os_zalloc((len + 1) * sizeof(int)); freqs = os_calloc(len + 1, sizeof(int));
if (freqs == NULL) if (freqs == NULL)
return NULL; return NULL;
@ -2107,7 +2107,7 @@ char ** wpa_config_get_all(struct wpa_ssid *ssid, int get_keys)
get_keys = get_keys && ssid->export_keys; get_keys = get_keys && ssid->export_keys;
props = os_zalloc(sizeof(char *) * ((2 * NUM_SSID_FIELDS) + 1)); props = os_calloc(2 * NUM_SSID_FIELDS + 1, sizeof(char *));
if (!props) if (!props)
return NULL; return NULL;

6
wpa_supplicant/dbus/dbus_new_handlers.c
View file

@ -871,7 +871,7 @@ dbus_bool_t wpas_dbus_getter_interfaces(DBusMessageIter *iter,
for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next) for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next)
num++; num++;
paths = os_zalloc(num * sizeof(char*)); paths = os_calloc(num, sizeof(char *));
if (!paths) { if (!paths) {
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory"); dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
return FALSE; return FALSE;
@ -2787,7 +2787,7 @@ dbus_bool_t wpas_dbus_getter_bsss(DBusMessageIter *iter, DBusError *error,
unsigned int i = 0; unsigned int i = 0;
dbus_bool_t success = FALSE; dbus_bool_t success = FALSE;
paths = os_zalloc(wpa_s->num_bss * sizeof(char *)); paths = os_calloc(wpa_s->num_bss, sizeof(char *));
if (!paths) { if (!paths) {
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory"); dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
return FALSE; return FALSE;
@ -2850,7 +2850,7 @@ dbus_bool_t wpas_dbus_getter_networks(DBusMessageIter *iter, DBusError *error,
if (!network_is_persistent_group(ssid)) if (!network_is_persistent_group(ssid))
num++; num++;
paths = os_zalloc(num * sizeof(char *)); paths = os_calloc(num, sizeof(char *));
if (!paths) { if (!paths) {
dbus_set_error(error, DBUS_ERROR_NO_MEMORY, "no memory"); dbus_set_error(error, DBUS_ERROR_NO_MEMORY, "no memory");
return FALSE; return FALSE;

6
wpa_supplicant/dbus/dbus_new_handlers_p2p.c
View file

@ -1049,7 +1049,7 @@ dbus_bool_t wpas_dbus_getter_p2p_peers(DBusMessageIter *iter, DBusError *error,
* Now construct the peer object paths in a form suitable for * Now construct the peer object paths in a form suitable for
* array_property_getter helper below. * array_property_getter helper below.
*/ */
peer_obj_paths = os_zalloc(num * sizeof(char *)); peer_obj_paths = os_calloc(num, sizeof(char *));
if (!peer_obj_paths) { if (!peer_obj_paths) {
out_of_mem = 1; out_of_mem = 1;
@ -1509,7 +1509,7 @@ dbus_bool_t wpas_dbus_getter_persistent_groups(DBusMessageIter *iter,
if (network_is_persistent_group(ssid)) if (network_is_persistent_group(ssid))
num++; num++;
paths = os_zalloc(num * sizeof(char *)); paths = os_calloc(num, sizeof(char *));
if (!paths) { if (!paths) {
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory"); dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
return FALSE; return FALSE;
@ -1816,7 +1816,7 @@ dbus_bool_t wpas_dbus_getter_p2p_group_members(DBusMessageIter *iter,
num_members = p2p_get_group_num_members(wpa_s->p2p_group); num_members = p2p_get_group_num_members(wpa_s->p2p_group);
paths = os_zalloc(num_members * sizeof(char *)); paths = os_calloc(num_members, sizeof(char *));
if (!paths) if (!paths)
goto out_of_memory; goto out_of_memory;

4
wpa_supplicant/interworking.c
View file

@ -330,7 +330,7 @@ static const u8 * nai_realm_parse_realm(struct nai_realm *r, const u8 *pos,
wpa_printf(MSG_DEBUG, "No room for EAP Methods"); wpa_printf(MSG_DEBUG, "No room for EAP Methods");
return NULL; return NULL;
} }
r->eap = os_zalloc(r->eap_count * sizeof(struct nai_realm_eap)); r->eap = os_calloc(r->eap_count, sizeof(struct nai_realm_eap));
if (r->eap == NULL) if (r->eap == NULL)
return NULL; return NULL;
@ -366,7 +366,7 @@ static struct nai_realm * nai_realm_parse(struct wpabuf *anqp, u16 *count)
return NULL; return NULL;
} }
realm = os_zalloc(num * sizeof(struct nai_realm)); realm = os_calloc(num, sizeof(struct nai_realm));
if (realm == NULL) if (realm == NULL)
return NULL; return NULL;

2
wpa_supplicant/sme.c
View file

@ -802,7 +802,7 @@ static void wpa_setband_scan_freqs_list(struct wpa_supplicant *wpa_s,
return; return;
} }
params->freqs = os_zalloc((mode->num_channels + 1) * sizeof(int)); params->freqs = os_calloc(mode->num_channels + 1, sizeof(int));
if (params->freqs == NULL) if (params->freqs == NULL)
return; return;
for (count = 0, i = 0; i < mode->num_channels; i++) { for (count = 0, i = 0; i < mode->num_channels; i++) {

4
wpa_supplicant/wpa_cli.c
View file

@ -240,7 +240,7 @@ static char ** cli_txt_list_array(struct dl_list *txt_list)
char **res; char **res;
struct cli_txt_entry *e; struct cli_txt_entry *e;
res = os_zalloc((count + 1) * sizeof(char *)); res = os_calloc(count + 1, sizeof(char *));
if (res == NULL) if (res == NULL)
return NULL; return NULL;
@ -3392,7 +3392,7 @@ static char ** wpa_list_cmd_list(void)
int i, count; int i, count;
count = sizeof(wpa_cli_commands) / sizeof(wpa_cli_commands[0]); count = sizeof(wpa_cli_commands) / sizeof(wpa_cli_commands[0]);
res = os_zalloc(count * sizeof(char *)); res = os_calloc(count, sizeof(char *));
if (res == NULL) if (res == NULL)
return NULL; return NULL;