1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 4ffb6a584cd0..44f8b3f3cbed 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -685,6 +685,14 @@ void rt2x00lib_rxdone(struct queue_entry *entry, gfp_t gfp)
          * to mac80211.
          */
         rx_status = IEEE80211_SKB_RXCB(entry->skb);
+
+        /* Ensure that all fields of rx_status are initialized
+         * properly. The skb->cb array was used for driver
+         * specific informations, so rx_status might contain
+         * garbage.
+         */
+        memset(rx_status, 0, sizeof(*rx_status));
+
         rx_status->mactime = rxdesc.timestamp;
         rx_status->band = rt2x00dev->curr_band;
         rx_status->freq = rt2x00dev->curr_freq;