lkml.org 
[lkml]   [2013]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 25/80] rt2x00: fix a crash bug in the HT descriptor handling fix
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Felix Fietkau <nbd@openwrt.org>

    commit b4089d6d8e71a7293e2192025dfa507a04f661c4 upstream.

    Commit "rt2x00: fix HT TX descriptor settings regression"
    assumes that the control parameter to rt2x00mac_tx is always non-NULL.
    There is an internal call in rt2x00lib_bc_buffer_iter where NULL is
    passed. Fix the resulting crash by adding an initialized dummy on-stack
    ieee80211_tx_control struct.

    Signed-off-by: Felix Fietkau <nbd@openwrt.org>
    Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/wireless/rt2x00/rt2x00dev.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/net/wireless/rt2x00/rt2x00dev.c
    +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
    @@ -181,6 +181,7 @@ static void rt2x00lib_autowakeup(struct
    static void rt2x00lib_bc_buffer_iter(void *data, u8 *mac,
    struct ieee80211_vif *vif)
    {
    + struct ieee80211_tx_control control = {};
    struct rt2x00_dev *rt2x00dev = data;
    struct sk_buff *skb;

    @@ -195,7 +196,7 @@ static void rt2x00lib_bc_buffer_iter(voi
    */
    skb = ieee80211_get_buffered_bc(rt2x00dev->hw, vif);
    while (skb) {
    - rt2x00mac_tx(rt2x00dev->hw, NULL, skb);
    + rt2x00mac_tx(rt2x00dev->hw, &control, skb);
    skb = ieee80211_get_buffered_bc(rt2x00dev->hw, vif);
    }
    }



    \
     
     \ /
      Last update: 2013-11-27 10:21    [W:2.032 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site