From: Lasse Collin Date: Mon, 7 Mar 2022 08:09:26 +0000 (+0100) Subject: xz: move s->lzma.len = 0 initialization to lzma_reset() X-Git-Tag: archive/raspbian/4.17.0-1+rpi1^2~33^2~853 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9a46de64b8e454ec02b2040265d93530ad909d9c;p=xen.git xz: move s->lzma.len = 0 initialization to lzma_reset() It's a more logical place even if the resetting needs to be done only once per LZMA2 stream (if lzma_reset() called in the middle of an LZMA2 stream, .len will already be 0). Link: https://lore.kernel.org/r/20211010213145.17462-4-xiang@kernel.org Signed-off-by: Lasse Collin Signed-off-by: Gao Xiang Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git a98a25408b0e Signed-off-by: Jan Beulich Reviewed-by: Luca Fancellu Acked-by: Andrew Cooper --- diff --git a/xen/common/xz/dec_lzma2.c b/xen/common/xz/dec_lzma2.c index 3b60191ee6..027ca93ce9 100644 --- a/xen/common/xz/dec_lzma2.c +++ b/xen/common/xz/dec_lzma2.c @@ -791,6 +791,7 @@ static void __init lzma_reset(struct xz_dec_lzma2 *s) s->lzma.rep1 = 0; s->lzma.rep2 = 0; s->lzma.rep3 = 0; + s->lzma.len = 0; /* * All probabilities are initialized to the same value. This hack @@ -1174,8 +1175,6 @@ XZ_EXTERN enum xz_ret __init xz_dec_lzma2_reset(struct xz_dec_lzma2 *s, uint8_t } } - s->lzma.len = 0; - s->lzma2.sequence = SEQ_CONTROL; s->lzma2.need_dict_reset = true;