[source] uboot-lantiq/spl: fixed uninitialized variable len in spl_uncompress_lzo

LEDE Commits lede-commits at lists.infradead.org
Wed May 31 00:55:15 PDT 2017


blogic pushed a commit to source.git, branch master:
https://git.lede-project.org/d189fe62cd506229288bb01ebce08492f27a308d

commit d189fe62cd506229288bb01ebce08492f27a308d
Author: Martin Schiller <ms at dev.tdt.de>
AuthorDate: Fri May 26 10:47:18 2017 +0200

    uboot-lantiq/spl: fixed uninitialized variable len in spl_uncompress_lzo
    
    This fix is taken from uboot-lantiq v2014.07 (Daniel Schwierzeck)
    
    Signed-off-by: Martin Schiller <ms at dev.tdt.de>
---
 .../patches/0014-MIPS-add-support-for-Lantiq-XWAY-SoCs.patch      | 8 +++++---
 ...015-MIPS-lantiq-add-support-for-Lantiq-XWAY-ARX100-SoC-f.patch | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/package/boot/uboot-lantiq/patches/0014-MIPS-add-support-for-Lantiq-XWAY-SoCs.patch b/package/boot/uboot-lantiq/patches/0014-MIPS-add-support-for-Lantiq-XWAY-SoCs.patch
index 8f35576..cb695ffe3 100644
--- a/package/boot/uboot-lantiq/patches/0014-MIPS-add-support-for-Lantiq-XWAY-SoCs.patch
+++ b/package/boot/uboot-lantiq/patches/0014-MIPS-add-support-for-Lantiq-XWAY-SoCs.patch
@@ -1419,7 +1419,7 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
 +
 +static int spl_uncompress_lzo(struct spl_image *spl, unsigned long loadaddr)
 +{
-+	size_t len;
++	size_t len = CONFIG_SYS_LOAD_SIZE;
 +	int ret;
 +
 +	spl_puts("SPL: decompressing U-Boot with LZO\n");
@@ -3237,7 +3237,7 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
 +}
 --- /dev/null
 +++ b/arch/mips/include/asm/arch-danube/config.h
-@@ -0,0 +1,163 @@
+@@ -0,0 +1,164 @@
 +/*
 + * Copyright (C) 2007-2010 Lantiq Deutschland GmbH
 + * Copyright (C) 2011-2013 Daniel Schwierzeck, daniel.schwierzeck at gmail.com
@@ -3296,6 +3296,7 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
 +#define CONFIG_SYS_MEMTEST_START	0x81000000
 +#define CONFIG_SYS_MEMTEST_END		0x82000000
 +#define CONFIG_SYS_LOAD_ADDR		0x81000000
++#define CONFIG_SYS_LOAD_SIZE		(2 * 1024 * 1024)
 +#define CONFIG_SYS_INIT_SP_OFFSET	0x4000
 +
 +/* SRAM */
@@ -3475,7 +3476,7 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
 +#endif /* __DANUBE_SOC_H__ */
 --- /dev/null
 +++ b/arch/mips/include/asm/arch-vrx200/config.h
-@@ -0,0 +1,187 @@
+@@ -0,0 +1,188 @@
 +/*
 + * Copyright (C) 2010 Lantiq Deutschland GmbH
 + * Copyright (C) 2011-2013 Daniel Schwierzeck, daniel.schwierzeck at gmail.com
@@ -3546,6 +3547,7 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
 +#define CONFIG_SYS_MEMTEST_START	0x81000000
 +#define CONFIG_SYS_MEMTEST_END		0x82000000
 +#define CONFIG_SYS_LOAD_ADDR		0x81000000
++#define CONFIG_SYS_LOAD_SIZE		(2 * 1024 * 1024)
 +#define CONFIG_SYS_INIT_SP_OFFSET	(32 * 1024)
 +
 +/* SRAM */
diff --git a/package/boot/uboot-lantiq/patches/0015-MIPS-lantiq-add-support-for-Lantiq-XWAY-ARX100-SoC-f.patch b/package/boot/uboot-lantiq/patches/0015-MIPS-lantiq-add-support-for-Lantiq-XWAY-ARX100-SoC-f.patch
index acda83c..a12d2eb 100644
--- a/package/boot/uboot-lantiq/patches/0015-MIPS-lantiq-add-support-for-Lantiq-XWAY-ARX100-SoC-f.patch
+++ b/package/boot/uboot-lantiq/patches/0015-MIPS-lantiq-add-support-for-Lantiq-XWAY-ARX100-SoC-f.patch
@@ -903,7 +903,7 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
  #define STATUS_LANTIQ		(STATUS_MIPS34K | STATUS_MIPS32_64)
 --- /dev/null
 +++ b/arch/mips/include/asm/arch-arx100/config.h
-@@ -0,0 +1,175 @@
+@@ -0,0 +1,176 @@
 +/*
 + * Copyright (C) 2007-2010 Lantiq Deutschland GmbH
 + * Copyright (C) 2011-2013 Daniel Schwierzeck, daniel.schwierzeck at gmail.com
@@ -967,6 +967,7 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
 +#define CONFIG_SYS_MEMTEST_START	0x81000000
 +#define CONFIG_SYS_MEMTEST_END		0x82000000
 +#define CONFIG_SYS_LOAD_ADDR		0x81000000
++#define CONFIG_SYS_LOAD_SIZE		(2 * 1024 * 1024)
 +#define CONFIG_SYS_INIT_SP_OFFSET	(32 * 1024)
 +
 +/* SRAM */



More information about the lede-commits mailing list