Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp4644577ybl; Wed, 22 Jan 2020 01:57:02 -0800 (PST) X-Google-Smtp-Source: APXvYqzlrqhvIF/9SezxARR0NphZO46NOkU1ujfVJvu6J17jTcBPoEWh5x6AR9QdRNFJ2GIQwKYv X-Received: by 2002:a05:6808:2c4:: with SMTP id a4mr6023352oid.22.1579687022488; Wed, 22 Jan 2020 01:57:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579687022; cv=none; d=google.com; s=arc-20160816; b=aZeC9XPNnguBKxKG+A10ZeZL5FWVUfApIghAHlnF8QqSgE46a1MZt2xNOyDBHqL23n La51j5xWMn7lNNpjUPtqj+tynVJM81UKRC5ML4YqnOKAiqEW+37DMV4LYxO4jbdLQaA2 ALL0e8lSKY+VKLuGXQ7edPtkApnZAqpPef4EzQF09PEp+gqxMikno7h6AFUKhtbbUS3E Trxth30+Hfa4n9FOKCirvoZoT1O1mecmqJeQjoVKsTH0l+1W78TNBmstXchxWYmrqu1d nVGWcHSdQSiYBc+HL2sHtwgIgtl5mZIXHPZsxO/goVQMPzOjLQGOpGW5rMCXjsM081WE jP9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=skZ3fJzcWH4gA+4WRQbg/TZV2D32MaIu71F/pfTvxlc=; b=fgKqXYDlKw/06OZeCiTi7Uhi9Gt8t+oZwUuHCZWabujzQWIUrjpmja53kQPD7kJx7q e5wOkCyk7lr+bq1ZzDDQKcv7F0ebiNPaRow4q+2+ZMUzGvh0ZDm6F3ZqWbVnKUlGNrtj bqQgDuSz+8XvKZzSH9cFin3okBHvaLpvL2aQyUkQMISGgzKDqZnqeC7GxDSnGqfNFPNZ guZ/RcIVeBEtI5BSPLDfqMMgFKvCyGAR2S6wXvg6xx7kU6bsNMPNMR4QPlZuTFsNUWe9 AzzCIkIZ7fQwe42PUdUWsJ7Up87x+AO1Z+OHCgO0YVIHCaAPm2lUd/h2U2BP3C2tsR5R Drdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qvwQnZ7s; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p62si20489534oig.101.2020.01.22.01.56.51; Wed, 22 Jan 2020 01:57:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qvwQnZ7s; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730310AbgAVJdA (ORCPT + 99 others); Wed, 22 Jan 2020 04:33:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:46260 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729764AbgAVJc6 (ORCPT ); Wed, 22 Jan 2020 04:32:58 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1432C2071E; Wed, 22 Jan 2020 09:32:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579685577; bh=JGMlHbylT8EJA5WRpMqhPRi9WQs9uvPiSiL9iidNKwE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qvwQnZ7sdGZF8CZzIn2nZiCrWSANONJSdaIEfKa6o+SXm5ECcnh5XviXRBQcNVibz vS0xpwAS1yibWHdJNCzpYGqkbcDQzE5V/qDnnuUE6Jsyw8FvkjB27qLBD80jx8tq/t 1HKnnkLhmlEdSIhL8kzqgT9VLnaBk2xVFTGQqXYE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+e8a797964a4180eb57d5@syzkaller.appspotmail.com, syzbot+34b582cf32c1db008f8e@syzkaller.appspotmail.com, Johannes Berg Subject: [PATCH 4.4 69/76] cfg80211: check for set_wiphy_params Date: Wed, 22 Jan 2020 10:29:25 +0100 Message-Id: <20200122092801.906203889@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200122092751.587775548@linuxfoundation.org> References: <20200122092751.587775548@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 commit 24953de0a5e31dcca7e82c8a3c79abc2dfe8fb6e upstream. 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: Greg Kroah-Hartman --- net/wireless/rdev-ops.h | 4 ++++ 1 file changed, 4 insertions(+) --- a/net/wireless/rdev-ops.h +++ b/net/wireless/rdev-ops.h @@ -517,6 +517,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);