sandbox: Move CONFIG_SYS_VSNPRINTF to Kconfig

Move this over to Kconfig and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index b44f709253ff99c054aad5d33a40b26ab7926dad..3f1401ae4d35427ce704bab845d718153e72d891 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -7,6 +7,9 @@ config SYS_ARCH
 config USE_PRIVATE_LIBGCC
        default y
 
+config SYS_VSNPRINTF
+       default y
+
 choice
        prompt "Target select"
 

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index b911c0219fab1f27c49d8b90b6a421cbd6e54867..efc020fe0c27fe91b41d01124e73f940cf3ecf8e 100644 (file)
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -18,3 +18,4 @@ CONFIG_USB_STORAGE=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_SANDBOX_GPIO=y
+CONFIG_SYS_VSNPRINTF=y

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 5ad4761c720b8bd26e99bfc09137c6629cef7a02..f714298d54698d26c1e81ba2ed01fc772cc4e747 100644 (file)
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -48,8 +48,6 @@
 #define CONFIG_CMD_FS_GENERIC
 #define CONFIG_CMD_MD5SUM
 
-#define CONFIG_SYS_VSNPRINTF
-
 #define CONFIG_CMD_GPIO
 
 #define CONFIG_CMD_GPT

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index b378f5872f9a123ac4a6aa84175358df9a657b41..9571c656be07b87c0098e67db6af80b30f5fd2f0 100644 (file)
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -16,7 +16,6 @@
  * (easy to change)
  */
 #define CONFIG_SHOW_BOOT_PROGRESS
-#define CONFIG_SYS_VSNPRINTF
 #define CONFIG_ZBOOT_32
 #define CONFIG_PHYSMEM
 #define CONFIG_DISPLAY_BOARDINFO_LATE

diff --git a/lib/Kconfig b/lib/Kconfig
index c9d2767d1da543407ffd7539eb790336dcc68632..d7fd21928db595a84bc8ce06fb566bd634e616ad 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -27,6 +27,15 @@ config SYS_HZ
          get_timer() must operate in milliseconds and this option must be
          set to 1000.
 
+config SYS_VSNPRINTF
+       bool "Enable safe version of sprintf()"
+       help
+         Since sprintf() can overflow its buffer, it is common to use
+         snprintf() instead, which knows the buffer size and can avoid
+         overflow. However, this does increase code size slightly (for
+         Thumb-2, about 420 bytes). Enable this option for safety when
+         using sprintf() with data you do not control.
+
 source lib/rsa/Kconfig
 
 menu "Hashing Support"