From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f98.google.com (mail-pj1-f98.google.com [209.85.216.98]) (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 1E5E41DA57 for ; Sun, 2 Aug 2026 12:24:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.98 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785673485; cv=none; b=MyliLy1fk3wkBAX2JQEeIK/qV4O8nAHVOKEkG/hpb5sXdKwtdx0Rj87sCrx6Ozvd2oQl+wULQ0xfz1jWjHIzuKnjAk7FZEO11fC2YD1H3o+sEm13GdxmUa1SDsK19rYdpcuMdQQ9/t2+fNFQ836bqTUL6t7pc5e1nHQHSxUUx4s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785673485; c=relaxed/simple; bh=IVBACOmNYotUTjgF9C6tiVB81vMoFAfRoriF976EZok=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=GpsP86mEufkHxYk6FPhJLuija+hpzdpa57VNMBwopzGwoHZtOWdBXzraeZucRAHYEt7bUfk4zjoAjd8a55l6VCuVdeMlgnSAQyui7ALrM64njI7UTmEek+q2jaBXYvvM+21DSxgrqnQJfRLC14EXr2+Ppm78zwR18fHZhDQgHLs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=EFVqYM0+; arc=none smtp.client-ip=209.85.216.98 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="EFVqYM0+" Received: by mail-pj1-f98.google.com with SMTP id 98e67ed59e1d1-381c51fde6bso2684466a91.2 for ; Sun, 02 Aug 2026 05:24:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785673483; x=1786278283; h=content-transfer-encoding:content-type:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:dkim-signature:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to:content-type; bh=QNXeMyhkpbk8rwnA0O7uBQvIUEYbGICoPWDBw29OKOs=; b=sXsLDqpk878151AzIhBU64GjlJzh1Yz0jbmdriRFJ9f850gjVfaaN9dkB52VfX15gr UZc4yMIw5LJBxRRQ8cZSNmipMrZkzmUv8BWpA5P019WgCAimIWbyy6sU6si7Bo/cyMc1 D6e5ULFttgAma0/HaSWHJKwkJYQq4cmc4ur2Eu3kDi8Reu1JtaMonVgJV63pgD6jRCc0 Q0rQRlHhaJKqmJx/wjwWEDB1046OZf6N6FtEWlNMc5WvUYEeoV5d9bFpu4uX+hdQOF6b 0QIMS2rqh+XmK2Tzjc/RKytFzFv/MfyashF5XUBmA6QKAidt69APdhI1LdFtWjT61O9b Ia6Q== X-Forwarded-Encrypted: i=1; AHgh+RpGvIm3ip1pJLDI/uLBygTJlXE6oNTVmZorFXKzpM/8iaX/1GCAhYOiEM1zipdLc1lsnqxY/vBwlHVG46s=@vger.kernel.org X-Gm-Message-State: AOJu0YzQf+ZBADfUKQWFIl56Es/8Z34Xbhxrlh/H5DZs+RbFjHyawNBG iU43ryNqc9e7f+u/gk+Epb/nKIpKGQiCY6N/Nexmf0BLuJPDP2rOUBp/2fwto1uq0DSV4mXjLvn T9Z0dF7gN0ri4CdSwNR1R8GGtJyxHhEeHyZXnMcMJq2SiPhoCCSiF7LpcNsUoCORK1Q+7Ydehmo 4p6sKLU5Hvj8nOO7IZtdcHl5Mi/APGa79NmvDvx+VUeq6KGfZFDQyIHM1KNFRm5mhpplobzuCBZ dH+x/0l8sCplbmkuV3zv74/0g== X-Gm-Gg: AR+sD108fs3Nhpi9+d+bwSDA8qXXjzg9vL60FmNWaNXKNnBoanVYHSflhuYcxnzjY6t hMZDeLA0Hj0D64jgr4JC9GXu4yK2yb1ZFG9M2CZ0PewFqvR6BWUZj/Q2v7WIp8aVD9K6dkfe1Pp oMpU15k+2ygnqAdwppyb31aP01DptKdHqSL1FRcvaDLlPgJcZiE3Sbi1qt/Jv7rAnzOsh73UqUM uWaf/wrbkaZHlXldy7gu7tpsdyLFBxkk6znl7sn1dD7Aaoirv0ZtTeRZPDKnZXGA9/NHgz5H0MX S0STyYBpFkGRMOIuTUIeoo28F/2OsEVeuEK3ndsqlS3qzPc3GPoDEfANHFHbFlZ2BxslBG9jEhP lr3ktaBfOUMJ8uVRG5XrxLtW00HebWlWEMt23qv+Ew/5L4Q9Ci0A36wGxGYqx+NQ4ey94P62x60 4pAMrs3azt4kY/odG60HHRj4yKaevin5mvK0fMakw= X-Received: by 2002:a17:90b:4a86:b0:38e:d3b:436f with SMTP id 98e67ed59e1d1-38fbc59a088mr5532763a91.36.1785673483361; Sun, 02 Aug 2026 05:24:43 -0700 (PDT) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-22.dlp.protect.broadcom.com. [144.49.247.22]) by smtp-relay.gmail.com with ESMTPS id 98e67ed59e1d1-38fb2af6936sm608986a91.4.2026.08.02.05.24.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Aug 2026 05:24:43 -0700 (PDT) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-51c1d137a68so46636541cf.3 for ; Sun, 02 Aug 2026 05:24:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1785673482; x=1786278282; darn=vger.kernel.org; h=content-transfer-encoding:content-type:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:from:to:cc:subject:date:message-id:reply-to :content-type; bh=QNXeMyhkpbk8rwnA0O7uBQvIUEYbGICoPWDBw29OKOs=; b=EFVqYM0+6NjoE1/o48vIEIOlK/WFaP+c2tlBaJBsgTN82BrpG+vOywIEWIqE7IW0z8 oAzM01aX1GYOg/u5G6w/bzVOm1pLUoI6H0uPMFQwge9MtkPCOTAwt7UnSAKwUENPiI/m itE6qlP/DdeG+4pO6o5pkc0c8bCOympwMkcd0= X-Forwarded-Encrypted: i=1; AHgh+RruKo9TQZn1U1m5/mDEmMYA0rkgLSVk1EnwNMJB+71LSQmWUDuH7zJKewyfuq2SmFP9llcZmkSwYZLon9Q=@vger.kernel.org X-Received: by 2002:a05:622a:5906:b0:51c:8439:14e5 with SMTP id d75a77b69052e-52b566951a7mr125476471cf.10.1785673481806; Sun, 02 Aug 2026 05:24:41 -0700 (PDT) X-Received: by 2002:a05:622a:5906:b0:51c:8439:14e5 with SMTP id d75a77b69052e-52b566951a7mr125476081cf.10.1785673481411; Sun, 02 Aug 2026 05:24:41 -0700 (PDT) Received: from [192.168.178.26] (f215227.upc-f.chello.nl. [80.56.215.227]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-52b4eb6a84csm42125231cf.18.2026.08.02.05.24.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 02 Aug 2026 05:24:39 -0700 (PDT) Message-ID: Date: Sun, 2 Aug 2026 14:24:34 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH wireless] wifi: brcmfmac: validate msgbuf flowring IDs before use To: Can Peng Cc: linux-wireless@vger.kernel.org, brcm80211@lists.linux.dev, brcm80211-dev-list.pdl@broadcom.com, linux-kernel@vger.kernel.org, stable@vger.kernel.org References: <20260723055618.550834-1-pengcan@kylinos.cn> <20260802083905.3819981-3-arend.vanspriel@broadcom.com> Content-Language: en-US From: Arend van Spriel In-Reply-To: <20260802083905.3819981-3-arend.vanspriel@broadcom.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e On 02/08/2026 10:39, Arend van Spriel wrote: > On Thu, 23 Jul 2026 13:56:17 +0800, Can Peng wrote: >> Firmware messages carry flow_ring_id values which brcmfmac converts >> to an internal flowid by subtracting >> BRCMF_H2D_MSGRING_FLOWRING_IDSTART. The resulting value is used as >> a bit index in txstatus_done_map and as an array index into >> msgbuf->flowrings and the flowring state. >> >> Validate the firmware supplied flow_ring_id before using it. This >> prevents flow_ring_id values below BRCMF_H2D_MSGRING_FLOWRING_IDSTART >> from underflowing and rejects values outside msgbuf->max_flowrings. >> >> In the tx status path, complete the packet with an error after >> removing a valid packet id so the skb is not leaked when the flow >> ring id is invalid. >> >> Fixes: 9a1bb60250d2 ("brcmfmac: Adding msgbuf protocol.") >> Cc: stable@vger.kernel.org >> Signed-off-by: Can Peng >> --- >> .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 46 +++++++++++++++++++--- >> 1 file changed, 40 insertions(+), 6 deletions(-) > > One nit: there is a double blank line between brcmf_msgbuf_get_flowid() > and brcmf_msgbuf_dequeue_work() in the resulting code. This comes from > the pre-existing double blank line that was between > brcmf_msgbuf_remove_flowring() and brcmf_msgbuf_dequeue_work() -- worth > cleaning up to a single blank line. > > Minor enough that I will take care of it while applying if you do not > send a v2. As I do not apply anything anywhere maybe Johannes will, but feel free to send that v2. Regards, Arend