linux-kernel - [PATCH] x86: OLPC: some olpc-detection cleanups

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>] [day] [month] [year] [list]

Message-ID: <20100923173105.10fb92d1@debxo>
Date:	Thu, 23 Sep 2010 17:31:05 -0700
From:	Andres Salomon <dilinger@...ued.net>
To:	hpa@...or.com
Cc:	linux-kernel@...r.kernel.org, dsd@...top.org, tglx@...utronix.de,
	mingo@...hat.com, x86@...nel.org
Subject: [PATCH] x86: OLPC: some olpc-detection cleanups

Following up on dsd's cleanups (3e3c4860), address some minor nits:

 - rename check_ofw_arch to olpc_check_arch (as we're checking for OLPC)
 - add a comment describing why we're checking..
 - use sizeof(array) rather than hardcoding the size
 - sprinkle some parens around

Signed-off-by: Andres Salomon <dilinger@...ued.net>
---
 arch/x86/kernel/olpc.c |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/olpc.c b/arch/x86/kernel/olpc.c
index 37c4993..361c2e0 100644
--- a/arch/x86/kernel/olpc.c
+++ b/arch/x86/kernel/olpc.c
@@ -183,18 +183,25 @@ err:
 }
 EXPORT_SYMBOL_GPL(olpc_ec_cmd);
 
-static bool __init check_ofw_architecture(void)
+/*
+ * Simply because OFW has been detected does not mean that the machine is
+ * an OLPC device; this ensures that OFW's "/architecture" property is set
+ * to "OLPC".
+ */
+static bool __init olpc_check_architecture(void)
 {
 	size_t propsize;
 	char olpc_arch[5];
-	const void *args[] = { NULL, "architecture", olpc_arch, (void *)5 };
+	const void *args[] = { NULL, "architecture", olpc_arch,
+			(void *)sizeof(olpc_arch) };
 	void *res[] = { &propsize };
 
 	if (olpc_ofw("getprop", args, res)) {
 		printk(KERN_ERR "ofw: getprop call failed!\n");
 		return false;
 	}
-	return propsize == 5 && strncmp("OLPC", olpc_arch, 5) == 0;
+	return (propsize == sizeof(olpc_arch)) &&
+			(strncmp("OLPC", olpc_arch, sizeof(olpc_arch)) == 0);
 }
 
 static u32 __init get_board_revision(void)
@@ -213,7 +220,7 @@ static u32 __init get_board_revision(void)
 
 static bool __init platform_detect(void)
 {
-	if (!check_ofw_architecture())
+	if (!olpc_check_architecture())
 		return false;
 	olpc_platform_info.flags |= OLPC_F_PRESENT;
 	olpc_platform_info.boardrev = get_board_revision();
-- 
1.5.6.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/