Remove 'BUG_ON()' from 'mwifiex_process_sta_txpd()' and
'mwifiex_process_uap_txpd()'. In case of insufficient
headrom, issue warning and return NULL, which should be
gracefully handled in 'mwifiex_process_tx()'. Also mark
error handling branches with 'unlikely()' and adjust
format specifiers to match actual 'unsigned int' type.
Signed-off-by: Dmitry Antipov <dmantipov@xxxxxxxxx>
---
v4: initial version to match series
---
drivers/net/wireless/marvell/mwifiex/sta_tx.c | 13 +++++++++----
drivers/net/wireless/marvell/mwifiex/uap_txrx.c | 13 +++++++++----
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_tx.c b/drivers/net/wireless/marvell/mwifiex/sta_tx.c
index 13c0e67ededf..d43f6ec1ad37 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_tx.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_tx.c
@@ -39,14 +39,19 @@ void *mwifiex_process_sta_txpd(struct mwifiex_private *priv,
u16 pkt_type, pkt_offset;
int hroom = adapter->intf_hdr_len;
- if (!skb->len) {
+ if (unlikely(!skb->len)) {
mwifiex_dbg(adapter, ERROR,
- "Tx: bad packet length: %d\n", skb->len);
+ "Tx: bad packet length: %u\n", skb->len);
tx_info->status_code = -1;
return skb->data;
}
-
- BUG_ON(skb_headroom(skb) < MWIFIEX_MIN_DATA_HEADER_LEN);
+ if (unlikely(skb_headroom(skb) < MWIFIEX_MIN_DATA_HEADER_LEN)) {
+ mwifiex_dbg(adapter, ERROR,
+ "Tx: insufficient skb headroom: %u\n",
+ skb_headroom(skb));
+ tx_info->status_code = -1;
+ return NULL;
+ }
pkt_type = mwifiex_is_skb_mgmt_frame(skb) ? PKT_TYPE_MGMT : 0;
diff --git a/drivers/net/wireless/marvell/mwifiex/uap_txrx.c b/drivers/net/wireless/marvell/mwifiex/uap_txrx.c
index e495f7eaea03..b27266742795 100644
--- a/drivers/net/wireless/marvell/mwifiex/uap_txrx.c
+++ b/drivers/net/wireless/marvell/mwifiex/uap_txrx.c
@@ -452,14 +452,19 @@ void *mwifiex_process_uap_txpd(struct mwifiex_private *priv,
u16 pkt_type, pkt_offset;
int hroom = adapter->intf_hdr_len;
- if (!skb->len) {
+ if (unlikely(!skb->len)) {
mwifiex_dbg(adapter, ERROR,
- "Tx: bad packet length: %d\n", skb->len);
+ "Tx: bad packet length: %u\n", skb->len);
tx_info->status_code = -1;
return skb->data;
}
-
- BUG_ON(skb_headroom(skb) < MWIFIEX_MIN_DATA_HEADER_LEN);
+ if (unlikely(skb_headroom(skb) < MWIFIEX_MIN_DATA_HEADER_LEN)) {
+ mwifiex_dbg(adapter, ERROR,
+ "Tx: insufficient skb headroom: %u\n",
+ skb_headroom(skb));
+ tx_info->status_code = -1;
+ return NULL;
+ }
pkt_type = mwifiex_is_skb_mgmt_frame(skb) ? PKT_TYPE_MGMT : 0;
--
2.41.0
