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

staging: wfx: drop calls to BUG_ON() 



Most of calls to BUG_ON() could replaced by WARN().

By the way, this patch also try to favor WARN() (that include a comment
about the problem) instead of WARN_ON().

Reported-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20191008094232.10014-7-Jerome.Pouiller@silabs.com


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

drivers/staging/wfx/bh.c

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static int rx_helper(struct wfx_dev *wdev, size_t read_len, int *is_cnf) 
	int release_count;

	int piggyback = 0;



	WARN_ON(read_len < 4);

	WARN(read_len < 4, "corrupted read");

	WARN(read_len > round_down(0xFFF, 2) * sizeof(u16),

	     "%s: request exceed WFx capability", __func__);
@@ -173,7 +173,7 @@ static void tx_helper(struct wfx_dev *wdev, struct hif_msg *hif) 
	bool is_encrypted = false;

	size_t len = le16_to_cpu(hif->len);



	BUG_ON(len < sizeof(*hif));

	WARN(len < sizeof(*hif), "try to send corrupted data");



	hif->seqnum = wdev->hif.tx_seqnum;

	wdev->hif.tx_seqnum = (wdev->hif.tx_seqnum + 1) % (HIF_COUNTER_MAX + 1);

drivers/staging/wfx/bus_sdio.c

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static int wfx_sdio_copy_from_io(void *priv, unsigned int reg_id, 
	unsigned int sdio_addr = reg_id << 2;

	int ret;



	BUG_ON(reg_id > 7);

	WARN(reg_id > 7, "chip only has 7 registers");

	WARN(((uintptr_t) dst) & 3, "unaligned buffer size");

	WARN(count & 3, "unaligned buffer address");
@@ -58,7 +58,7 @@ static int wfx_sdio_copy_to_io(void *priv, unsigned int reg_id, 
	unsigned int sdio_addr = reg_id << 2;

	int ret;



	BUG_ON(reg_id > 7);

	WARN(reg_id > 7, "chip only has 7 registers");

	WARN(((uintptr_t) src) & 3, "unaligned buffer size");

	WARN(count & 3, "unaligned buffer address");

drivers/staging/wfx/data_tx.c

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static void tx_policy_build(struct wfx_vif *wvif, struct tx_policy *policy, 
	size_t count;

	struct wfx_dev *wdev = wvif->wdev;



	BUG_ON(rates[0].idx < 0);

	WARN(rates[0].idx < 0, "invalid rate policy");

	memset(policy, 0, sizeof(*policy));

	for (i = 1; i < IEEE80211_TX_MAX_RATES; i++)

		if (rates[i].idx < 0)
@@ -162,7 +162,7 @@ static int tx_policy_get(struct wfx_vif *wvif, struct ieee80211_tx_rate *rates, 
	tx_policy_build(wvif, &wanted, rates);



	spin_lock_bh(&cache->lock);

	if (WARN_ON_ONCE(list_empty(&cache->free))) {

	if (WARN_ON(list_empty(&cache->free))) {

		spin_unlock_bh(&cache->lock);

		return WFX_INVALID_RATE_ID;

	}

drivers/staging/wfx/hif_tx_mib.h

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static inline int hif_set_mfp(struct wfx_vif *wvif, bool capable, bool required) 
{

	struct hif_mib_protected_mgmt_policy val = { };



	WARN_ON(required && !capable);

	WARN(required && !capable, "incoherent arguments");

	if (capable) {

		val.pmf_enable = 1;

		val.host_enc_auth_frames = 1;

drivers/staging/wfx/key.c

+16 −16
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static int wfx_alloc_key(struct wfx_dev *wdev) 


static void wfx_free_key(struct wfx_dev *wdev, int idx)

{

	BUG_ON(!(wdev->key_map & BIT(idx)));

	WARN(!(wdev->key_map & BIT(idx)), "inconsistent key allocation");

	memset(&wdev->keys[idx], 0, sizeof(wdev->keys[idx]));

	wdev->key_map &= ~BIT(idx);

}
@@ -34,7 +34,7 @@ static void wfx_free_key(struct wfx_dev *wdev, int idx) 
static uint8_t fill_wep_pair(struct hif_wep_pairwise_key *msg,

			     struct ieee80211_key_conf *key, u8 *peer_addr)

{

	WARN_ON(key->keylen > sizeof(msg->key_data));

	WARN(key->keylen > sizeof(msg->key_data), "inconsistent data");

	msg->key_length = key->keylen;

	memcpy(msg->key_data, key->key, key->keylen);

	ether_addr_copy(msg->peer_address, peer_addr);
@@ -44,7 +44,7 @@ static uint8_t fill_wep_pair(struct hif_wep_pairwise_key *msg, 
static uint8_t fill_wep_group(struct hif_wep_group_key *msg,

			      struct ieee80211_key_conf *key)

{

	WARN_ON(key->keylen > sizeof(msg->key_data));

	WARN(key->keylen > sizeof(msg->key_data), "inconsistent data");

	msg->key_id = key->keyidx;

	msg->key_length = key->keylen;

	memcpy(msg->key_data, key->key, key->keylen);
@@ -56,9 +56,9 @@ static uint8_t fill_tkip_pair(struct hif_tkip_pairwise_key *msg, 
{

	uint8_t *keybuf = key->key;



	WARN_ON(key->keylen != sizeof(msg->tkip_key_data)

	WARN(key->keylen != sizeof(msg->tkip_key_data)

			    + sizeof(msg->tx_mic_key)

			       + sizeof(msg->rx_mic_key));

			    + sizeof(msg->rx_mic_key), "inconsistent data");

	memcpy(msg->tkip_key_data, keybuf, sizeof(msg->tkip_key_data));

	keybuf += sizeof(msg->tkip_key_data);

	memcpy(msg->tx_mic_key, keybuf, sizeof(msg->tx_mic_key));
@@ -75,8 +75,8 @@ static uint8_t fill_tkip_group(struct hif_tkip_group_key *msg, 
{

	uint8_t *keybuf = key->key;



	WARN_ON(key->keylen != sizeof(msg->tkip_key_data)

			       + 2 * sizeof(msg->rx_mic_key));

	WARN(key->keylen != sizeof(msg->tkip_key_data)

			    + 2 * sizeof(msg->rx_mic_key), "inconsistent data");

	msg->key_id = key->keyidx;

	memcpy(msg->rx_sequence_counter, &seq->tkip.iv16, sizeof(seq->tkip.iv16));

	memcpy(msg->rx_sequence_counter + sizeof(uint16_t), &seq->tkip.iv32, sizeof(seq->tkip.iv32));
@@ -94,7 +94,7 @@ static uint8_t fill_tkip_group(struct hif_tkip_group_key *msg, 
static uint8_t fill_ccmp_pair(struct hif_aes_pairwise_key *msg,

			      struct ieee80211_key_conf *key, u8 *peer_addr)

{

	WARN_ON(key->keylen != sizeof(msg->aes_key_data));

	WARN(key->keylen != sizeof(msg->aes_key_data), "inconsistent data");

	ether_addr_copy(msg->peer_address, peer_addr);

	memcpy(msg->aes_key_data, key->key, key->keylen);

	return HIF_KEY_TYPE_AES_PAIRWISE;
@@ -104,7 +104,7 @@ static uint8_t fill_ccmp_group(struct hif_aes_group_key *msg, 
			       struct ieee80211_key_conf *key,

			       struct ieee80211_key_seq *seq)

{

	WARN_ON(key->keylen != sizeof(msg->aes_key_data));

	WARN(key->keylen != sizeof(msg->aes_key_data), "inconsistent data");

	memcpy(msg->aes_key_data, key->key, key->keylen);

	memcpy(msg->rx_sequence_counter, seq->ccmp.pn, sizeof(seq->ccmp.pn));

	memreverse(msg->rx_sequence_counter, sizeof(seq->ccmp.pn));
@@ -117,8 +117,8 @@ static uint8_t fill_sms4_pair(struct hif_wapi_pairwise_key *msg, 
{

	uint8_t *keybuf = key->key;



	WARN_ON(key->keylen != sizeof(msg->wapi_key_data)

			       + sizeof(msg->mic_key_data));

	WARN(key->keylen != sizeof(msg->wapi_key_data)

			    + sizeof(msg->mic_key_data), "inconsistent data");

	ether_addr_copy(msg->peer_address, peer_addr);

	memcpy(msg->wapi_key_data, keybuf, sizeof(msg->wapi_key_data));

	keybuf += sizeof(msg->wapi_key_data);
@@ -132,8 +132,8 @@ static uint8_t fill_sms4_group(struct hif_wapi_group_key *msg, 
{

	uint8_t *keybuf = key->key;



	WARN_ON(key->keylen != sizeof(msg->wapi_key_data)

			       + sizeof(msg->mic_key_data));

	WARN(key->keylen != sizeof(msg->wapi_key_data)

			    + sizeof(msg->mic_key_data), "inconsistent data");

	memcpy(msg->wapi_key_data, keybuf, sizeof(msg->wapi_key_data));

	keybuf += sizeof(msg->wapi_key_data);

	memcpy(msg->mic_key_data, keybuf, sizeof(msg->mic_key_data));
@@ -145,7 +145,7 @@ static uint8_t fill_aes_cmac_group(struct hif_igtk_group_key *msg, 
				   struct ieee80211_key_conf *key,

				   struct ieee80211_key_seq *seq)

{

	WARN_ON(key->keylen != sizeof(msg->igtk_key_data));

	WARN(key->keylen != sizeof(msg->igtk_key_data), "inconsistent data");

	memcpy(msg->igtk_key_data, key->key, key->keylen);

	memcpy(msg->ipn, seq->aes_cmac.pn, sizeof(seq->aes_cmac.pn));

	memreverse(msg->ipn, sizeof(seq->aes_cmac.pn));
@@ -163,7 +163,7 @@ static int wfx_add_key(struct wfx_vif *wvif, struct ieee80211_sta *sta, 
	int idx = wfx_alloc_key(wvif->wdev);

	bool pairwise = key->flags & IEEE80211_KEY_FLAG_PAIRWISE;



	WARN_ON(key->flags & IEEE80211_KEY_FLAG_PAIRWISE && !sta);

	WARN(key->flags & IEEE80211_KEY_FLAG_PAIRWISE && !sta, "inconsistent data");

	ieee80211_get_key_rx_seq(key, 0, &seq);

	if (idx < 0)

		return -EINVAL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE