[PATCH] ARM:boot: support the command with COMMAND_LINE_SIZE - 1 useful chars
Chen Gang
gang.chen at asianux.com
Wed Jan 30 07:32:21 EST 2013
originally, not support the command with COMMAND_LINE_SIZE - 1 useful chars.
but in fact, we can support it:
Signed-off-by: Chen Gang <gang.chen at asianux.com>
---
arch/arm/boot/compressed/atags_to_fdt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/compressed/atags_to_fdt.c b/arch/arm/boot/compressed/atags_to_fdt.c
index aabc02a..ed23ec2 100644
--- a/arch/arm/boot/compressed/atags_to_fdt.c
+++ b/arch/arm/boot/compressed/atags_to_fdt.c
@@ -63,7 +63,7 @@ static void merge_fdt_bootargs(void *fdt, const char *fdt_cmdline)
/* copy the fdt command line into the buffer */
fdt_bootargs = getprop(fdt, "/chosen", "bootargs", &len);
if (fdt_bootargs)
- if (len < COMMAND_LINE_SIZE) {
+ if (len <= COMMAND_LINE_SIZE) {
memcpy(ptr, fdt_bootargs, len);
/* len is the length of the string
* including the NULL terminator */
@@ -73,7 +73,7 @@ static void merge_fdt_bootargs(void *fdt, const char *fdt_cmdline)
/* and append the ATAG_CMDLINE */
if (fdt_cmdline) {
len = strlen(fdt_cmdline);
- if (ptr - cmdline + len + 2 < COMMAND_LINE_SIZE) {
+ if (ptr - cmdline + len + 2 <= COMMAND_LINE_SIZE) {
*ptr++ = ' ';
memcpy(ptr, fdt_cmdline, len);
ptr += len;
--
1.7.10.4
More information about the linux-arm-kernel
mailing list