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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66EA6C4332F for ; Tue, 31 Oct 2023 17:50:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236434AbjJaRuK (ORCPT ); Tue, 31 Oct 2023 13:50:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236422AbjJaRuJ (ORCPT ); Tue, 31 Oct 2023 13:50:09 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27C6CB4 for ; Tue, 31 Oct 2023 10:50:07 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 69FE1C433C7; Tue, 31 Oct 2023 17:50:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1698774606; bh=AtY9GNfqnzVs/Hy40qumy8bYxuMywspGmOVLkCy9JTk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RJ7UIoGijVJPDgCilgZjrykcBWXbc5aaAd+6VB1aLgq9a5KvY3U63ocu1H/9BkRx4 rsrcdMgaJbfK6SMO75ihXrceDGCCEGPkPfeK8NZp5AGEJJCpNhSd/iaUY5qHVuic5V 60TkoPeqeYhohNvhbl1NFyqOSOBBJ+O0gJ8C9LrA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ben Greear , Johannes Berg , Sasha Levin Subject: [PATCH 6.5 067/112] wifi: cfg80211: pass correct pointer to rdev_inform_bss() Date: Tue, 31 Oct 2023 18:01:08 +0100 Message-ID: <20231031165903.432831007@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231031165901.318222981@linuxfoundation.org> References: <20231031165901.318222981@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 6.5-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ben Greear [ Upstream commit 3e3929ef889e650dd585dc0f4f7f18240688811a ] Confusing struct member names here resulted in passing the wrong pointer, causing crashes. Pass the correct one. Fixes: eb142608e2c4 ("wifi: cfg80211: use a struct for inform_single_bss data") Signed-off-by: Ben Greear Link: https://lore.kernel.org/r/20231021154827.1142734-1-greearb@candelatech.com [rewrite commit message, add fixes] Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/scan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 939deecf0bbef..8210a6090ac16 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -2125,7 +2125,7 @@ cfg80211_inform_single_bss_data(struct wiphy *wiphy, if (!res) goto drop; - rdev_inform_bss(rdev, &res->pub, ies, data->drv_data); + rdev_inform_bss(rdev, &res->pub, ies, drv_data->drv_data); if (data->bss_source == BSS_SOURCE_MBSSID) { /* this is a nontransmitting bss, we need to add it to -- 2.42.0