summaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8192u/r8192U_core.c
diff options
context:
space:
mode:
authorRickard Strandqvist <rickard_strandqvist@spectrumdigital.se>2015-02-07 15:56:10 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-06 16:55:24 -0800
commit535f2e7df820d84fd8a4395bb52f19846f6a2290 (patch)
treebbe3128e9cc7fa34aa221e0b2196350de2bba765 /drivers/staging/rtl8192u/r8192U_core.c
parent1b08872e59309458a54ed00cded95eeda43426e5 (diff)
downloadlinux-535f2e7df820d84fd8a4395bb52f19846f6a2290.tar.bz2
staging: rtl8192u: r8192U_core: Fix driver_info dereference as a null pointer
Fix possible use of use of driver_info as a null pointer in query_rxdesc_status() This could happen if stats->RxIs40MHzPacket still has the default value of zero. Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8192u/r8192U_core.c')
-rw-r--r--drivers/staging/rtl8192u/r8192U_core.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index 0d64d2dfd38c..8f7a3219eff1 100644
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -4476,13 +4476,10 @@ static void query_rxdesc_status(struct sk_buff *skb,
skb_pull(skb, stats->RxBufShift + stats->RxDrvInfoSize);
}
- /* for debug 2008.5.29 */
-
- //added by vivi, for MP, 20080108
- stats->RxIs40MHzPacket = driver_info->BW;
- if (stats->RxDrvInfoSize != 0)
+ if (driver_info) {
+ stats->RxIs40MHzPacket = driver_info->BW;
TranslateRxSignalStuff819xUsb(skb, stats, driver_info);
-
+ }
}
static void rtl8192_rx_nomal(struct sk_buff *skb)