[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <4EAC0394.5000807@intra2net.com>
Date: Sat, 29 Oct 2011 15:45:56 +0200
From: Thomas Jarosch <thomas.jarosch@...ra2net.com>
To: Ralf Baechle <ralf@...ux-mips.org>
CC: linux-mips@...ux-mips.org, linux-kernel@...r.kernel.org
Subject: [PATCH] Fix off-by-two in arcs_cmdline buffer size check
Cause is a misplaced bracket.
The code
strlen(buf+1)
will be two bytes less than
strlen(buf)+1
The +1 is in this code to reserve space for an additional space character.
Signed-off-by: Thomas Jarosch <thomas.jarosch@...ra2net.com>
---
arch/mips/pmc-sierra/yosemite/prom.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/mips/pmc-sierra/yosemite/prom.c b/arch/mips/pmc-sierra/yosemite/prom.c
index cf4c868..a6d5eb3 100644
--- a/arch/mips/pmc-sierra/yosemite/prom.c
+++ b/arch/mips/pmc-sierra/yosemite/prom.c
@@ -102,7 +102,7 @@ void __init prom_init(void)
/* Get the boot parameters */
for (i = 1; i < argc; i++) {
- if (strlen(arcs_cmdline) + strlen(arg[i] + 1) >=
+ if (strlen(arcs_cmdline) + strlen(arg[i]) + 1 >=
sizeof(arcs_cmdline))
break;
--
1.7.6.4
--
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/
Powered by blists - more mailing lists