linux-efi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: jeremy.compostella@intel.com (Compostella, Jeremy)
To: "Elliott, Robert (Persistent Memory)" <elliott@hpe.com>
Cc: Matt Fleming <matt@codeblueprint.co.uk>,
	Ingo Molnar <mingo@kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	"H . Peter Anvin" <hpa@zytor.com>,
	Ard Biesheuvel <ard.biesheuvel@linaro.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"linux-efi@vger.kernel.org" <linux-efi@vger.kernel.org>,
	Arnd Bergmann <arnd@arndb.de>
Subject: Re: [PATCH 2/5] efibc: Fix excessive stack footprint warning
Date: Tue, 10 May 2016 10:40:22 +0200	[thread overview]
Message-ID: <87r3dauwzt.fsf@intel.com> (raw)
In-Reply-To: <94D0CD8314A33A4D9D801C0FE68B4029639618A2@G4W3202.americas.hpqcorp.net> (Robert Elliott's message of "Tue, 10 May 2016 01:41:01 +0200")

[-- Attachment #1: Type: text/plain, Size: 61 bytes --]

Why not.  See patch as attachment.

Thanks,

Jérémy


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-efibc-report-the-EFI-variable-name-in-the-error-mess.patch --]
[-- Type: text/x-diff, Size: 1247 bytes --]

>From 8a9b07e2d7242fa8a36157f1025202a96c3c7c9a Mon Sep 17 00:00:00 2001
From: Jeremy Compostella <jeremy.compostella@intel.com>
Date: Tue, 10 May 2016 10:34:21 +0200
Subject: [PATCH] efibc: report the EFI variable name in the error messages

Report the name of the EFI variable if the value is incorrect or if
efibc_set_variable() fails to allocate the struct efivar_entry object.

Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
---
 drivers/firmware/efi/efibc.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/firmware/efi/efibc.c b/drivers/firmware/efi/efibc.c
index cb4f573..93d34a1 100644
--- a/drivers/firmware/efi/efibc.c
+++ b/drivers/firmware/efi/efibc.c
@@ -37,13 +37,14 @@ static int efibc_set_variable(const char *name, const char *value)
 	size_t size = (strlen(value) + 1) * sizeof(efi_char16_t);
 
 	if (size > sizeof(entry->var.Data)) {
-		pr_err("value is too large");
+		pr_err("value is too large for %s EFI variable", name);
 		return -EINVAL;
 	}
 
 	entry = kmalloc(sizeof(*entry), GFP_KERNEL);
 	if (!entry) {
-		pr_err("failed to allocate efivar entry");
+		pr_err("failed to allocate efivar entry for %s EFI variable",
+		       name);
 		return -ENOMEM;
 	}
 
-- 
1.9.1


[-- Attachment #3: Type: text/plain, Size: 2390 bytes --]



"Elliott, Robert (Persistent Memory)" <elliott@hpe.com> writes:

>> -----Original Message-----
>> From: linux-kernel-owner@vger.kernel.org [mailto:linux-kernel-
>> owner@vger.kernel.org] On Behalf Of Matt Fleming
>> Sent: Friday, May 06, 2016 4:39 PM
> ...
>> Subject: [PATCH 2/5] efibc: Fix excessive stack footprint warning
>>
>> From: Jeremy Compostella <jeremy.compostella@intel.com>
>>
> ...
>>
>> -static void efibc_set_variable(const char *name, const char *value)
>> +static int efibc_set_variable(const char *name, const char *value)
>>  {
>>       int ret;
>>       efi_guid_t guid = LINUX_EFI_LOADER_ENTRY_GUID;
>> -     struct efivar_entry entry;
>> +     struct efivar_entry *entry;
>>       size_t size = (strlen(value) + 1) * sizeof(efi_char16_t);
>>
>> -     if (size > sizeof(entry.var.Data))
>> +     if (size > sizeof(entry->var.Data)) {
>>               pr_err("value is too large");
>
> That pr_err is introduced by patch 25/40 of the first series.
>
> How about including the name of the variable for which this is failing,
> like the final pr_err?
>
>> +             return -EINVAL;
>> +     }
>>
>> -     efibc_str_to_str16(name, entry.var.VariableName);
>> -     efibc_str_to_str16(value, (efi_char16_t *)entry.var.Data);
>> -     memcpy(&entry.var.VendorGuid, &guid, sizeof(guid));
>> +     entry = kmalloc(sizeof(*entry), GFP_KERNEL);
>> +     if (!entry) {
>> +             pr_err("failed to allocate efivar entry");
>
> How about including the name of the variable for which this
> is failing, like the final pr_err?
>
>> +             return -ENOMEM;
>> +     }
>>
>> -     ret = efivar_entry_set(&entry,
>> +     efibc_str_to_str16(name, entry->var.VariableName);
>> +     efibc_str_to_str16(value, (efi_char16_t *)entry->var.Data);
>> +     memcpy(&entry->var.VendorGuid, &guid, sizeof(guid));
>> +
>> +     ret = efivar_entry_set(entry,
>>                              EFI_VARIABLE_NON_VOLATILE
>>                              | EFI_VARIABLE_BOOTSERVICE_ACCESS
>>                              | EFI_VARIABLE_RUNTIME_ACCESS,
>> -                            size, entry.var.Data, NULL);
>> +                            size, entry->var.Data, NULL);
>>       if (ret)
>>               pr_err("failed to set %s EFI variable: 0x%x\n",
>>                      name, ret);
>> +
>> +     kfree(entry);
>> +     return ret;
>>  }
>

-- 
One Emacs to rule them all

  reply	other threads:[~2016-05-10  8:40 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-06 21:39 [GIT PULL 0/5] EFI changes for v4.7 Matt Fleming
2016-05-06 21:39 ` [PATCH 1/5] efi/capsule: Make efi_capsule_pending() lockless Matt Fleming
2016-05-06 21:39 ` [PATCH 2/5] efibc: Fix excessive stack footprint warning Matt Fleming
2016-05-09 23:41   ` Elliott, Robert (Persistent Memory)
2016-05-10  8:40     ` Compostella, Jeremy [this message]
     [not found]       ` <87r3dauwzt.fsf-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2016-05-11 12:43         ` Matt Fleming
     [not found]           ` <20160511124338.GW2839-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>
2016-05-11 15:16             ` Compostella, Jeremy
     [not found]               ` <8737povd4n.fsf-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2016-05-14 19:20                 ` Matt Fleming
2016-05-06 21:39 ` [PATCH 3/5] efi/capsule: Move 'capsule' to the stack in efi_capsule_supported() Matt Fleming
2016-05-06 21:39 ` [PATCH 4/5] efi: Merge boolean flag arguments Matt Fleming
     [not found] ` <1462570771-13324-1-git-send-email-matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>
2016-05-06 21:39   ` [PATCH 5/5] efivarfs: Make efivarfs_file_ioctl static Matt Fleming

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87r3dauwzt.fsf@intel.com \
    --to=jeremy.compostella@intel.com \
    --cc=ard.biesheuvel@linaro.org \
    --cc=arnd@arndb.de \
    --cc=elliott@hpe.com \
    --cc=hpa@zytor.com \
    --cc=linux-efi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=matt@codeblueprint.co.uk \
    --cc=mingo@kernel.org \
    --cc=tglx@linutronix.de \
    --subject='Re: [PATCH 2/5] efibc: Fix excessive stack footprint warning' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
on how to clone and mirror all data and code used for this inbox