mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: tip-bot for Dan Carpenter <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: tglx@linutronix.de, dan.carpenter@oracle.com,
	torvalds@linux-foundation.org, ard.biesheuvel@linaro.org,
	peterz@infradead.org, hpa@zytor.com,
	linux-kernel@vger.kernel.org, mingo@kernel.org
Subject: [tip:efi/core] efi/efivar_ssdt_load: Don't return success on allocation failure
Date: Tue, 18 Oct 2016 08:31:58 -0700	[thread overview]
Message-ID: <tip-a75dcb5848359f488c32c0aef8711d9bd37a77b8@git.kernel.org> (raw)
In-Reply-To: <20161018143318.15673-9-matt@codeblueprint.co.uk>

Commit-ID:  a75dcb5848359f488c32c0aef8711d9bd37a77b8
Gitweb:     http://git.kernel.org/tip/a75dcb5848359f488c32c0aef8711d9bd37a77b8
Author:     Dan Carpenter <dan.carpenter@oracle.com>
AuthorDate: Tue, 18 Oct 2016 15:33:18 +0100
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 18 Oct 2016 17:11:20 +0200

efi/efivar_ssdt_load: Don't return success on allocation failure

We should return -ENOMEM here, instead of success.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Fixes: 475fb4e8b2f4 ("efi / ACPI: load SSTDs from EFI variables")
Link: http://lkml.kernel.org/r/20161018143318.15673-9-matt@codeblueprint.co.uk
Signed-off-by: Ingo Molnar <mingo@kernel.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 1ac199c..a4944e2 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) {

  reply	other threads:[~2016-10-18 15:32 UTC|newest]

Thread overview: 21+ 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
2016-10-18 14:33 ` [PATCH 1/8] MAINTAINERS: add myself as EFI maintainer Matt Fleming
2016-10-18 15:28   ` [tip:efi/core] MAINTAINERS: Add " tip-bot for Ard Biesheuvel
2016-10-18 14:33 ` [PATCH 2/8] efi: Remove unused including <linux/version.h> Matt Fleming
2016-10-18 15:28   ` [tip:efi/core] efi: Remove unused include of <linux/version.h> tip-bot for Wei Yongjun
2016-10-18 14:33 ` [PATCH 3/8] efi/arm*: efi_init() error handling fix Matt Fleming
2016-10-18 15:29   ` [tip:efi/core] efi/arm*: Fix efi_init() error handling tip-bot for Yisheng Xie
2016-10-18 14:33 ` [PATCH 4/8] efi/efi_test: Fix the uninitialized value datasize Matt Fleming
2016-10-18 15:29   ` [tip:efi/core] efi/efi_test: Fix uninitialized variable 'datasize' tip-bot for Ivan Hu
2016-10-18 14:33 ` [PATCH 5/8] efi/efi_test: Fix the uninitialized value rv Matt Fleming
2016-10-18 15:30   ` [tip:efi/core] efi/efi_test: Fix uninitialized variable 'rv' tip-bot for Ivan Hu
2016-10-18 14:33 ` [PATCH 6/8] efi/efi_test: Use memdup_user() as a cleanup Matt Fleming
2016-10-18 15:30   ` [tip:efi/core] " tip-bot for Ivan Hu
2016-10-18 14:33 ` [PATCH 7/8] efifb: show framebuffer layout as device attributes Matt Fleming
2016-10-18 15:31   ` [tip:efi/core] efifb: Show " tip-bot for Peter Jones
2016-10-18 14:33 ` [PATCH 8/8] efi: efivar_ssdt_load: Don't return success on allocation failure Matt Fleming
2016-10-18 15:31   ` tip-bot for Dan Carpenter [this message]
2016-10-18 15:25 ` [GIT PULL 0/8] EFI changes for v4.10 Ingo Molnar
2016-10-18 15:29   ` Ard Biesheuvel
2016-10-18 15:34 ` Lukas Wunner
2016-10-18 15:40   ` 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=tip-a75dcb5848359f488c32c0aef8711d9bd37a77b8@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=ard.biesheuvel@linaro.org \
    --cc=dan.carpenter@oracle.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    /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

Powered by JetHome