Messages in this thread | | | Subject | Re: [PATCH v4 3/9] brcmfmac: firmware: Do not crash on a NULL board_type | From | Hector Martin <> | Date | Tue, 1 Feb 2022 01:53:36 +0900 |
| |
On 01/02/2022 01.49, Kalle Valo wrote: > Andy Shevchenko <andy.shevchenko@gmail.com> writes: > >> On Mon, Jan 31, 2022 at 6:07 PM Hector Martin <marcan@marcan.st> wrote: >>> >>> This unbreaks support for USB devices, which do not have a board_type >>> to create an alt_path out of and thus were running into a NULL >>> dereference. >> >> ... >> >>> @@ -599,6 +599,9 @@ static char *brcm_alt_fw_path(const char *path, >>> const char *board_type) >>> char alt_path[BRCMF_FW_NAME_LEN]; >>> char suffix[5]; >>> >>> + if (!board_type) >>> + return NULL; >> >> I still think it's better to have both callers do the same thing. >> >> Now it will be the double check in one case, > > I already applied a similar patch: > > https://git.kernel.org/wireless/wireless/c/665408f4c3a5 >
Feel free to drop this one from the series then, if everything else looks good.
-- Hector Martin (marcan@marcan.st) Public Key: https://mrcn.st/pub
| |