Commit 7367633f authored by Jan Kiszka's avatar Jan Kiszka Committed by Ingo Molnar
Browse files

efi/capsule: Remove pr_debug() on ENOMEM or EFAULT 



Both cases are not worth a debug log message - the error code is telling
enough.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: default avatarMatt Fleming <matt@codeblueprint.co.uk>
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
Link: http://lkml.kernel.org/r/20170602135207.21708-4-ard.biesheuvel@linaro.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent fb153dc5

drivers/firmware/efi/capsule-loader.c

+2 −9
Original line number Diff line number Diff line
@@ -88,10 +88,8 @@ static ssize_t efi_capsule_setup_info(struct capsule_info *cap_info, 
	temp_page = krealloc(cap_info->pages,

			     pages_needed * sizeof(void *),

			     GFP_KERNEL | __GFP_ZERO);

	if (!temp_page) {

		pr_debug("%s: krealloc() failed\n", __func__);

	if (!temp_page)

		return -ENOMEM;

	}



	cap_info->pages = temp_page;

	cap_info->header_obtained = true;
@@ -111,10 +109,8 @@ static ssize_t efi_capsule_submit_update(struct capsule_info *cap_info) 


	cap_hdr_temp = vmap(cap_info->pages, cap_info->index,

			VM_MAP, PAGE_KERNEL);

	if (!cap_hdr_temp) {

		pr_debug("%s: vmap() failed\n", __func__);

	if (!cap_hdr_temp)

		return -ENOMEM;

	}



	ret = efi_capsule_update(cap_hdr_temp, cap_info->pages);

	vunmap(cap_hdr_temp);
@@ -171,7 +167,6 @@ static ssize_t efi_capsule_write(struct file *file, const char __user *buff, 
	if (!cap_info->page_bytes_remain) {

		page = alloc_page(GFP_KERNEL);

		if (!page) {

			pr_debug("%s: alloc_page() failed\n", __func__);

			ret = -ENOMEM;

			goto failed;

		}
@@ -184,7 +179,6 @@ static ssize_t efi_capsule_write(struct file *file, const char __user *buff, 


	kbuff = kmap(page);

	if (!kbuff) {

		pr_debug("%s: kmap() failed\n", __func__);

		ret = -ENOMEM;

		goto failed;

	}
@@ -193,7 +187,6 @@ static ssize_t efi_capsule_write(struct file *file, const char __user *buff, 
	/* Copy capsule binary data from user space to kernel space buffer */

	write_byte = min_t(size_t, count, cap_info->page_bytes_remain);

	if (copy_from_user(kbuff, buff, write_byte)) {

		pr_debug("%s: copy_from_user() failed\n", __func__);

		ret = -EFAULT;

		goto fail_unmap;

	}