lkml.org 
[lkml]   [2009]   [Aug]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 33/74] cfg80211: add two missing NULL pointer checks
    2.6.30-stable review patch.  If anyone has any objections, please let us know.

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

    From: Johannes Berg <johannes@sipsolutions.net>

    commit cd3468bad96c00b5a512f551674f36776129520e upstream.

    These pointers can be NULL, the is_mesh() case isn't
    ever hit in the current kernel, but cmp_ies() can be
    hit under certain conditions.

    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    net/wireless/scan.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/net/wireless/scan.c
    +++ b/net/wireless/scan.c
    @@ -118,7 +118,7 @@ static int cmp_ies(u8 num, u8 *ies1, siz

    if (!ie1 && !ie2)
    return 0;
    - if (!ie1)
    + if (!ie1 || !ie2)
    return -1;

    r = memcmp(ie1 + 2, ie2 + 2, min(ie1[1], ie2[1]));
    @@ -171,6 +171,8 @@ static bool is_mesh(struct cfg80211_bss
    ie = find_ie(WLAN_EID_MESH_CONFIG,
    a->information_elements,
    a->len_information_elements);
    + if (!ie)
    + return false;
    if (ie[1] != IEEE80211_MESH_CONFIG_LEN)
    return false;




    \
     
     \ /
      Last update: 2009-08-13 22:27    [W:0.020 / U:30.412 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site