linux-kernel - [PATCH] firmware: efi: arm-runtime: fix build error void value not ignored

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Mon,  4 Feb 2019 14:29:04 +0100
From:   Anders Roxell <anders.roxell@...aro.org>
To:     ard.biesheuvel@...aro.org
Cc:     linux-efi@...r.kernel.org, linux-kernel@...r.kernel.org,
        Anders Roxell <anders.roxell@...aro.org>
Subject: [PATCH] firmware: efi: arm-runtime: fix build error void value not ignored

Commit e2a2e56e4082 ("arm64: dump: no need to check return value of debugfs_create functions")
changed the return value from 'int' to 'void'.

../drivers/firmware/efi/arm-runtime.c: In function ‘ptdump_init’:
../drivers/firmware/efi/arm-runtime.c:52:9: error: void value not ignored as it ought to be
  return ptdump_debugfs_register(&efi_ptdump_info, "efi_page_tables");
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/firmware/efi/arm-runtime.c:53:1: warning: control reaches end of non-void function [-Wreturn-type]
 }
 ^

Rework so that function 'ptdump_init' doesn't 'return
ptdump_debug_fs_register(...' since the function can work or not, but
the code logic should never do something different based on this.

Signed-off-by: Anders Roxell <anders.roxell@...aro.org>
---
 drivers/firmware/efi/arm-runtime.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c
index 352bd2473162..b9ae798192d6 100644
--- a/drivers/firmware/efi/arm-runtime.c
+++ b/drivers/firmware/efi/arm-runtime.c
@@ -49,7 +49,8 @@ static int __init ptdump_init(void)
 	if (!efi_enabled(EFI_RUNTIME_SERVICES))
 		return 0;
 
-	return ptdump_debugfs_register(&efi_ptdump_info, "efi_page_tables");
+	ptdump_debugfs_register(&efi_ptdump_info, "efi_page_tables");
+	return 0;
 }
 device_initcall(ptdump_init);
 
-- 
2.20.1