Skip to contentSkip to conversation

support/kconfig: fix compiler warnings by increasing buffer sizes

PATCH New Mark Corbin 2 participants 3 messages Aug 1, 2019 – Aug 2, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 support/kconfig: fix compiler warnings by increasing buffer sizes

When compiling kconfig with host gcc 8.3.0 several compiler '-Wformat-overflow=' warnings are generated. This is due to a number of temporary buffers used by sprintf being too small. The sizes of these buffers have been increased to remove the warnings.

---
 support/kconfig/confdata.c | 4 ++--
 support/kconfig/util.c     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
support/kconfig/confdata.c +2 -2
index 892da74fdc..6f40588a89 100644
@@ -744,7 +744,7 @@ int conf_write(const char *name)
 	struct menu *menu;
 	const char *basename;
 	const char *str;
-	char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1];
+	char dirname[PATH_MAX+1], tmpname[PATH_MAX+23], newname[PATH_MAX+1];
 	char *env;
 
 	if (!name)
@@ -974,7 +974,7 @@ int conf_write_autoconf(void)
 	const char *name;
 	FILE *out, *tristate, *out_h;
 	int i;
-	char dir[PATH_MAX+1], buf[PATH_MAX+1];
+	char dir[PATH_MAX+1], buf[PATH_MAX+20];
 	char *s;
 
 	strcpy(dir, conf_get_configname());
support/kconfig/util.c +1 -1
index 18a8e52391..d051fbea13 100644
@@ -35,7 +35,7 @@ struct file *file_lookup(const char *name)
 int file_write_dep(const char *name)
 {
 	char *str;
-	char buf[PATH_MAX+1], buf2[PATH_MAX+1], dir[PATH_MAX+1];
+	char buf[PATH_MAX+13], buf2[PATH_MAX+1], dir[PATH_MAX+1];
 	struct symbol *sym, *env_sym;
 	struct expr *e;
 	struct file *file;
Signature · 1 line
2.19.1
#1 lore raw

PATCH 1/1 support/kconfig: fix compiler warnings by increasing buffer sizes

Hello,

Quoted 11 lines · On Thu, 1 Aug 2019 16:20:05 +0100 Mark Corbin <[email protected]> wrote:

When compiling kconfig with host gcc 8.3.0 several compiler '-Wformat-overflow=' warnings are generated. This is due to a number of temporary buffers used by sprintf being too small. The sizes of these buffers have been increased to remove the warnings.

---
 support/kconfig/confdata.c | 4 ++--
 support/kconfig/util.c     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

This was fixed in upstream Linux by commit 2ae89c7a82ea9d81a19b4fc2df23bef4b112f24e, which is part of Linux since 4.18. Our kconfig code base is based on 4.17-rc2, so the best thing is to update our kconfig code base, to re-use the fixes from the kernel.

Could you do this ? Be careful that patches in support/kconfig/patches/ need to be refreshed and re-applied on top of the kernel kconfig code base.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 support/kconfig: fix compiler warnings by increasing buffer sizes

Hello Thomas

Quoted 16 lines · Thomas Petazzoni

Hello,

Quoted 11 lines · On Thu, 1 Aug 2019 16:20:05 +0100 Mark Corbin <[email protected]> wrote:

When compiling kconfig with host gcc 8.3.0 several compiler '-Wformat-overflow=' warnings are generated. This is due to a number of temporary buffers used by sprintf being too small. The sizes of these buffers have been increased to remove the warnings.

---
 support/kconfig/confdata.c | 4 ++--
 support/kconfig/util.c     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
Quoted 8 lines

This was fixed in upstream Linux by commit 2ae89c7a82ea9d81a19b4fc2df23bef4b112f24e, which is part of Linux since 4.18. Our kconfig code base is based on 4.17-rc2, so the best thing is to update our kconfig code base, to re-use the fixes from the kernel.

Could you do this ? Be careful that patches in support/kconfig/patches/ need to be refreshed and re-applied on top of the kernel kconfig code base.

I can take a look at this if I get some time.

Regards

Mark

Signature · 3 lines
Mark Corbin
Embecosm Ltd.
https://www.embecosm.com