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,URIBL_BLOCKED,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 E60ADC35673 for ; Sun, 23 Feb 2020 02:22:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B283322525 for ; Sun, 23 Feb 2020 02:22:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582424572; bh=9O5ymUWpNt3jhqdPiucuIYgwSShPohd5ByDTUrD1C6E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jAuEz9KI+jdp/n7Gi9Uh3PgUFcc2Z4m2j2YYaj+/m8q/ISuEIznXqCe/ErIqtnez3 rd4dlFFIyEXyYYKP3c3z4u4rRDIdtgqubnF17jEMgz5oW121yeUHQMrGdYwAYzf0Jz 3/3VcXhvhJkbMpNVNI17AOvU1cj1515nci9ACoD0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728325AbgBWCWu (ORCPT ); Sat, 22 Feb 2020 21:22:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:51878 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728298AbgBWCWq (ORCPT ); Sat, 22 Feb 2020 21:22:46 -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 34A3722464; Sun, 23 Feb 2020 02:22:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582424566; bh=9O5ymUWpNt3jhqdPiucuIYgwSShPohd5ByDTUrD1C6E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BK1tvgKfomzRLwH0GXSddAzstvChp3chXDUoSfRQOjI9jKc0J6vjBJGfgmve+T4fK vDDgxhzysriqj6JEx986XaPCcJSfuL9Gy4ajm9kwYQG8crwbz97q2PVTBVn2+BIbgV CoFj2G8WiyqoNwyf9PzDJnxxHOhoZENJhUhBiF14= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sergey Matyukevich , Johannes Berg , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 08/50] cfg80211: check wiphy driver existence for drvinfo report Date: Sat, 22 Feb 2020 21:21:53 -0500 Message-Id: <20200223022235.1404-8-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200223022235.1404-1-sashal@kernel.org> References: <20200223022235.1404-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: Sergey Matyukevich [ Upstream commit bfb7bac3a8f47100ebe7961bd14e924c96e21ca7 ] When preparing ethtool drvinfo, check if wiphy driver is defined before dereferencing it. Driver may not exist, e.g. if wiphy is attached to a virtual platform device. Signed-off-by: Sergey Matyukevich Link: https://lore.kernel.org/r/20200203105644.28875-1-sergey.matyukevich.os@quantenna.com Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/ethtool.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net/wireless/ethtool.c b/net/wireless/ethtool.c index a9c0f368db5d2..24e18405cdb48 100644 --- a/net/wireless/ethtool.c +++ b/net/wireless/ethtool.c @@ -7,9 +7,13 @@ void cfg80211_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) { struct wireless_dev *wdev = dev->ieee80211_ptr; + struct device *pdev = wiphy_dev(wdev->wiphy); - strlcpy(info->driver, wiphy_dev(wdev->wiphy)->driver->name, - sizeof(info->driver)); + if (pdev->driver) + strlcpy(info->driver, pdev->driver->name, + sizeof(info->driver)); + else + strlcpy(info->driver, "N/A", sizeof(info->driver)); strlcpy(info->version, init_utsname()->release, sizeof(info->version)); -- 2.20.1