From 2d35a9e331db4ad6250047e9066e1b170b27b1d1 Mon Sep 17 00:00:00 2001 From: Alok Kumar Date: Wed, 1 Aug 2018 19:41:01 +0530 Subject: [PATCH] qcacld-3.0: Fix check_after_deref(REVERSE_INULL) issue In __hdd_hard_start_xmit, Null-checking for skb under drop_pkt suggests that it may be null, but it has already been dereferenced on all paths. Remove this Null-check for skb under drop_pkt as skb cannot be NULL. Change-Id: I6c8e816652951a95cff26b26c48b8f39a096b095 CRs-Fixed: 2259256 --- core/hdd/src/wlan_hdd_tx_rx.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c index fa9a8dd14a88..cdc96ef9fd82 100644 --- a/core/hdd/src/wlan_hdd_tx_rx.c +++ b/core/hdd/src/wlan_hdd_tx_rx.c @@ -1126,17 +1126,15 @@ drop_pkt_and_release_skb: qdf_net_buf_debug_release_skb(skb); drop_pkt: - if (skb) { - /* track connectivity stats */ - if (adapter->pkt_type_bitmap) - hdd_tx_rx_collect_connectivity_stats_info(skb, adapter, - PKT_TYPE_TX_DROPPED, &pkt_type); - qdf_dp_trace_data_pkt(skb, QDF_TRACE_DEFAULT_PDEV_ID, - QDF_DP_TRACE_DROP_PACKET_RECORD, 0, - QDF_TX); - kfree_skb(skb); - skb = NULL; - } + /* track connectivity stats */ + if (adapter->pkt_type_bitmap) + hdd_tx_rx_collect_connectivity_stats_info(skb, adapter, + PKT_TYPE_TX_DROPPED, + &pkt_type); + qdf_dp_trace_data_pkt(skb, QDF_TRACE_DEFAULT_PDEV_ID, + QDF_DP_TRACE_DROP_PACKET_RECORD, 0, + QDF_TX); + kfree_skb(skb); drop_pkt_accounting: