From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f179.google.com (mail-dy1-f179.google.com [74.125.82.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 284482D6E5A for ; Tue, 21 Apr 2026 23:20:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776813625; cv=none; b=Tp98l+as77tazQQ+PJTSnmNd1zQ0Y4takZciSVQ+9S+eT9SP/vRLmIWxEKadg3nm/pULvFXoxOTRI2xVCNZjbf/wNyj+LbkRX8bAtE37Hf7nrc2svhQt6PqKyQv3qW7HPzZ+g51gE9MwfzYSKIE1n4k8aFYToGSecd2MlAXUCAw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776813625; c=relaxed/simple; bh=U5fna9T84Eh3lw8EYGF5YB2t0SNNrEclAefNj5/xlGY=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=sqW7FlkbLUy9tH4w+846M7w+E87U9y1im9sA4WbYslxhuTEVfil0TslqN3CruHV2cDdqUnLmRc+R39I/vAi9+o5yGnU2ums5EBwHfUs2Vv+JHCsNpnwCAZ1Qkiv7FBBeRx4FYF12j0vjcqE/a5I6owmRn34+X0r/2cPx8sO+jA4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=nXDTyjB6; arc=none smtp.client-ip=74.125.82.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="nXDTyjB6" Received: by mail-dy1-f179.google.com with SMTP id 5a478bee46e88-2d8fa0fadfeso2544548eec.1 for ; Tue, 21 Apr 2026 16:20:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1776813622; x=1777418422; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=6iMgIXiaYsvKhx6lPGjL0MHR0FS3/XJAOILK7eE+66w=; b=nXDTyjB6nY6fKVdDHZH2aOgXYxIy5CQgD4vlmK9qsDYMI5/qptCGW/AvnNm7GCPU53 q0ATS2YkAzDte2PG9w6nzKsl3Yn2QdAzS+BLBT03yV64t0IHL6TKjaOorcdSFcmdbtzF v/2zvNjPZ2SUJMmhwrlZ8HOj/qnzQyOR63+l0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776813622; x=1777418422; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6iMgIXiaYsvKhx6lPGjL0MHR0FS3/XJAOILK7eE+66w=; b=XkpzIVEzsoKPswBl5pyzh2goNamtw8a9xYGQWXGaYWA5nNN12YyDdunCLrPeuLA5F1 h4aHlhDWKLT74JNmDBWTyUxMb9itzfLYbGnDNafrC66LKhlH+UcbFrh8FcBMCFgbiM7W a9AOkxZVKo5vtRRppr8r42RTPtFT5s35oIc96PwvzsFhZLY9MGjZqB6MAlRUh3VGr2he tNwiAq9vpYQz91A72WqLYepnqxyTICE/ZpjfK36Y87lcfN5RJyabLomqx+iOgcXxs+Uc pqYQyXc9J8d6iWtvG9HCurTwULVJNCEJGSsEGFkFR0d8AWcMlXJ/Kqbiu1z/S+ST7Dhq kY5Q== X-Forwarded-Encrypted: i=1; AFNElJ8oswoarH2a8a+JtNhqUCTXWsoE3DAl5Ppzhh/ezrC7Ar0gvioE+ieDgbIv4lNEAbUtu/BJ0wqatSrye5o=@vger.kernel.org X-Gm-Message-State: AOJu0Yw1r3z24YsPzVN8bHVQQZ7+82t5uqOQ8oFbpvpXeUh2Rk213RAA xItORXcL+wMZeyn4K2ogK0XQr+TZNsnmeBFEketkGhbl4TMOYqqdolQ3p8NDmANhCw== X-Gm-Gg: AeBDietHlYthfZmiApm+IgPysJD9XnjmkMyYqMHPQ0R3xJXLPIlmnkIU1imbPm8SUBM O8NBtTXyXFnHGC3S0z3XltLnjdKdr3aUEiRloIeRO+tvwuhsuxGYN9GfHXk+MdBRKp4sWI4pk10 CkHJeCFyD+lK4WdLSqq6z7DUUHA3NphyR3Xv/Hhi9sfH5yVH9QCJPQzeQn8769KMT5v1/GPVTv3 GEYO/peqHj34H4dcnnY90VJgSOJnXgHrIY8lPTvJ3Lf5qipYyt+v7OC5iUfiZHr6isT6ajEQE2k 0tAUU9zGnFk0Q/twG/7hXOMJZpI/qo3Hfh12oRyg/WE89uPPbXGwAwxWoaJACkV7kiDmxSOAmux 1CVM9VcLYE9ILLzchbi4RRO2JBk88had8SmeS2GUXtHk7wqcWBxgajbra57DnY5asdk1fJtNXLQ LNSFxNKn2Fq4BQJrptYfUlV/lzfz7/e56QRPDZW/gMHGSlkDYVnX1vdzlPdrjyeYDhD8Xc4T9o X-Received: by 2002:a05:7300:8622:b0:2c1:7480:ff9b with SMTP id 5a478bee46e88-2e42e6e99b7mr8746932eec.18.1776813622277; Tue, 21 Apr 2026 16:20:22 -0700 (PDT) Received: from localhost ([2a00:79e0:2e7c:8:50be:3375:972d:9e1d]) by smtp.gmail.com with UTF8SMTPSA id 5a478bee46e88-2e539fa5c38sm20402387eec.5.2026.04.21.16.20.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 21 Apr 2026 16:20:21 -0700 (PDT) Date: Tue, 21 Apr 2026 16:20:20 -0700 From: Brian Norris To: Tristan Madani Cc: Johannes Berg , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Tristan Madani Subject: Re: [PATCH v3 5/6] wifi: mwifiex: fix OOB read from firmware intf_num in multichannel event Message-ID: References: <20260421134938.331334-1-tristmd@gmail.com> <20260421134938.331334-6-tristmd@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260421134938.331334-6-tristmd@gmail.com> On Tue, Apr 21, 2026 at 01:49:37PM +0000, Tristan Madani wrote: > From: Tristan Madani > > The firmware-controlled intf_num is used to iterate the flexible array > bss_type_numlist[] without checking it against the TLV data length. An > inflated value causes out-of-bounds reads past the TLV data. > > Clamp intf_num to the available TLV data. > > Fixes: 8d6b538a5eac ("mwifiex: handle multichannel event") > Signed-off-by: Tristan Madani > --- > Changes in v3: > - Regenerated from wireless-next with proper git format-patch to > produce valid index hashes (v2 had post-processed index lines). > > Changes in v2: > - No code changes from v1. > > drivers/net/wireless/marvell/mwifiex/sta_event.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/net/wireless/marvell/mwifiex/sta_event.c b/drivers/net/wireless/marvell/mwifiex/sta_event.c > index fecd88967ceb8..6b7e5b6a66a9e 100644 > --- a/drivers/net/wireless/marvell/mwifiex/sta_event.c > +++ b/drivers/net/wireless/marvell/mwifiex/sta_event.c > @@ -450,6 +450,14 @@ void mwifiex_process_multi_chan_event(struct mwifiex_private *priv, > > grp_info = (struct mwifiex_ie_types_mc_group_info *)tlv; > intf_num = grp_info->intf_num; > + { I don't think it's typical style to add arbitrary context blocks / braces just to declare a new variable. It increases the indentation unnecesarily, for one. I'd suggest dropping these braces and moving the 'u16 fixed_len;' declaration up to the top of this block. > + u16 fixed_len = sizeof(*grp_info) - > + sizeof(grp_info->header); > + if (tlv_len < fixed_len || > + intf_num > tlv_len - fixed_len) ...then there will be less indentation and these line breaks are less necessary. Brian > + intf_num = 0; > + } > + > for (i = 0; i < intf_num; i++) { > bss_type = grp_info->bss_type_numlist[i] >> 4; > bss_num = grp_info->bss_type_numlist[i] & BSS_NUM_MASK; > -- > 2.47.3 >