lkml.org 
[lkml]   [2017]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 07/28] cfg80211: Validate frequencies nested in NL80211_ATTR_SCAN_FREQUENCIES
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

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

    From: Srinivas Dasari <dasaris@qti.qualcomm.com>

    commit d7f13f7450369281a5d0ea463cc69890a15923ae upstream.

    validate_scan_freqs() retrieves frequencies from attributes
    nested in the attribute NL80211_ATTR_SCAN_FREQUENCIES with
    nla_get_u32(), which reads 4 bytes from each attribute
    without validating the size of data received. Attributes
    nested in NL80211_ATTR_SCAN_FREQUENCIES don't have an nla policy.

    Validate size of each attribute before parsing to avoid potential buffer
    overread.

    Fixes: 2a519311926 ("cfg80211/nl80211: scanning (and mac80211 update to use it)")
    Signed-off-by: Srinivas Dasari <dasaris@qti.qualcomm.com>
    Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

    --- a/net/wireless/nl80211.c
    +++ b/net/wireless/nl80211.c
    @@ -5348,6 +5348,10 @@ static int validate_scan_freqs(struct nl
    struct nlattr *attr1, *attr2;
    int n_channels = 0, tmp1, tmp2;

    + nla_for_each_nested(attr1, freqs, tmp1)
    + if (nla_len(attr1) != sizeof(u32))
    + return 0;
    +
    nla_for_each_nested(attr1, freqs, tmp1) {
    n_channels++;
    /*

    \
     
     \ /
      Last update: 2017-07-19 13:22    [W:2.704 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site