lkml.org 
[lkml]   [2022]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 115/132] nl80211: validate S1G channel width
    Date
    From: Kieran Frewen <kieran.frewen@morsemicro.com>

    [ Upstream commit 5d087aa759eb82b8208411913f6c2158bd85abc0 ]

    Validate the S1G channel width input by user to ensure it matches
    that of the requested channel

    Signed-off-by: Kieran Frewen <kieran.frewen@morsemicro.com>
    Signed-off-by: Bassem Dawood <bassem@morsemicro.com>
    Link: https://lore.kernel.org/r/20220420041321.3788789-2-kieran.frewen@morsemicro.com
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/wireless/nl80211.c | 9 +++++++++
    1 file changed, 9 insertions(+)

    diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
    index fe9cade6b4fb..9fae09e860e1 100644
    --- a/net/wireless/nl80211.c
    +++ b/net/wireless/nl80211.c
    @@ -3080,6 +3080,15 @@ int nl80211_parse_chandef(struct cfg80211_registered_device *rdev,
    } else if (attrs[NL80211_ATTR_CHANNEL_WIDTH]) {
    chandef->width =
    nla_get_u32(attrs[NL80211_ATTR_CHANNEL_WIDTH]);
    + if (chandef->chan->band == NL80211_BAND_S1GHZ) {
    + /* User input error for channel width doesn't match channel */
    + if (chandef->width != ieee80211_s1g_channel_width(chandef->chan)) {
    + NL_SET_ERR_MSG_ATTR(extack,
    + attrs[NL80211_ATTR_CHANNEL_WIDTH],
    + "bad channel width");
    + return -EINVAL;
    + }
    + }
    if (attrs[NL80211_ATTR_CENTER_FREQ1]) {
    chandef->center_freq1 =
    nla_get_u32(attrs[NL80211_ATTR_CENTER_FREQ1]);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-05-23 19:41    [W:4.505 / U:0.228 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site