From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 297F1C2D0DB for ; Fri, 24 Jan 2020 14:25:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E2E502072C for ; Fri, 24 Jan 2020 14:25:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579875930; bh=w0CFkfqbG6EaSlOzx/NhcXmF5pjsbQME2xrR3kTJoPA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=h3TL/DaabYG8iAtWfopbmQ4EMDR6DjlgA+E1QrWWMgVcNi6myL/wcIuumhl4mHUwT ksnluyH5VNoD3VRUJFU9pLby9jB1arIntzX41IX/aczlAyOg1SA9pZ0H2TUM3xJPE9 sW2+blDbeOgvJ3xOQYezDORaxXU0Y5ct0SkbJbDI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392266AbgAXOZ2 (ORCPT ); Fri, 24 Jan 2020 09:25:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:43798 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392233AbgAXOVu (ORCPT ); Fri, 24 Jan 2020 09:21:50 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A08C8222C2; Fri, 24 Jan 2020 14:21:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579875709; bh=w0CFkfqbG6EaSlOzx/NhcXmF5pjsbQME2xrR3kTJoPA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MhWUXTnm12u4BdxACy9CMo8J7EmmKTO1DZ/4sS5eLu/a0BCdK6dss+bnMmb5qd6bi IS4P7t/6B0Ao9E0mcYkmbJuBLL/oDBagT+fNfnIuFemFhlUC/j5pgk+CEIXgr9faIH 0FhgtNG6aIrmE0frL20dP745WNx83Q0JmS2wEEnQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johannes Berg , syzbot+e8a797964a4180eb57d5@syzkaller.appspotmail.com, syzbot+34b582cf32c1db008f8e@syzkaller.appspotmail.com, Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 25/32] cfg80211: check for set_wiphy_params Date: Fri, 24 Jan 2020 09:21:12 -0500 Message-Id: <20200124142119.30484-25-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200124142119.30484-1-sashal@kernel.org> References: <20200124142119.30484-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johannes Berg [ 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 Link: https://lore.kernel.org/r/20200113125358.ac07f276efff.Ibd85ee1b12e47b9efb00a2adc5cd3fac50da791a@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- 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