From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10DCDECAAD5 for ; Sat, 10 Sep 2022 04:57:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229540AbiIJE46 (ORCPT ); Sat, 10 Sep 2022 00:56:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48592 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229486AbiIJE44 (ORCPT ); Sat, 10 Sep 2022 00:56:56 -0400 Received: from smtp.smtpout.orange.fr (smtp06.smtpout.orange.fr [80.12.242.128]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2963CB9402 for ; Fri, 9 Sep 2022 21:56:54 -0700 (PDT) Received: from [192.168.1.18] ([90.11.190.129]) by smtp.orange.fr with ESMTPA id WsXsooWDfez1rWsXsoPi6u; Sat, 10 Sep 2022 06:56:52 +0200 X-ME-Helo: [192.168.1.18] X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sat, 10 Sep 2022 06:56:52 +0200 X-ME-IP: 90.11.190.129 Message-ID: <04d65bd7-a6b2-bb14-fd69-632542ae9e86@wanadoo.fr> Date: Sat, 10 Sep 2022 06:56:43 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH V2] efi: efibc: Guard against allocation failure Content-Language: en-US To: "Guilherme G. Piccoli" , linux-efi@vger.kernel.org Cc: ardb@kernel.org, linux-kernel@vger.kernel.org, kernel-dev@igalia.com, kernel@gpiccoli.net, matt@codeblueprint.co.uk, mjg59@srcf.ucam.org References: <20220909194214.186731-1-gpiccoli@igalia.com> From: Christophe JAILLET In-Reply-To: <20220909194214.186731-1-gpiccoli@igalia.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le 09/09/2022 à 21:42, Guilherme G. Piccoli a écrit : > There is a single kmalloc in this driver, and it's not currently > guarded against allocation failure. Do it here by just bailing-out > the reboot handler, in case this tentative allocation fails. > > Fixes: 416581e48679 ("efi: efibc: avoid efivar API for setting variables") > Signed-off-by: Guilherme G. Piccoli > --- > > V2: > * Rebased against 6.0-rc4; > * Dropped from the original series [0]. > > [0] https://lore.kernel.org/linux-efi/20220729194532.228403-1-gpiccoli@igalia.com/ > > > drivers/firmware/efi/efibc.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/firmware/efi/efibc.c b/drivers/firmware/efi/efibc.c > index 8ced7af8e56d..4f9fb086eab7 100644 > --- a/drivers/firmware/efi/efibc.c > +++ b/drivers/firmware/efi/efibc.c > @@ -48,6 +48,9 @@ static int efibc_reboot_notifier_call(struct notifier_block *notifier, > return NOTIFY_DONE; > > wdata = kmalloc(MAX_DATA_LEN * sizeof(efi_char16_t), GFP_KERNEL); Hi, even if mostly useless in this case, kmalloc_array()? Or certainly maybe even better, kstrndup()? CJ > + if (!wdata) > + return NOTIFY_DONE; > + > for (l = 0; l < MAX_DATA_LEN - 1 && str[l] != '\0'; l++) > wdata[l] = str[l]; > wdata[l] = L'\0';