From: Kalle Valo <kvalo@qca.qualcomm.com>
Date: Thu, 6 Oct 2011 11:32:32 +0000 (+0300)
Subject: ath6kl: fix null skb dereference in ath6kl_rx()
X-Git-Tag: next-20111118~41^2~15^2~103
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ad3f78b99e5cd74e9d9643ac8356206f57e796c9;p=karo-tx-linux.git

ath6kl: fix null skb dereference in ath6kl_rx()

smatch found that skb might be null in some cases in ath6kl_rx():

ath6kl/txrx.c +1252 ath6kl_rx(222) error: potential null derefence 'skb'.

This will happen when ath6kl is in AP mode and two clients send traffic
to each other.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
---

diff --git a/drivers/net/wireless/ath/ath6kl/txrx.c b/drivers/net/wireless/ath/ath6kl/txrx.c
index bcf7b01310d0..a9dff01c70a6 100644
--- a/drivers/net/wireless/ath/ath6kl/txrx.c
+++ b/drivers/net/wireless/ath/ath6kl/txrx.c
@@ -1247,6 +1247,11 @@ void ath6kl_rx(struct htc_target *target, struct htc_packet *packet)
 		}
 		if (skb1)
 			ath6kl_data_tx(skb1, ar->net_dev);
+
+		if (skb == NULL) {
+			/* nothing to deliver up the stack */
+			return;
+		}
 	}
 
 	datap = (struct ethhdr *) skb->data;