On Fri, May 10, 2019 at 07:18:44PM +0200, René Scharfe wrote:
> Am 09.05.19 um 20:38 schrieb Jeff King:
> > I do dream of a world where we do not have a bunch of implicit
> > conversions (both signedness but also truncation) in our code base, and
> > can compile cleanly with -Wconversion We know that this case is
> > perfectly fine, but I am sure there are many that are not. However, I'm
> > not sure if we'll ever get there, and in the meantime I don't think it's
> > worth worrying too much about individual cases like this.
>
> Here's a rough take on how to silence that warning for archive-tar.c using
> GCC 8.3. Some of the changes are worth polishing and submitting. Some
> are silly. The one for regexec_buf() is scary; I don't see a clean way of
> dealing with that size_t to int conversion.
This is actually slightly less tedious than I had imagined it to be, but
still pretty bad. I dunno. If somebody wants to tackle it, I do think it
would make the world a better place. But I'm not sure if it is worth the
effort involved.
> static void write_trailer(void)
> {
> - int tail = BLOCKSIZE - offset;
> + size_t tail = BLOCKSIZE - offset;
These kinds of int/size_t conversions are the ones I think are the most
valuable (because the size_t's are often used to allocate or access
arrays, and truncated or negative values there can cause other security
problems). _Most_ of them are harmless, of course, but it's hard to
separate the important ones from the mundane.
> @@ -414,7 +432,7 @@ static int git_tar_config(const char *var, const char *value, void *cb)
> tar_umask = umask(0);
> umask(tar_umask);
> } else {
> - tar_umask = git_config_int(var, value);
> + tar_umask = (mode_t)git_config_ulong(var, value);
> }
It's nice that the cast here shuts up the compiler, and I agree it is
not likely to be a problem in this instance. But we'd probably want some
kind of "safe cast" helper. To some degree, if you put 2^64-1 in your
"umask" value you get what you deserve, but it would be nice if we could
detect such nonsense (less for this case, but more for others where we
do cast).
> @@ -1119,7 +1119,22 @@ static inline int regexec_buf(const regex_t *preg, const char *buf, size_t size,
> {
> assert(nmatch > 0 && pmatch);
> pmatch[0].rm_so = 0;
> - pmatch[0].rm_eo = size;
> + pmatch[0].rm_eo = (regoff_t)size;
> + if (pmatch[0].rm_eo != size) {
> + if (((regoff_t)-1) < 0) {
> + if (sizeof(regoff_t) == sizeof(int))
> + pmatch[0].rm_eo = (regoff_t)INT_MAX;
> + else if (sizeof(regoff_t) == sizeof(long))
> + pmatch[0].rm_eo = (regoff_t)LONG_MAX;
> + else
> + die("unable to determine maximum value of regoff_t");
> + } else {
> + pmatch[0].rm_eo = (regoff_t)-1;
> + }
> + warning("buffer too big (%"PRIuMAX"), "
> + "will search only the first %"PRIuMAX" bytes",
> + (uintmax_t)size, (uintmax_t)pmatch[0].rm_eo);
> + }
> return regexec(preg, buf, nmatch, pmatch, eflags | REG_STARTEND);
> }
I think a helper could make things less awful here, too. Our xsize_t()
is sort of like this, but of course it dies. But I think it would be
possible to write a macro to let you do:
if (ASSIGN_CAST(pmatch[0].rm_eo, size))
warning(...);
This is definitely a rabbit-hole that I've been afraid to go down. :)
-Peff
