Commit 201451cf authored by Jérôme Pouiller's avatar Jérôme Pouiller Committed by Greg Kroah-Hartman
Browse files

staging: wfx: check pointers returned by allocations 

Until now, the driver did not always check if the allocations success.

The issue was discussed here:
   https://lore.kernel.org/netdev/2026476.QLiXXEGFCf@pc-42/



Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200515083325.378539-4-Jerome.Pouiller@silabs.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a72319bf

drivers/staging/wfx/hif_tx.c

+43 −0
Original line number Diff line number Diff line
@@ -134,6 +134,8 @@ int hif_shutdown(struct wfx_dev *wdev) 
	if (wdev->chip_frozen)

		return 0;

	wfx_alloc_hif(0, &hif);

	if (!hif)

		return -ENOMEM;

	wfx_fill_header(hif, -1, HIF_REQ_ID_SHUT_DOWN, 0);

	ret = wfx_cmd_send(wdev, hif, NULL, 0, true);

	// After this command, chip won't reply. Be sure to give enough time to
@@ -157,6 +159,8 @@ int hif_configuration(struct wfx_dev *wdev, const u8 *conf, size_t len) 
	struct hif_msg *hif;

	struct hif_req_configuration *body = wfx_alloc_hif(buf_len, &hif);



	if (!hif)

		return -ENOMEM;

	body->length = cpu_to_le16(len);

	memcpy(body->pds_data, conf, len);

	wfx_fill_header(hif, -1, HIF_REQ_ID_CONFIGURATION, buf_len);
@@ -171,6 +175,8 @@ int hif_reset(struct wfx_vif *wvif, bool reset_stat) 
	struct hif_msg *hif;

	struct hif_req_reset *body = wfx_alloc_hif(sizeof(*body), &hif);



	if (!hif)

		return -ENOMEM;

	body->reset_flags.reset_stat = reset_stat;

	wfx_fill_header(hif, wvif->id, HIF_REQ_ID_RESET, sizeof(*body));

	ret = wfx_cmd_send(wvif->wdev, hif, NULL, 0, false);
@@ -187,6 +193,10 @@ int hif_read_mib(struct wfx_dev *wdev, int vif_id, u16 mib_id, 
	struct hif_req_read_mib *body = wfx_alloc_hif(sizeof(*body), &hif);

	struct hif_cnf_read_mib *reply = kmalloc(buf_len, GFP_KERNEL);



	if (!body || !reply) {

		ret = -ENOMEM;

		goto out;

	}

	body->mib_id = cpu_to_le16(mib_id);

	wfx_fill_header(hif, vif_id, HIF_REQ_ID_READ_MIB, sizeof(*body));

	ret = wfx_cmd_send(wdev, hif, reply, buf_len, false);
@@ -204,6 +214,7 @@ int hif_read_mib(struct wfx_dev *wdev, int vif_id, u16 mib_id, 
		memcpy(val, &reply->mib_data, le16_to_cpu(reply->length));

	else

		memset(val, 0xFF, val_len);

out:

	kfree(hif);

	kfree(reply);

	return ret;
@@ -217,6 +228,8 @@ int hif_write_mib(struct wfx_dev *wdev, int vif_id, u16 mib_id, 
	int buf_len = sizeof(struct hif_req_write_mib) + val_len;

	struct hif_req_write_mib *body = wfx_alloc_hif(buf_len, &hif);



	if (!hif)

		return -ENOMEM;

	body->mib_id = cpu_to_le16(mib_id);

	body->length = cpu_to_le16(val_len);

	memcpy(&body->mib_data, val, val_len);
@@ -241,6 +254,8 @@ int hif_scan(struct wfx_vif *wvif, struct cfg80211_scan_request *req, 


	compiletime_assert(IEEE80211_MAX_SSID_LEN == HIF_API_SSID_SIZE,

			   "API inconsistency");

	if (!hif)

		return -ENOMEM;

	for (i = 0; i < req->n_ssids; i++) {

		memcpy(body->ssid_def[i].ssid, req->ssids[i].ssid,

		       IEEE80211_MAX_SSID_LEN);
@@ -288,6 +303,8 @@ int hif_stop_scan(struct wfx_vif *wvif) 
	// body associated to HIF_REQ_ID_STOP_SCAN is empty

	wfx_alloc_hif(0, &hif);



	if (!hif)

		return -ENOMEM;

	wfx_fill_header(hif, wvif->id, HIF_REQ_ID_STOP_SCAN, 0);

	ret = wfx_cmd_send(wvif->wdev, hif, NULL, 0, false);

	kfree(hif);
@@ -305,6 +322,8 @@ int hif_join(struct wfx_vif *wvif, const struct ieee80211_bss_conf *conf, 
	WARN_ON(!conf->basic_rates);

	WARN_ON(sizeof(body->ssid) < ssidlen);

	WARN(!conf->ibss_joined && !ssidlen, "joining an unknown BSS");

	if (!hif)

		return -ENOMEM;

	body->infrastructure_bss_mode = !conf->ibss_joined;

	body->short_preamble = conf->use_short_preamble;

	if (channel && channel->flags & IEEE80211_CHAN_NO_IR)
@@ -333,6 +352,8 @@ int hif_set_bss_params(struct wfx_vif *wvif, int aid, int beacon_lost_count) 
	struct hif_req_set_bss_params *body =

		wfx_alloc_hif(sizeof(*body), &hif);



	if (!hif)

		return -ENOMEM;

	body->aid = cpu_to_le16(aid);

	body->beacon_lost_count = beacon_lost_count;

	wfx_fill_header(hif, wvif->id, HIF_REQ_ID_SET_BSS_PARAMS,
@@ -349,6 +370,8 @@ int hif_add_key(struct wfx_dev *wdev, const struct hif_req_add_key *arg) 
	// FIXME: only send necessary bits

	struct hif_req_add_key *body = wfx_alloc_hif(sizeof(*body), &hif);



	if (!hif)

		return -ENOMEM;

	// FIXME: swap bytes as necessary in body

	memcpy(body, arg, sizeof(*body));

	if (wfx_api_older_than(wdev, 1, 5))
@@ -369,6 +392,8 @@ int hif_remove_key(struct wfx_dev *wdev, int idx) 
	struct hif_msg *hif;

	struct hif_req_remove_key *body = wfx_alloc_hif(sizeof(*body), &hif);



	if (!hif)

		return -ENOMEM;

	body->entry_index = idx;

	wfx_fill_header(hif, -1, HIF_REQ_ID_REMOVE_KEY, sizeof(*body));

	ret = wfx_cmd_send(wdev, hif, NULL, 0, false);
@@ -388,6 +413,8 @@ int hif_set_edca_queue_params(struct wfx_vif *wvif, u16 queue, 
		return -ENOMEM;



	WARN_ON(arg->aifs > 255);

	if (!hif)

		return -ENOMEM;

	body->aifsn = arg->aifs;

	body->cw_min = cpu_to_le16(arg->cw_min);

	body->cw_max = cpu_to_le16(arg->cw_max);
@@ -414,6 +441,8 @@ int hif_set_pm(struct wfx_vif *wvif, bool ps, int dynamic_ps_timeout) 
	if (!body)

		return -ENOMEM;



	if (!hif)

		return -ENOMEM;

	if (ps) {

		body->pm_mode.enter_psm = 1;

		// Firmware does not support more than 128ms
@@ -435,6 +464,8 @@ int hif_start(struct wfx_vif *wvif, const struct ieee80211_bss_conf *conf, 
	struct hif_req_start *body = wfx_alloc_hif(sizeof(*body), &hif);



	WARN_ON(!conf->beacon_int);

	if (!hif)

		return -ENOMEM;

	body->dtim_period = conf->dtim_period;

	body->short_preamble = conf->use_short_preamble;

	body->channel_number = channel->hw_value;
@@ -456,6 +487,8 @@ int hif_beacon_transmit(struct wfx_vif *wvif, bool enable) 
	struct hif_req_beacon_transmit *body = wfx_alloc_hif(sizeof(*body),

							     &hif);



	if (!hif)

		return -ENOMEM;

	body->enable_beaconing = enable ? 1 : 0;

	wfx_fill_header(hif, wvif->id, HIF_REQ_ID_BEACON_TRANSMIT,

			sizeof(*body));
@@ -470,6 +503,8 @@ int hif_map_link(struct wfx_vif *wvif, u8 *mac_addr, int flags, int sta_id) 
	struct hif_msg *hif;

	struct hif_req_map_link *body = wfx_alloc_hif(sizeof(*body), &hif);



	if (!hif)

		return -ENOMEM;

	if (mac_addr)

		ether_addr_copy(body->mac_addr, mac_addr);

	body->map_link_flags = *(struct hif_map_link_flags *)&flags;
@@ -487,6 +522,8 @@ int hif_update_ie_beacon(struct wfx_vif *wvif, const u8 *ies, size_t ies_len) 
	int buf_len = sizeof(struct hif_req_update_ie) + ies_len;

	struct hif_req_update_ie *body = wfx_alloc_hif(buf_len, &hif);



	if (!hif)

		return -ENOMEM;

	body->ie_flags.beacon = 1;

	body->num_ies = cpu_to_le16(1);

	memcpy(body->ie, ies, ies_len);
@@ -504,6 +541,8 @@ int hif_sl_send_pub_keys(struct wfx_dev *wdev, 
	struct hif_req_sl_exchange_pub_keys *body = wfx_alloc_hif(sizeof(*body),

								  &hif);



	if (!hif)

		return -ENOMEM;

	body->algorithm = HIF_SL_CURVE25519;

	memcpy(body->host_pub_key, pubkey, sizeof(body->host_pub_key));

	memcpy(body->host_pub_key_mac, pubkey_hmac,
@@ -524,6 +563,8 @@ int hif_sl_config(struct wfx_dev *wdev, const unsigned long *bitmap) 
	struct hif_msg *hif;

	struct hif_req_sl_configure *body = wfx_alloc_hif(sizeof(*body), &hif);



	if (!hif)

		return -ENOMEM;

	memcpy(body->encr_bmp, bitmap, sizeof(body->encr_bmp));

	wfx_fill_header(hif, -1, HIF_REQ_ID_SL_CONFIGURE, sizeof(*body));

	ret = wfx_cmd_send(wdev, hif, NULL, 0, false);
@@ -538,6 +579,8 @@ int hif_sl_set_mac_key(struct wfx_dev *wdev, const u8 *slk_key, int destination) 
	struct hif_req_set_sl_mac_key *body = wfx_alloc_hif(sizeof(*body),

							    &hif);



	if (!hif)

		return -ENOMEM;

	memcpy(body->key_value, slk_key, sizeof(body->key_value));

	body->otp_or_ram = destination;

	wfx_fill_header(hif, -1, HIF_REQ_ID_SET_SL_MAC_KEY, sizeof(*body));

drivers/staging/wfx/hif_tx_mib.c

+2 −0
Original line number Diff line number Diff line
@@ -222,6 +222,8 @@ int hif_set_tx_rate_retry_policy(struct wfx_vif *wvif, 
	int ret;



	arg = kzalloc(size, GFP_KERNEL);

	if (!arg)

		return -ENOMEM;

	arg->num_tx_rate_policies = 1;

	arg->tx_rate_retry_policy[0].policy_index = policy_index;

	arg->tx_rate_retry_policy[0].short_retry_count = 255;