| Message ID | b57caaaed2bd127fe656e6c145970ed6a05c0125.1372515621.git.yann.morin.1998@free.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Jun 29, 2013 at 4:21 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote: > From: Kees Cook <keescook@chromium.org> > > The parsing routines for Kconfig files use strtol(), but store and > render values as int. Switch types and formating to long to support a > wider range of values. For example, 0x80000000 wasn't representable. 0x80000000 does fit in an int. If it's printed as hex, it's treated as unsigned. Is there a "0" missing, or am I missing something? > Signed-off-by: Kees Cook <keescook@chromium.org> > Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > --- > scripts/kconfig/symbol.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c > index 387d554..d550300 100644 > --- a/scripts/kconfig/symbol.c > +++ b/scripts/kconfig/symbol.c > @@ -136,7 +136,7 @@ static struct property *sym_get_range_prop(struct symbol *sym) > return NULL; > } > > -static int sym_get_range_val(struct symbol *sym, int base) > +static long sym_get_range_val(struct symbol *sym, int base) > { > sym_calc_value(sym); > switch (sym->type) { Changing all these "int" to "long" only matters on 64-bit platforms. As kconfig is built on the host, this will cause different behavior when cross-compiling 64-bit (I assume that's where you need it most) kernels on a 32-bit or a 64-bit host. Probably you wanted to use "long long" instead of "long", and switch to "strtoll()", to make them always 64-bit? Still, beware using 64-bit config symbols with arithmetic shell operations from a Makefile, cfr. https://lkml.org/lkml/2013/6/13/200. Sorry for only noticing now, after it went into 3.11-rc1. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Jul 18, 2013 at 3:08 AM, Geert Uytterhoeven <geert@linux-m68k.org> wrote: > On Sat, Jun 29, 2013 at 4:21 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote: >> From: Kees Cook <keescook@chromium.org> >> >> The parsing routines for Kconfig files use strtol(), but store and >> render values as int. Switch types and formating to long to support a >> wider range of values. For example, 0x80000000 wasn't representable. > > 0x80000000 does fit in an int. If it's printed as hex, it's treated as unsigned. > Is there a "0" missing, or am I missing something? 0x80000000 is 1 more than INT_MAX, but you're right about the hex printing. Regardless, it was still being truncated in kconfig (probably due to signed comparisons). I had to switch the formatting since the type changed, though. >> Signed-off-by: Kees Cook <keescook@chromium.org> >> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> >> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> >> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> >> --- >> scripts/kconfig/symbol.c | 10 +++++----- >> 1 file changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c >> index 387d554..d550300 100644 >> --- a/scripts/kconfig/symbol.c >> +++ b/scripts/kconfig/symbol.c >> @@ -136,7 +136,7 @@ static struct property *sym_get_range_prop(struct symbol *sym) >> return NULL; >> } >> >> -static int sym_get_range_val(struct symbol *sym, int base) >> +static long sym_get_range_val(struct symbol *sym, int base) >> { >> sym_calc_value(sym); >> switch (sym->type) { > > Changing all these "int" to "long" only matters on 64-bit platforms. > As kconfig is built on the host, this will cause different behavior when > cross-compiling 64-bit (I assume that's where you need it most) kernels > on a 32-bit or a 64-bit host. > > Probably you wanted to use "long long" instead of "long", and switch > to "strtoll()", to make them always 64-bit? That's an excellent point; I hadn't considered the cross-compiling from a 32-bit host. > Still, beware using 64-bit config symbols with arithmetic shell operations from > a Makefile, cfr. https://lkml.org/lkml/2013/6/13/200. Yeah, noted. I don't have plans to pass kconfig items through the shell. > Sorry for only noticing now, after it went into 3.11-rc1. Thanks for pointing it out! I don't think there is huge urgency since nothing is (yet) using > INT_MAX values in kconfig. Regardless, I'll send a new patch that switches to long long. -Kees -- Kees Cook Chrome OS Security -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index 387d554..d550300 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c @@ -136,7 +136,7 @@ static struct property *sym_get_range_prop(struct symbol *sym) return NULL; } -static int sym_get_range_val(struct symbol *sym, int base) +static long sym_get_range_val(struct symbol *sym, int base) { sym_calc_value(sym); switch (sym->type) { @@ -155,7 +155,7 @@ static int sym_get_range_val(struct symbol *sym, int base) static void sym_validate_range(struct symbol *sym) { struct property *prop; - int base, val, val2; + long base, val, val2; char str[64]; switch (sym->type) { @@ -179,9 +179,9 @@ static void sym_validate_range(struct symbol *sym) return; } if (sym->type == S_INT) - sprintf(str, "%d", val2); + sprintf(str, "%ld", val2); else - sprintf(str, "0x%x", val2); + sprintf(str, "0x%lx", val2); sym->curr.val = strdup(str); } @@ -594,7 +594,7 @@ bool sym_string_valid(struct symbol *sym, const char *str) bool sym_string_within_range(struct symbol *sym, const char *str) { struct property *prop; - int val; + long val; switch (sym->type) { case S_STRING: