From patchwork Sat Nov 16 01:34:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 11247409 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A9A79930 for ; Sat, 16 Nov 2019 01:34:43 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7758D2073C for ; Sat, 16 Nov 2019 01:34:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="FDpMyLZs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7758D2073C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 511506B0008; Fri, 15 Nov 2019 20:34:42 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 4C1FC6B000A; Fri, 15 Nov 2019 20:34:42 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3B06D6B000C; Fri, 15 Nov 2019 20:34:42 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0197.hostedemail.com [216.40.44.197]) by kanga.kvack.org (Postfix) with ESMTP id 265BB6B0008 for ; Fri, 15 Nov 2019 20:34:42 -0500 (EST) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with SMTP id D47DA180AD830 for ; Sat, 16 Nov 2019 01:34:41 +0000 (UTC) X-FDA: 76160421162.03.waves95_bddc3d66da3a X-Spam-Summary: 2,0,0,22d8d393b2a06c3c,d41d8cd98f00b204,akpm@linux-foundation.org,:akpm@linux-foundation.org:danielwa@cisco.com:lasse.collin@tukaani.org::mm-commits@vger.kernel.org:torvalds@linux-foundation.org:yisi@cisco.com:yusun2@cisco.com,RULES_HIT:41:355:379:800:960:966:967:973:988:989:1260:1263:1345:1381:1431:1437:1534:1541:1711:1714:1730:1747:1777:1792:2196:2199:2393:2525:2559:2563:2682:2685:2859:2902:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3351:3865:3867:3874:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:4385:5007:6261:6653:7576:8599:8603:9025:9545:10004:10913:11026:11473:11658:11914:12043:12048:12296:12297:12517:12519:12555:12679:12783:12986:13069:13221:13229:13311:13357:13846:14181:14384:14721:14849:21080:21451:21627:21939:30012:30054:30064:30091,0,RBL:error,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:25,LUA_SUMMARY:none X-HE-Tag: waves95_bddc3d66da3a X-Filterd-Recvd-Size: 2385 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf49.hostedemail.com (Postfix) with ESMTP for ; Sat, 16 Nov 2019 01:34:41 +0000 (UTC) Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 678602073B; Sat, 16 Nov 2019 01:34:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573868080; bh=DYaSZyQyZSNoMO5Ozbzw//MIE/QIU1Lz0iSwd/GTOZ8=; h=Date:From:To:Subject:From; b=FDpMyLZsvfFnZsT4RIqqXemX2WbIEXct87ajZ5vVrR5zpar3EjrG1S0XmdsYdqBMC N6D2lYKQQGc7qoJVJ3opUCaGrwXGM6IRaIezM3Cjf4vcnB2L/8pPf6UmEEVXrbf5cw htuBmjFRu8shKxQcboLPiPhT+1kws2N+i8otv+7Y= Date: Fri, 15 Nov 2019 17:34:39 -0800 From: akpm@linux-foundation.org To: akpm@linux-foundation.org, danielwa@cisco.com, lasse.collin@tukaani.org, linux-mm@kvack.org, mm-commits@vger.kernel.org, torvalds@linux-foundation.org, yisi@cisco.com, yusun2@cisco.com Subject: [patch 03/11] lib/xz: fix XZ_DYNALLOC to avoid useless memory reallocations Message-ID: <20191116013439.KBuh9ZTdq%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Lasse Collin 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 Reported-by: Yu Sun Acked-by: Daniel Walker Cc: "Yixia Si (yisi)" Signed-off-by: Andrew Morton --- lib/xz/xz_dec_lzma2.c | 1 + 1 file changed, 1 insertion(+) --- 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) {