linux-efi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Matt Fleming <matt@codeblueprint.co.uk>
To: Ingo Molnar <mingo@kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	"H . Peter Anvin" <hpa@zytor.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>,
	Ard Biesheuvel <ard.biesheuvel@linaro.org>,
	linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org
Subject: [PATCH 8/8] efi: efivar_ssdt_load: Don't return success on allocation failure
Date: Tue, 18 Oct 2016 15:33:18 +0100	[thread overview]
Message-ID: <20161018143318.15673-9-matt@codeblueprint.co.uk> (raw)
In-Reply-To: <20161018143318.15673-1-matt@codeblueprint.co.uk>

From: Dan Carpenter <dan.carpenter@oracle.com>

We should return -ENOMEM here, instead of success.

Fixes: 475fb4e8b2f4 ("efi / ACPI: load SSTDs from EFI variables")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 drivers/firmware/efi/efi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 1ac199cd75e7..a4944e22f294 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -259,8 +259,10 @@ static __init int efivar_ssdt_load(void)
 		}
 
 		data = kmalloc(size, GFP_KERNEL);
-		if (!data)
+		if (!data) {
+			ret = -ENOMEM;
 			goto free_entry;
+		}
 
 		ret = efivar_entry_get(entry, NULL, &size, data);
 		if (ret) {
-- 
2.10.0

  parent reply	other threads:[~2016-10-18 14:33 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-18 14:33 [GIT PULL 0/8] EFI changes for v4.10 Matt Fleming
     [not found] ` <20161018143318.15673-1-matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>
2016-10-18 14:33   ` [PATCH 1/8] MAINTAINERS: add myself as EFI maintainer Matt Fleming
2016-10-18 14:33   ` [PATCH 2/8] efi: Remove unused including <linux/version.h> Matt Fleming
2016-10-18 14:33   ` [PATCH 3/8] efi/arm*: efi_init() error handling fix Matt Fleming
2016-10-18 14:33   ` [PATCH 4/8] efi/efi_test: Fix the uninitialized value datasize Matt Fleming
2016-10-18 14:33   ` [PATCH 5/8] efi/efi_test: Fix the uninitialized value rv Matt Fleming
2016-10-18 14:33   ` [PATCH 6/8] efi/efi_test: Use memdup_user() as a cleanup Matt Fleming
2016-10-18 15:34   ` [GIT PULL 0/8] EFI changes for v4.10 Lukas Wunner
     [not found]     ` <20161018153436.GA2593-JFq808J9C/izQB+pC5nmwQ@public.gmane.org>
2016-10-18 15:40       ` Matt Fleming
2016-10-18 14:33 ` [PATCH 7/8] efifb: show framebuffer layout as device attributes Matt Fleming
2016-10-18 14:33 ` Matt Fleming [this message]
2016-10-18 15:25 ` [GIT PULL 0/8] EFI changes for v4.10 Ingo Molnar
     [not found]   ` <20161018152556.GA27061-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-10-18 15:29     ` Ard Biesheuvel

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=20161018143318.15673-9-matt@codeblueprint.co.uk \
    --to=matt@codeblueprint.co.uk \
    --cc=ard.biesheuvel@linaro.org \
    --cc=dan.carpenter@oracle.com \
    --cc=hpa@zytor.com \
    --cc=linux-efi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=tglx@linutronix.de \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).