]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Staging: rtl8192u: fix some memory corruption
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 17 Apr 2012 20:37:31 +0000 (23:37 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Apr 2012 23:58:16 +0000 (16:58 -0700)
When we received a command we incremented a stat counter depending on
the type of message.  The problem is there were 8 types of commands but
there were only 4 counters allocated so it corrupted memory past the
end of the rxcmdpkt[] array.

The fix is just to remove the counters because they aren't used.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
ACKed-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8192u/r8192U.h
drivers/staging/rtl8192u/r819xU_cmdpkt.c

index 9b81f26d40feae3bd740b1c8c27954cf676f59b4..43d459d81885aac31975b46c3444314d2319060d 100644 (file)
@@ -610,7 +610,6 @@ typedef struct Stats
 //     unsigned long rxnopointer;
        unsigned long rxok;
        unsigned long rxframgment;
-       unsigned long rxcmdpkt[4];              //08/05/08 amy rx cmd element txfeedback/bcn report/cfg set/query
        unsigned long rxurberr;
        unsigned long rxstaterr;
        unsigned long received_rate_histogram[4][32];   //0: Total, 1:OK, 2:CRC, 3:ICV, 2007 07 03 cosa
index 0cb28c776c49da14e829cf1315129d7c60a6def8..9348f429d590ce4d1a8276759004b7639883bb3c 100644 (file)
@@ -697,7 +697,6 @@ cmpk_message_handle_rx(
        struct ieee80211_rx_stats *pstats)
 {
 //     u32                     debug_level = DBG_LOUD;
-       struct r8192_priv *priv = ieee80211_priv(dev);
        int                     total_length;
        u8                      cmd_length, exe_cnt = 0;
        u8                      element_id;
@@ -779,9 +778,6 @@ cmpk_message_handle_rx(
                // 2007/01/22 MH Add to display tx statistic.
                //cmpk_DisplayTxStatistic(pAdapter);
 
-               /* 2007/03/09 MH Collect sidderent cmd element pkt num. */
-               priv->stats.rxcmdpkt[element_id]++;
-
                total_length -= cmd_length;
                pcmd_buff    += cmd_length;
        }       /* while (total_length > 0) */