diff mbox series

[03/11] lib/xz: fix XZ_DYNALLOC to avoid useless memory reallocations

Message ID 20191116013439.KBuh9ZTdq%akpm@linux-foundation.org (mailing list archive)
State New, archived
Headers show
Series [01/11] mm: mempolicy: fix the wrong return value and potential pages leak of mbind | expand

Commit Message

Andrew Morton Nov. 16, 2019, 1:34 a.m. UTC 
From: Lasse Collin <lasse.collin@tukaani.org>
Subject: lib/xz: fix XZ_DYNALLOC to avoid useless memory reallocations

s->dict.allocated was initialized to 0 but never set after a successful
allocation, thus the code always thought that the dictionary buffer has to
be reallocated.

Link: http://lkml.kernel.org/r/20191104185107.3b6330df@tukaani.org
Signed-off-by: Lasse Collin <lasse.collin@tukaani.org>
Reported-by: Yu Sun <yusun2@cisco.com>
Acked-by: Daniel Walker <danielwa@cisco.com>
Cc: "Yixia Si (yisi)" <yisi@cisco.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 lib/xz/xz_dec_lzma2.c |    1 +
 1 file changed, 1 insertion(+)
diff mbox series

Patch

--- a/lib/xz/xz_dec_lzma2.c~lib-xz-fix-xz_dynalloc-to-avoid-useless-memory-reallocations
+++ a/lib/xz/xz_dec_lzma2.c
@@ -1146,6 +1146,7 @@  XZ_EXTERN enum xz_ret xz_dec_lzma2_reset
 
 		if (DEC_IS_DYNALLOC(s->dict.mode)) {
 			if (s->dict.allocated < s->dict.size) {
+				s->dict.allocated = s->dict.size;
 				vfree(s->dict.buf);
 				s->dict.buf = vmalloc(s->dict.size);
 				if (s->dict.buf == NULL) {