Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1176382pxb; Thu, 28 Jan 2021 09:41:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJzArJRsP0EN0ZCqUX9ZCTxLanVnUZftFZKIT+mTkqM4mUi5k2PQVDtMELGUG8CRtuMNYq7G X-Received: by 2002:a17:906:f0c4:: with SMTP id dk4mr498498ejb.225.1611855719120; Thu, 28 Jan 2021 09:41:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611855719; cv=none; d=google.com; s=arc-20160816; b=DepSHXim8bawIpZlZ6VsMAGk9lNXNheuVCimC/ZUdqp/RQGIokDPU5yfXhT2fHRx7z z+iehNS098nasW4t2WVpqz7Ry8XAn17wwI67GdluxMoG0fEB9iByYxRG0jjefaSFi4JP p+PaKAxIsuFQ0SE/6B3tGTqETRBg0VOqu9LncO3rGcxIWcvhsURy8Cf/0G8yE6Rpa2pb MpbGoMGzC7o/YqR/+x3cHUFukRPAVy6fNPXl2Ubd4beg4zY3iHry5a3oT0W7K2zzV9vx k83j3uQb7IpqMe0rUErWe8696ps+tKL3MLxwEJzqBT02N8TWToCJnX1AYVXEsxEfm15o enew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=vIDIE1wD+87GzLLH8K7svS64Fz6/b5/bTQTDZ8tXK18=; b=0Lmph305fKsQzo4EmykgJFEzJbirCyiGcCj3Ceg+RqGGiT1k1MF/W+2mqawx3qfO4x Cod67FECIRsoJmBbInbTQl7QJeCbmYC8bp9N7Q5JwzV0jMb+7qkhw9z8M9j5c5CgxRrk 0gAO33h8en87G+eqgQYhukoFmNDYyiHf8/RO2dtM3M9mZseff4A9lU3j+uOvIwmBUd5Z kv//icI3iR80eZ1vLLywG1o3/LC0Syb04sffPfdecvn/F904Lbxz3BEnPRyY0/dZc9Ve gnWwx/Ya1BmBcg2ej7wif/7O9SH1snKx+WQE2xcEHKlFOx4uZv3ivJdQj4ss8+egqdlk U6tw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g23si3415481edh.11.2021.01.28.09.41.11; Thu, 28 Jan 2021 09:41:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232858AbhA1RhP (ORCPT + 99 others); Thu, 28 Jan 2021 12:37:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233171AbhA1RgU (ORCPT ); Thu, 28 Jan 2021 12:36:20 -0500 Received: from sipsolutions.net (s3.sipsolutions.net [IPv6:2a01:4f8:191:4433::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94417C061793 for ; Thu, 28 Jan 2021 09:35:38 -0800 (PST) Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94) (envelope-from ) id 1l5BCh-00CwTh-Ke; Thu, 28 Jan 2021 18:35:36 +0100 From: Johannes Berg To: linux-wireless@vger.kernel.org Cc: Johannes Berg , syzbot+d2d412349f88521938aa@syzkaller.appspotmail.com Subject: [PATCH 2/4] wext: call cfg80211_change_iface() with wiphy lock held Date: Thu, 28 Jan 2021 18:35:26 +0100 Message-Id: <20210128183454.e81bc6789b4b.I5deb8b6bfdc8b4ea7696cb2447ee6c58c7ce9a4e@changeid> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210128173528.76393-1-johannes@sipsolutions.net> References: <20210128173528.76393-1-johannes@sipsolutions.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Johannes Berg This is needed now that all the driver callbacks are protected by the wiphy lock rather than (just) the RTNL. Fixes: a05829a7222e ("cfg80211: avoid holding the RTNL when calling the driver") Reported-by: syzbot+d2d412349f88521938aa@syzkaller.appspotmail.com Signed-off-by: Johannes Berg --- net/wireless/wext-compat.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c index 2e35cb78221e..0c6ea6212496 100644 --- a/net/wireless/wext-compat.c +++ b/net/wireless/wext-compat.c @@ -39,6 +39,7 @@ int cfg80211_wext_siwmode(struct net_device *dev, struct iw_request_info *info, struct cfg80211_registered_device *rdev; struct vif_params vifparams; enum nl80211_iftype type; + int ret; rdev = wiphy_to_rdev(wdev->wiphy); @@ -61,7 +62,11 @@ int cfg80211_wext_siwmode(struct net_device *dev, struct iw_request_info *info, memset(&vifparams, 0, sizeof(vifparams)); - return cfg80211_change_iface(rdev, dev, type, &vifparams); + wiphy_lock(wdev->wiphy); + ret = cfg80211_change_iface(rdev, dev, type, &vifparams); + wiphy_unlock(wdev->wiphy); + + return ret; } EXPORT_WEXT_HANDLER(cfg80211_wext_siwmode); -- 2.26.2