Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp10434pxb; Thu, 27 Jan 2022 13:50:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJwKwMIh3MZIi4fYitfm8bCPEm6sJOisKy3aKpBU+4Fq7tzG62wLmDJHxW8Mtg3lK/y+6kVC X-Received: by 2002:a17:906:938f:: with SMTP id l15mr4362654ejx.99.1643320208143; Thu, 27 Jan 2022 13:50:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643320208; cv=none; d=google.com; s=arc-20160816; b=itngwIjSGrSa7BIuYPL+IPydhPYpS5Z/2B2edzXyWPupyIitK66d8S1x8YhpjJ656g TRyCoaRGRvok2xyHmMDbA3QYGBzHzvd8+yuna+jwPxTlk4+2yk5/VtbLEMn81B80XJKg 64iEOb3jH9g7+j5uB5Y10S0Q8OWhaKEHtHiC47CoPr+g+ERPuHhg16WTvFnQdPiAaepJ H7NDrZ3/uwxB7jKQ4lW4tiLP3Zx4vYiQDV7QufMqfxsGH/ZHx2zFrjrRwNxTCb+XSE76 ay+x9ucXYGaSekx7skl2/VDYNC8zl6azbQi6rU3IQ8JxNI9O77GvxEfeftBcm58IwiOZ gClg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:user-agent:message-id:in-reply-to :date:references:subject:cc:to:from:dkim-signature; bh=+uTmyBJAQ+OKXtahWFl/16odBWL5E1Pprtdp1sO6sgg=; b=O5WgSmvy4mJM0+ITiIgTMqonNupE0OWcHRSptWCHvKvA0w1rs4H73sgg6d/49eRv8a FbOg2DJzQxoHByaxi/aqnWjjv7QGtmNw7WJP4eCFj+Zi09ljFvnfsB+pQ3rIFZxXO4/I 3jBLJExj3BfRs3YgWd7skQlpM5JSHlldtJ4k/vmIW7WUlynhIug8EMJNpGkHohch1r+Z hK03eqr51CFVs1pLe9onKfdlvunnSydLro1k3fbAhPJHyeKBKVPLkVenpzulWUWyQpdU hvDUzqN27Fg4KKFpESYAR9RaweAt04b7McNeUz/UV+Dpgh9knMr4K918dXdeE+MSsM5f NQ9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rxO0Xkja; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id qf21si1979590ejc.896.2022.01.27.13.49.50; Thu, 27 Jan 2022 13:50:08 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rxO0Xkja; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233574AbiA0MIQ (ORCPT + 72 others); Thu, 27 Jan 2022 07:08:16 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:42940 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229776AbiA0MIP (ORCPT ); Thu, 27 Jan 2022 07:08:15 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 6C5BAB821C0 for ; Thu, 27 Jan 2022 12:08:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2BB44C340E6; Thu, 27 Jan 2022 12:08:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643285293; bh=ljSbvHeJmF3ZuifdYikk1Qo28pM/YkC0/0ar/NPr0vM=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=rxO0XkjalEneDOA6O9oczCx+HZYUyFhjKJURER1CsByO5jwKZCMa/aFJXE7vvqAsW 27wXEsTJVPl82kw8CzAV7TffTUT88nVpcAw82ixXYBwJuGRNCWBlcx6PPlTqaoVDyF 1jMl19wCKx14X+5NA0o3KFLp3/2okaltuXnh7EUvAXQHXeGL/30Pil6A4vrrl/EjPQ AKc25YmAn8Z0ltyWmqfJCIwZhuKeRu6YRfyibsVf6XjuMSn33yJNuYgOfwfD/GbJDr xgz2tk1JdaisGEo0PsnGABIDqC5RCPZYAge8RyIRgxJkC0+hbpPJbujIjU46ID6rR8 Fjg2b6lRZ2pNw== From: Kalle Valo To: Arend van Spriel Cc: Phil Elwell , Arend van Spriel , "David S. Miller" , Jakub Kicinski , Linus Walleij , linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, SHA-cyfmac-dev-list@infineon.com Subject: Re: [PATCH] brcmfmac: firmware: Fix crash in brcm_alt_fw_path References: <20220118154514.3245524-1-phil@raspberrypi.com> <87h7a0gt7f.fsf@kernel.org> <07dbaff1-bc12-d782-ed14-ef3f33d3c041@raspberrypi.com> Date: Thu, 27 Jan 2022 14:08:07 +0200 In-Reply-To: (Arend van Spriel's message of "Wed, 19 Jan 2022 16:48:44 +0100") Message-ID: <87r18tjs9k.fsf@kernel.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Arend van Spriel writes: > On 1/19/2022 9:53 AM, Phil Elwell wrote: >> On 19/01/2022 06:01, Kalle Valo wrote: >>> Phil Elwell writes: >>> >>>> The call to brcm_alt_fw_path in brcmf_fw_get_firmwares is not protected >>>> by a check to the validity of the fwctx->req->board_type pointer. This >>>> results in a crash in strlcat when, for example, the WLAN chip is found >>>> in a USB dongle. >>>> >>>> Prevent the crash by adding the necessary check. >>>> >>>> See: https://github.com/raspberrypi/linux/issues/4833 >>>> >>>> Fixes: 5ff013914c62 ("brcmfmac: firmware: Allow per-board firmware >>>> binaries") >>>> Signed-off-by: Phil Elwell >>> >>> I think this should go to v5.17. >> >> Is that an Ack? Are you asking me to submit the patch in a different way? > > Similar/same patch was submitted by Hector Martin [1]. > > Regards, > Arend > > [1] > https://patchwork.kernel.org/project/linux-wireless/patch/20220117142919.207370-4-marcan@marcan.st/ I would prefer to take this patch to wireless tree and drop Hector's version. Is that ok? -- https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches