* [PATCH] ARM:boot: support the command with COMMAND_LINE_SIZE - 1 useful chars
@ 2013-01-30 12:32 Chen Gang
2013-01-30 15:40 ` Richard GENOUD
0 siblings, 1 reply; 3+ messages in thread
From: Chen Gang @ 2013-01-30 12:32 UTC (permalink / raw)
To: linux-arm-kernel
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@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
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH] ARM:boot: support the command with COMMAND_LINE_SIZE - 1 useful chars
2013-01-30 12:32 [PATCH] ARM:boot: support the command with COMMAND_LINE_SIZE - 1 useful chars Chen Gang
@ 2013-01-30 15:40 ` Richard GENOUD
2013-02-01 1:13 ` Chen Gang
0 siblings, 1 reply; 3+ messages in thread
From: Richard GENOUD @ 2013-01-30 15:40 UTC (permalink / raw)
To: linux-arm-kernel
On [mer., 30.01.2013 20:32:21], Chen Gang wrote:
>
> originally, not support the command with COMMAND_LINE_SIZE - 1 useful chars.
> but in fact, we can support it:
>
You're right.
Reviewed-by: Richard Genoud <richard.genoud@gmail.com>
> Signed-off-by: Chen Gang <gang.chen@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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-02-01 1:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-30 12:32 [PATCH] ARM:boot: support the command with COMMAND_LINE_SIZE - 1 useful chars Chen Gang
2013-01-30 15:40 ` Richard GENOUD
2013-02-01 1:13 ` Chen Gang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox