[PATCH] sparc64: Increase size of boot string to 1024 bytes

[PATCH] sparc64: Increase size of boot string to 1024 bytes

[Dave Kleikamp]

This is the longest boot string that silo supports.

Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Cc: Bob Picco <bob.picco@oracle.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
---
 arch/sparc/prom/bootstr_64.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/sparc/prom/bootstr_64.c b/arch/sparc/prom/bootstr_64.c
index ab9ccc6..4dac9f7 100644
--- a/arch/sparc/prom/bootstr_64.c
+++ b/arch/sparc/prom/bootstr_64.c
@@ -14,7 +14,11 @@
  *          the .bss section or it will break things.
  */
 
-#define BARG_LEN  256
+/*
+ * We limit BARG_LEN to 1024 rather than use COMMAND_LINE_SIZE because silo
+ * blindly copies however many bytes we tell it from a 1024-byte array.
+ */
+#define BARG_LEN 1024
 struct {
 	int bootstr_len;
 	int bootstr_valid;
-- 
2.1.2

Re: [PATCH] sparc64: Increase size of boot string to 1024 bytes

[David Miller]

From: Dave Kleikamp <dave.kleikamp@oracle.com>
Date: Tue, 07 Oct 2014 08:12:37 -0500

> This is the longest boot string that silo supports.
> 
> Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>

Ok, given how the rest of this thread went, the comment needs to
be adjusted to match reality which is something like:

/* We limit BARG_LEN to 1024 because this is the size of the
 * 'barg_out' command line buffer in the SILO bootloader.  And
 * it trusts bootstr_len over that buffer's size.
 */

Right?

Re: [PATCH] sparc64: Increase size of boot string to 1024 bytes

[Dave Kleikamp]

On 10/07/2014 01:57 PM, David Miller wrote:
> From: Dave Kleikamp <dave.kleikamp@oracle.com>
> Date: Tue, 07 Oct 2014 08:12:37 -0500
> 
>> This is the longest boot string that silo supports.
>>
>> Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
> 
> Ok, given how the rest of this thread went, the comment needs to
> be adjusted to match reality which is something like:
> 
> /* We limit BARG_LEN to 1024 because this is the size of the
>  * 'barg_out' command line buffer in the SILO bootloader.  And
>  * it trusts bootstr_len over that buffer's size.
>  */
> 
> Right?

I'd leave off the last sentence:

/* We limit BARG_LEN to 1024 because this is the size of the
 * 'barg_out' command line buffer in the SILO bootloader.
 */

Re: [PATCH] sparc64: Increase size of boot string to 1024 bytes

[David Miller]

From: Dave Kleikamp <dave.kleikamp@oracle.com>
Date: Tue, 07 Oct 2014 14:29:25 -0500

> I'd leave off the last sentence:
> 
> /* We limit BARG_LEN to 1024 because this is the size of the
>  * 'barg_out' command line buffer in the SILO bootloader.
>  */

Works for me.