From patchwork Fri Nov 19 10:23:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12628623 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89D5EC433F5 for ; Fri, 19 Nov 2021 10:23:16 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 42F9D61B97 for ; Fri, 19 Nov 2021 10:23:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 42F9D61B97 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.227741.394014 (Exim 4.92) (envelope-from ) id 1mo12x-0004p7-I3; Fri, 19 Nov 2021 10:23:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 227741.394014; Fri, 19 Nov 2021 10:23:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mo12x-0004p0-EN; Fri, 19 Nov 2021 10:23:07 +0000 Received: by outflank-mailman (input) for mailman id 227741; Fri, 19 Nov 2021 10:23:06 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mo12w-0004k5-6H for xen-devel@lists.xenproject.org; Fri, 19 Nov 2021 10:23:06 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id aec93a50-4922-11ec-9787-a32c541c8605; Fri, 19 Nov 2021 11:23:05 +0100 (CET) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03lp2055.outbound.protection.outlook.com [104.47.8.55]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-37-iWGrbT8jPouzRdHVT6wxsw-2; Fri, 19 Nov 2021 11:23:03 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB5168.eurprd04.prod.outlook.com (2603:10a6:803:56::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.22; Fri, 19 Nov 2021 10:23:03 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898%3]) with mapi id 15.20.4713.022; Fri, 19 Nov 2021 10:23:03 +0000 Received: from [10.156.60.236] (37.24.206.209) by AS8P251CA0017.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:2f2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19 via Frontend Transport; Fri, 19 Nov 2021 10:23:02 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: aec93a50-4922-11ec-9787-a32c541c8605 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1637317385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SFdBl4oly+v5EDzv1v3dC+TsVpDheb1hphiY7sT/fCc=; b=hXXqJR9cXAgsoMrY81CfjfTLdBbACqBSKOqY+JVarD4n/SxsaIBedd0eN+H+7tAzdL1/sF UFwRHm/6xalBIrEYEdGuQoCnXH3Ukv+QueD6OE22RVagXeR5uvrBCCYv0DU/6qLrGo7O2a ARpEw2KUgFa9ul45nl8ZVDz4Zd/IXK0= X-MC-Unique: iWGrbT8jPouzRdHVT6wxsw-2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dNemgzmkMLSJ/oACIcUgMxygPlisTFMU7uqhl2l3UArf+sfT6JwQaSKkL/82ThjkcTQpNteLC0+6jVn31IVTzF+X/7hPClkYwkUX+Q3zDJqdi0Bfb9BthWftILihR8O8bApPYxbvHadr0v1lberaD0Rh5mzNshCF97EqffpQvr5927a5AmyF0OnZ6srGUmieZa4wvk1NGqWNuQXAjyRrsiNMxKAduPddFlDNS5vQBbDD1zNUFAKaNBixo6OqF/Hx3S4xu9oApvv8ZNpAD35zUgabcf3nohyBC9Dg0ojwdaBsbsFQ6UEI9Io+b/2szFlisF+1aLSuXei8WnYn92hmAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SFdBl4oly+v5EDzv1v3dC+TsVpDheb1hphiY7sT/fCc=; b=mSL+a6A11WVESi64NgWk9HhsWhscKAoq2jIYgAmxGpR+hn2FF+faD31rWps0WStLSINnmnQ6P57G79xZSd/5GMEBB4K581LRIku8NfhtyQhG4OFVovRK5bQuWNWXpRc7ygCNWxArlVDm+xl++Ic5O3OT0znYOZ8ZgsmQ9zIE8AJ7lqLopUOLyAn8tUStXh1s94iPMur3BwSLJmb/pu07XgG2Q74ROM1Di7w4jDB+YHWsoU6RJrJkxB25naYSdKjsInt7on+JrEl8gH3b5vH3r9PayyisYIDAxOYErmRuqV1xgFT6g4YDAojMOGzs4w34mj3G2BZKphNgAzCDMHlkVw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Fri, 19 Nov 2021 11:23:02 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: [PATCH 6/7] xz: move s->lzma.len = 0 initialization to lzma_reset() Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Ian Jackson , Julien Grall , Stefano Stabellini , Wei Liu References: In-Reply-To: X-ClientProxiedBy: AS8P251CA0017.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:2f2::30) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 47676349-3ed7-4dd0-2313-08d9ab4691a8 X-MS-TrafficTypeDiagnostic: VI1PR04MB5168: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:113; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o6Ve08ZqwddAUZnt8LUF6/sDPpgDmdVgiI1iiGI9kh6WJPEgm6JDFxjBNESYevFRCKxd+orWtLs9WawITiilp0AVa3tVftd07QPj6C+q5AkNmfU56MPW1Vyn39In+kapCdk+Vrz3wJYoEYkqmwg9Ule4iys6QCDgBLalNuis/Dpkqgx0jYYAEmmCHK6/7q30Q2XbTO7mkOWpFn2YrhEIZ4jtzzM39Cj17Pz4dIJBXD2ruYCFCwZYH8yNxNBQX3+y8pVQtg2y2LkGUp8SSKw1Qqw/B9XFnUsq4QgkXreBdKAzsHyigXYzRYjy//mvDK2GV+vuDayQk+ZRDBiytFIIAkFdt3mjoCyJPwVxWM3JeteH9EEFKCj5kmpZIt952UCnZYv9T1KrBE4zBkHSVU6YCJX/QAwvMHFR83zYGcidvENkYU2bwrxIWiGq7riWwGORae6cJc3g7VzdhcNiqsn2x0i4OUOyunfR4mtv4+FF/wdzK7J8bIDX057PgItIYH/SHX6apZX4vsJToof/qHQwLoInurH+8b6ITVMblBcB1JlVyUU82OVma8mxDfpDBZ1GAFk6qeHNm/5t7MHlariLO7I2Z6vtCGe9X9jPkbK+s3630ZD5MSkcDkpjPe+SGr9DudNeGArk46khMsWxHT9TshdFG+xJbpIqFm66KawkNOCjqK3m1BZrJmWcOF3mqKlZpi7Is2REDk/e5vI0PMVMpG2Ts2CA1T+kvnRe061LhvUfoS/OCF1nZX+HSqt5EkdTGlbfQfC9oNn3owxQv4P7TwBQGCVyACnHmXubC3OqvdGo83es1yhz6TksaqpXiw7a X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(4744005)(6916009)(38100700002)(66946007)(316002)(6486002)(16576012)(8676002)(966005)(86362001)(31696002)(2906002)(186003)(956004)(5660300002)(2616005)(4326008)(66556008)(54906003)(8936002)(26005)(66476007)(508600001)(31686004)(36756003)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?FWnrbZirRefUkmTEQTN5jcj3et5F?= =?utf-8?q?eiMTSCz9fJQHfLEDnSXmLyRzM4q16zdPDIeLJyqpFuQFTeuRcP/GH53rdjzAXjz0s?= =?utf-8?q?tj5Lnurd64DkN0nCTqMDo5WbLcZ98TxHQaBkJpe1mjISHbzMt+oluCha2+D1CvOF4?= =?utf-8?q?lfwMaQRaksEQZV2/w64aL/wexJ8EpvXkDQV8Odb0Ydf/UBevBIu18p0Doq6dzy8Kf?= =?utf-8?q?BcRp7fbP2PVH1XIngyaiqtgwu5cgTABPfDPfErUpq3/iH5TTQXbpRAl7BT6ub90Jz?= =?utf-8?q?w+BiLu4tx9NTDF7n5g7jfcLtZgrimbafTQnaJA06V2MwRAAE6fHhj8hRYGyIrcbCi?= =?utf-8?q?IAW396Pg5O1BQvEQPK+iLl4ait+BXC2UiDVWq8pijQDbC9Jp7gjI4h/h6uK6c26Ae?= =?utf-8?q?zsYJ9nsTiXvl5nBGjLWHtn78HGTNQVzE3BAHvr1pRpwJKwyYNMMrOillrJq3Zn97U?= =?utf-8?q?RZr1C/T/QuH8R4f5sssIMBBQd7PsWeiDlpJpO2ylR/A+TeezmYLjVphFa3rXpkad/?= =?utf-8?q?6WCl7ecLuaY4uStndDex9tK/MMBD2etkcZkBkIpnYYXDaG5kt72UY2PV7yzeoIIQB?= =?utf-8?q?sBfrq0/nXN0GQ3tFJqHDmXD9DC5JvqOjB0HW1zCdGEh9Wk3I2ONqjmkTq+5kBembc?= =?utf-8?q?N83TxCAzVPDhsjScTh59eGF43tFqNXd48AHvCRCklG9ed5P37Du/fRDhK9DkiTGGb?= =?utf-8?q?R4K89ytlJJFY5u+hjE88PxsC00DCTphFlnYCheUyV084M11qAeRh8lAdlM7QsHnEy?= =?utf-8?q?tIuYzRSWfw08m8qyL4ww1qAuqCLMT+gmfasc/N6KNr6CCV5HsRiTWuRqM7af5zGR/?= =?utf-8?q?5bTO/0btLHX9tQGfTHXqrNX9xz4m7OJdIEb9GaCbvnVE2FAgdAkR5Sm/eP/jZa3vU?= =?utf-8?q?Beft59R3nZxmll4pojIXeU5hzg5PmxERKkMf5Mb6Lm5klNGSz98OQ7SnsTLnSUOFB?= =?utf-8?q?pOo4ecU5s0ajaZSQZRnhxLeGmac08te7lRohdECHrAH14U6bbEe888cNPPaI8YFbX?= =?utf-8?q?Is2q7wETMNiPgvJ00MOrmoD9QptSlzthf6+K2+y1hp39P+Z4yQU5y9e1y0XFWUMn/?= =?utf-8?q?NW/2pTXYgyh3dMcR+2yTSoAmNK0KCLkwjF2lhnMkbnhEKtRjV6327XHK4QY6J3LZB?= =?utf-8?q?L5lw5LrNLMJ5JsaNJzyfh756wTdAsAoiSSq4H8qmAs5pdgLLpW/amkoMfXkVMERda?= =?utf-8?q?5FKf5lP6mvnADAlTr/+6l8Pp+BYuZH5JwQTtTKu2jz4z0PM4b/6EsjL/4GMHjCjRZ?= =?utf-8?q?k42rVt9imqX38wE7mMgdWqeoVUcZyQpd6nj32qesI1aHtMuatTlJEVjabLxz+WYeu?= =?utf-8?q?xlnfSFFfA2Qo6HV+SAczWnfN4PxdlQJTlnkn/e9H3MvO887lbzE2mErnClbtVtNwq?= =?utf-8?q?RL0CVa6u8RVjOqHHYytwrQdxQ4zIin5IJ71Wr+nKPq0S6w6KTveSBV45X+N/be6PA?= =?utf-8?q?X3O/WLTFOf+bmOVT8rdFIbcKTECUMC6v6/OezXFpFuBaGh0SnoNyqBNN92eCD+RxI?= =?utf-8?q?sbwYc7ILlDiuoHQ4Hd1Ke29ZQawm/r0bNIdEwKLK3wuFVtKVgfWx/9I=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 47676349-3ed7-4dd0-2313-08d9ab4691a8 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2021 10:23:03.0361 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: SX5mjQOE9yUhkhMSa8ZLXZFWIQXMTi3AFJis4LzGHZIxqG1YKxCE5dzGUD/Kotr9ZWnur2XEmWuaWoLTrDdlYg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5168 From: Lasse Collin 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 [Linux commit: a98a25408b0e9b0264abcc3dabfafd9ff2ea1046] Signed-off-by: Jan Beulich --- 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_ 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_lzma } } - s->lzma.len = 0; - s->lzma2.sequence = SEQ_CONTROL; s->lzma2.need_dict_reset = true;