lkml.org 
[lkml]   [2012]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 23/37] rt61pci: fix NULL pointer dereference in config_lna_gain
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------
    From: Stanislaw Gruszka <sgruszka@redhat.com>

    commit deee0214def5d8a32b8112f11d9c2b1696e9c0cb upstream.

    We can not pass NULL libconf->conf->channel to rt61pci_config() as it
    is dereferenced unconditionally in rt61pci_config_lna_gain() subroutine.

    Resolves:
    https://bugzilla.kernel.org/show_bug.cgi?id=44361

    Reported-and-tested-by: <dolohow@gmail.com>
    Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/net/wireless/rt2x00/rt61pci.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)
    diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
    index f322596..3f7bc5c 100644
    --- a/drivers/net/wireless/rt2x00/rt61pci.c
    +++ b/drivers/net/wireless/rt2x00/rt61pci.c
    @@ -2243,8 +2243,7 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)

    static void rt61pci_wakeup(struct rt2x00_dev *rt2x00dev)
    {
    - struct ieee80211_conf conf = { .flags = 0 };
    - struct rt2x00lib_conf libconf = { .conf = &conf };
    + struct rt2x00lib_conf libconf = { .conf = &rt2x00dev->hw->conf };

    rt61pci_config(rt2x00dev, &libconf, IEEE80211_CONF_CHANGE_PS);
    }



    \
     
     \ /
      Last update: 2012-08-17 07:01    [from the cache]
    ©2003-2014 Jasper Spaans. Advertise on this site