From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E52923AF65E for ; Sun, 3 May 2026 08:59:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.9 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777798771; cv=none; b=nGzpix3/aSZ1fqBQK+DJJyGZnm+pel9UBQfuRAZK/nuSmYd1/MnOflOqsgrzEv9bHqFtOM4zKxyOorphdcWUUTJmM4wdzI3PZ22Mpfmm7QSEbyyum+S6GyDJRmw2fg05E6GDt6iLBH27Jcex9/L5dI96FGZ5RFyeK346OLs92Ig= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777798771; c=relaxed/simple; bh=RS3EKfpot6D7dTUjQ3XjZqVY1xcnz4AL+HQugEAKGqA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sX9+bKl8u6Q7Mto6FcWWRhM0u+dpA6kYXsaA92aQQR1pGr4mmsPci5Y8WmiAsC4OcRqkWRHmisM/wY4lJ/In4/cnZoy0iUVllN6qySApPYPonmq4GiDYmchxEaJDSmKOLr+udFiHQH9rebL4AoLErny3EVh+ebHQxgNyfsl7shg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=PmIBKDEW; arc=none smtp.client-ip=192.198.163.9 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="PmIBKDEW" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1777798768; x=1809334768; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RS3EKfpot6D7dTUjQ3XjZqVY1xcnz4AL+HQugEAKGqA=; b=PmIBKDEWOt9Aj6hnY59OLANRkG7wEIZ5WRk+4Dj4TdNJCECW1OZ2MJE4 uYt1jpbg0gxdBlpyhwycE6iY5xPQ3qkl/HFTlEZddomER3Q2DNyFFqGYL HKzCD3bp8oy9UUREdTamSP2NWb65QM2Bii6w63G6UF/xozvohBKuBBwu4 jWTelxJ8AwXn/4ouMDPp8w6n72Pc7u4dqMSEO31XbktS076T3nODg9TNb KtKxojNu2Da+y0nfhDFBIFXutQbF12eF4q9134PQ0015mBeZUJd6dqW5Z RKa993X49RmTnHO8EnNf2EV9qsVWkMLEOlPIvyoVzTo/jZnRJ5HzbGbQU w==; X-CSE-ConnectionGUID: wHoqfPqTQ9qsXkDM+/TI0Q== X-CSE-MsgGUID: Kgsor2RgRJyaQcJ1BYsTxg== X-IronPort-AV: E=McAfee;i="6800,10657,11774"; a="89380401" X-IronPort-AV: E=Sophos;i="6.23,213,1770624000"; d="scan'208";a="89380401" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 May 2026 01:59:27 -0700 X-CSE-ConnectionGUID: a3555yVfSyCYcrwngemEqA== X-CSE-MsgGUID: KtbtqpG7TJmCzQO2N3/pOQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,213,1770624000"; d="scan'208";a="235123791" Received: from weis0040.iil.intel.com ([10.12.217.108]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 May 2026 01:59:26 -0700 From: Miri Korenblit To: linux-wireless@vger.kernel.org Cc: Andrei Otcheretianski Subject: [PATCH v3 wireless-next 05/15] wifi: mac80211: Fix a kernel panic in ieee80211_encrypt_tx_skb() Date: Sun, 3 May 2026 11:58:57 +0300 Message-Id: <20260503085907.257378-2-miriam.rachel.korenblit@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260503085907.257378-1-miriam.rachel.korenblit@intel.com> References: <20260503085907.257378-1-miriam.rachel.korenblit@intel.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Israel (74) Limited Content-Transfer-Encoding: 8bit From: Andrei Otcheretianski skb->dev may be NULL for frames on non-netdev devices. For example, NAN device frames after pairing. Fix it. Signed-off-by: Andrei Otcheretianski Signed-off-by: Miri Korenblit --- net/mac80211/tx.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index c18de2cb3769..933c86ca21c3 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -5355,7 +5355,7 @@ static int ieee80211_beacon_protect(struct sk_buff *skb, int ieee80211_encrypt_tx_skb(struct sk_buff *skb) { struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); - struct ieee80211_sub_if_data *sdata; + struct ieee80211_sub_if_data *sdata = NULL; struct sk_buff *check_skb; struct ieee80211_tx_data tx; ieee80211_tx_result res; @@ -5370,7 +5370,14 @@ int ieee80211_encrypt_tx_skb(struct sk_buff *skb) __skb_queue_head_init(&tx.skbs); __skb_queue_tail(&tx.skbs, skb); - sdata = IEEE80211_DEV_TO_SUB_IF(skb->dev); + if (skb->dev) + sdata = IEEE80211_DEV_TO_SUB_IF(skb->dev); + else if (info->control.vif) + sdata = vif_to_sdata(info->control.vif); + + if (WARN_ON(!sdata)) + return -EINVAL; + tx.sdata = sdata; tx.local = sdata->local; res = ieee80211_tx_h_encrypt(&tx); -- 2.34.1