lkml.org 
[lkml]   [2014]   [Nov]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 001/102] regulatory: add NUL to alpha2
    3.2.64-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Eliad Peller <eliad@wizery.com>

    commit a5fe8e7695dc3f547e955ad2b662e3e72969e506 upstream.

    alpha2 is defined as 2-chars array, but is used in multiple
    places as string (e.g. with nla_put_string calls), which
    might leak kernel data.

    Solve it by simply adding an extra char for the NULL
    terminator, making such operations safe.

    Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    [bwh: Backported to 3.2: adjust context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    include/net/regulatory.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/include/net/regulatory.h
    +++ b/include/net/regulatory.h
    @@ -92,7 +92,7 @@ struct ieee80211_reg_rule {

    struct ieee80211_regdomain {
    u32 n_reg_rules;
    - char alpha2[2];
    + char alpha2[3];
    struct ieee80211_reg_rule reg_rules[];
    };



    \
     
     \ /
      Last update: 2014-11-02 00:21    [W:7.360 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site