lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 25/32] cfg80211: check for set_wiphy_params
    Date
    From: Johannes Berg <johannes.berg@intel.com>

    [ Upstream commit 24953de0a5e31dcca7e82c8a3c79abc2dfe8fb6e ]

    Check if set_wiphy_params is assigned and return an error if not,
    some drivers (e.g. virt_wifi where syzbot reported it) don't have
    it.

    Reported-by: syzbot+e8a797964a4180eb57d5@syzkaller.appspotmail.com
    Reported-by: syzbot+34b582cf32c1db008f8e@syzkaller.appspotmail.com
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Link: https://lore.kernel.org/r/20200113125358.ac07f276efff.Ibd85ee1b12e47b9efb00a2adc5cd3fac50da791a@changeid
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/wireless/rdev-ops.h | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/net/wireless/rdev-ops.h b/net/wireless/rdev-ops.h
    index 96849357dd907..4077bb3af440c 100644
    --- a/net/wireless/rdev-ops.h
    +++ b/net/wireless/rdev-ops.h
    @@ -537,6 +537,10 @@ static inline int
    rdev_set_wiphy_params(struct cfg80211_registered_device *rdev, u32 changed)
    {
    int ret;
    +
    + if (!rdev->ops->set_wiphy_params)
    + return -EOPNOTSUPP;
    +
    trace_rdev_set_wiphy_params(&rdev->wiphy, changed);
    ret = rdev->ops->set_wiphy_params(&rdev->wiphy, changed);
    trace_rdev_return_int(&rdev->wiphy, ret);
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-01-24 15:25    [W:4.114 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site