Commit 4f8d7aba authored by Lasse Collin's avatar Lasse Collin Committed by Gao Xiang

lib/xz: Validate the value before assigning it to an enum variable

This might matter, for example, if the underlying type of enum xz_check
was a signed char. In such a case the validation wouldn't have caught an
unsupported header. I don't know if this problem can occur in the kernel
on any arch but it's still good to fix it because some people might copy
the XZ code to their own projects from Linux instead of the upstream
XZ Embedded repository.

This change may increase the code size by a few bytes. An alternative
would have been to use an unsigned int instead of enum xz_check but
using an enumeration looks cleaner.

Link: https://lore.kernel.org/r/20211010213145.17462-3-xiang@kernel.orgSigned-off-by: default avatarLasse Collin <lasse.collin@tukaani.org>
Signed-off-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
parent 83d3c4f2
...@@ -402,12 +402,12 @@ static enum xz_ret dec_stream_header(struct xz_dec *s) ...@@ -402,12 +402,12 @@ static enum xz_ret dec_stream_header(struct xz_dec *s)
* we will accept other check types too, but then the check won't * we will accept other check types too, but then the check won't
* be verified and a warning (XZ_UNSUPPORTED_CHECK) will be given. * be verified and a warning (XZ_UNSUPPORTED_CHECK) will be given.
*/ */
if (s->temp.buf[HEADER_MAGIC_SIZE + 1] > XZ_CHECK_MAX)
return XZ_OPTIONS_ERROR;
s->check_type = s->temp.buf[HEADER_MAGIC_SIZE + 1]; s->check_type = s->temp.buf[HEADER_MAGIC_SIZE + 1];
#ifdef XZ_DEC_ANY_CHECK #ifdef XZ_DEC_ANY_CHECK
if (s->check_type > XZ_CHECK_MAX)
return XZ_OPTIONS_ERROR;
if (s->check_type > XZ_CHECK_CRC32) if (s->check_type > XZ_CHECK_CRC32)
return XZ_UNSUPPORTED_CHECK; return XZ_UNSUPPORTED_CHECK;
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment