From nobody Mon May 20 23:49:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1646301920; cv=pass; d=zohomail.com; s=zohoarc; b=j4jfzDkEs7v1Qa6EIVlRD4dFD3AJBZifYddJLoA0lvPz4fMC1tOx2s4x37Z1R9wD2aajUh+WSKOjVq2Ur+n6CAfohT3GXYBd4i00tZZHxBZdANRQ7U+Yhe7QByvgUYraPghk5hSacY5lzq9pMwlu7ine6ij53nw5euRXdmyJHL8= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646301920; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ScIjlcvytU8BXsKkAKsbjjW3FXOU4vzzSPWi7azT27I=; b=ToozCVvX+ML8jvaYa1COEdBq5ofc86/EmUqOl+aELM42Jewu0Si9FC+cdwf4FFueMG5L0TTorRgZRGPROfCL+oH4gMlyKv9RklcRm4jrFYqIz21UBuVCqIqF3z3psYGLB/AKalAb9wAFJLyzOID2mNJ6WtzFjTVbZVwr07LONEQ= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1646301920888374.73275044770014; Thu, 3 Mar 2022 02:05:20 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.282891.481729 (Exim 4.92) (envelope-from ) id 1nPiKN-0000jY-5n; Thu, 03 Mar 2022 10:04:55 +0000 Received: by outflank-mailman (output) from mailman id 282891.481729; Thu, 03 Mar 2022 10:04:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nPiKN-0000jR-2P; Thu, 03 Mar 2022 10:04:55 +0000 Received: by outflank-mailman (input) for mailman id 282891; Thu, 03 Mar 2022 10:04:54 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nPiKM-0000jF-0D for xen-devel@lists.xenproject.org; Thu, 03 Mar 2022 10:04:54 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 5e7c470d-9ad9-11ec-8539-5f4723681683; Thu, 03 Mar 2022 11:04:52 +0100 (CET) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01lp2058.outbound.protection.outlook.com [104.47.0.58]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-38-gLdoUpSfN7SGC5FW8-VIYQ-1; Thu, 03 Mar 2022 11:04:51 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB3311.eurprd04.prod.outlook.com (2603:10a6:802:f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.25; Thu, 3 Mar 2022 10:04:49 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::d479:b728:345c:bd65]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::d479:b728:345c:bd65%6]) with mapi id 15.20.5038.014; Thu, 3 Mar 2022 10:04:49 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 5e7c470d-9ad9-11ec-8539-5f4723681683 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1646301892; 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=ScIjlcvytU8BXsKkAKsbjjW3FXOU4vzzSPWi7azT27I=; b=H/BzgMs0s60fsQdfPoItMZOqU+BCDol3tfI3qedUlT+pYHKpF/xXJSvNpuzApMBxb0CD4p UYtgVNAJTrS/tGurndyhmfQDV13td4AeyLCPIm8+WoVi721i91BSsMYgbbuBG080ErG1j7 oStce6gINVaTRnoh3f+D4jLgkfmX41I= X-MC-Unique: gLdoUpSfN7SGC5FW8-VIYQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jn0Q6+kkh5PWhepSgu+HS3lFWwfdWbwtG5QlDuvUoXbGqgEBESTMYF/+tkbNXiGP+Oq2ofqIkdC7ko2QuTY/N9sEThX9bghQxV8/ixf8waT9exduw78Neg7e6zOl3iB0Li9ZGygzQvFWKlQj5T1h4zcUxxFuCQBOsPLkwBmOrmtWTvrWI/I/TOativZCkzdnMUMFebNgVcy1i4nubcB8h2KXOtNICUeaOnpibPPqKbTmlia12Y8SJWEt//gimgCOpAcyl2JJZzfoOcB6QDZvXzco/Nwn15TK7kqSfFJSVoXLdwACl16MN9x4LuC9vCR7kB3rSlI3MTTYUAf14FRQpw== 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=ScIjlcvytU8BXsKkAKsbjjW3FXOU4vzzSPWi7azT27I=; b=aw+eaf66yAn9qWwR0ayJqyxim9wo36I3WODkuDYa5nnhQ4huSQx3mMIDOqJhu2pRrsVEJ3X5sTqfrzTIyi1/PCGXA6vs+5GX5MSwkYsBnQAI+JcwBHR7JYK6HjZpgWpnTXYe2NYeD1f00PCoZQCXqLnBkQgOtBruIhbRPbcHn+I8kPvLBFC2YJLJ/4VgZX+rAs0drY6XOO6If+evX4YkQWNre6G70GS1lXZWRrylriMW3iWNJcayghrS717JrwY6/EJJtPulL+PogfecCV/CFron6SW7HcICcpXiHjoAQ/zJq/iKjV62edPD4C4jSAniKAvTgqY86DILyc9aPzn14g== 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: Thu, 3 Mar 2022 11:04:47 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: [PATCH v3 1/7] xz: add fall-through comments to a switch statement Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS8PR07CA0037.eurprd07.prod.outlook.com (2603:10a6:20b:459::9) 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: 428027f1-c2b1-447d-2ff1-08d9fcfd40aa X-MS-TrafficTypeDiagnostic: VI1PR04MB3311:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6hltHTVQI53Lvf0UqAoUtAhlVO29/IoRbSpgeqlo2IuZbumzdmPfKp0CUsj7VTVgQN5eVbPkVi9EBXH5DJ+oMQ9I3oVZFa7+RRxOZTGb9k0NujC2nwk72VacDEBMdXk0d65RNjEPvcC5bSoY0f3DMfz+ob2aVloXblmTZs/5teL8/l2/RMRlyDaIY5ORwr0oVB5sspvCi5tlms47GZ9bxsUR4RDKZzVr6vESXAFYVv5gywWiCl3mfB487z0LdQNsKh8tC8/0dlklSavZ4N7/wlN+tYIvJw5kr9VOilLocIIdpFTQEV9+j6sZyQ3f5UabVt5b3d+S0yHT/iu8oQgaznRSDDk9wLRXxSD6YtSWoxlhTFBSm+UdkdVrAT6fMhRNOeTgaWQFo0ZiBEae382XKQiuXmPntxVwwKSQ/5CdAnx3vtsC5dztFqcXz9wgt/H0Zb6mnpSkJG/AbO2mKeYraVLKC6/o4KSP9dbgxGp0hvI8RR/bpElmU376ZJsN3KLA2de1XdIYnbUmlxkOXjXh5knd8eqwHOPjUSeLfxg91OvXkbvu6bIcyh6Pqt1JAuLil4qzm75gvjUBESYaSbwTqOUYi4rVMJuV55yqTkJO1RFOc/HSe3qtYEBeS+ytQwc6TZxD2o8KWsqZ+FE9VetanG9C6RESjon6VD1RQviy4DkYYBbOmyxsD0CSXKr+cyQ4jsOKWe3buG07spWP/uSMK7p6kNAHTxCT1IyeHqPi/dPKeD+RRtwHCKGQzHtq0N6S 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:(13230001)(366004)(83380400001)(38100700002)(5660300002)(6916009)(54906003)(66556008)(8676002)(4326008)(66476007)(66946007)(8936002)(316002)(6486002)(2616005)(186003)(26005)(508600001)(2906002)(6512007)(6506007)(31686004)(31696002)(36756003)(86362001)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Z2hIMnY4TmdSR0sxVzdOUm9uMFlXWkJCL0R1OHJSdmxGQmFRTDQ3TkxleEQ0?= =?utf-8?B?WEVyT0YyVjVXWWxuWDZFR1lGZ1UxWU0yN3ZFRzJCU2Q3VldnRTRET0QzMzZN?= =?utf-8?B?eHluNDBuV1NxVnZlNEcwdHY5ZGtWQzd4YVJzUVpXZTBrUzkrR1Z3S0JLaVBq?= =?utf-8?B?NFdXL085eW1xSTNTN2lBWXkzV1Jkdm9aeEZpNDgzNWZTcTVMa3ptclZDUmVn?= =?utf-8?B?NmlBU1hYc2NmOUo2MURPNUNlT2NxdTdXcUtzV290V2xQU0QwMXN6RTlibXpo?= =?utf-8?B?NW5aTVQ3RXA1a1F1UDhmKzRqOGdCTDlpVTB0WmFRUTVkbGN1YlMyVVZxK3k0?= =?utf-8?B?NS9sSUJ0S2ZpdThzWkFQeW1RME5tcC81bGpIZWljcTJ5S1FrR3dvSmpLRWEr?= =?utf-8?B?STBoY0lFWFZ6YytIckxVenVpMFNXdlFYdi9VcW5UQmt0TlVqbjR4dnVxTDJK?= =?utf-8?B?UmErTks1bXlxMCtFN0lBcXFtMFBSZlEwRktRQXQ4UWZFMDBkb0dxUXRtaTlL?= =?utf-8?B?NXlnWmxwRkNsSW04cHJaUUNkbE1XTzEwbFpJUWRsZGEyKzZaK1FuZjE1bko4?= =?utf-8?B?bW5ObEpnTjBobmpKWkhzeXdra1BHZFBUbkJSMlF6c2l3WkdKSmdxUXdDSjRq?= =?utf-8?B?eWNxSmY5bitwYU92OGFXZG4zWm1YcUlMZkhJRk9ISW9WcElncEZvOGRKQjc5?= =?utf-8?B?YlB0TjlwYy9VeVVSeG9WUjEvYnVHV1Q3TUdSKzBaU2ZFOW1Qc1hzb056aVhS?= =?utf-8?B?aG1xbk04TFYwSWt3ZUVvK3NCay9hL1F1TXExdnlTKzhsY0lkdmpzZmhxS2pS?= =?utf-8?B?SWc1WE9URzZoVTJSSUlHWVp6Rk5WMkdtR2JsOTRlU3pwWUJyMElWUWk3TVVy?= =?utf-8?B?dmZsQ3N3ZVN2enRJb3VaZTc2ZjN1WE5RSjhUM0QzVncxVEpXZWFhb3hlQzN6?= =?utf-8?B?NHVUQ0ozQ0xzOUlUZm85bHEzamFxZnFOUG5Fdlh1ZnQxWHhNVjlKRzVZdE8w?= =?utf-8?B?NHBBaHdTb1dhandIS0QvaDZDbTJ2VXNldVh6dkFZdHZwTUFveTIrazllUDVk?= =?utf-8?B?b3pJVlU5UEdsSlFXWWNxcnUrV0x5b0pmNjJiWk5uWk9HRnp1RFVhQ3hwdTFU?= =?utf-8?B?SEE4ZlhkbENUeUJGa0RDOGl4Tm1rRjZRTDFSU09Sc0xSWEt3MVdSVHVQaW1v?= =?utf-8?B?UDdyWWwvZTZEZU54RXZSYUV2NkJHdXlzci9UUlVMNlJ3RStoU2poS1VZMS81?= =?utf-8?B?TldidnU3K2RQSjVuRlFRUWVyYmxYN3M0eEhQUlI3K1RWWkl2OW1pYVY3Q0hW?= =?utf-8?B?MVZCUGlEZDF5SXR4aWRpUkw2RWdoMUt2TndlNUFPbURJd1V0SlJEd2xQYi80?= =?utf-8?B?WnZEeDVRUVY0TUo0R0FwOU5rSU9UeDFzeXNqSU0yVThKcitUMlQ4UU5VVGR4?= =?utf-8?B?UE9mcWhNVjVxcU5nN0dRZ0g3dnVoR0FDRnNmSHJoMFRzNzJMUUZMN3pRQkh1?= =?utf-8?B?b0FsVTNzNHFqWFNCZTlNUVdzL2V6Y3Y5NDVuREFYdjg4NEhNb092TjBJT3lm?= =?utf-8?B?bHBVWjNIZmVRL0MyR3ljUkVrb3RSZk5Hci9mN24wQitpc1E4VkxPWXVXWmUv?= =?utf-8?B?Z1BQTXJyNjIwSURGRTdwKzlaUExIZ2FHOHU1ckdMSndSVHNVN2VZelM1UHZ1?= =?utf-8?B?NHp0Z0xIbkVlQXlMNVNrK2RxWE8yZHZuaHNINVhwa2piblpNODNmTUdPdG4r?= =?utf-8?B?L2t0cHpnV1ZIZ1paYStKQzc2Wnd2L3lrSnN6Um1LaFlsVjVrdktZdmFxemNk?= =?utf-8?B?UXpxZVdGS0FFeHJMUkVQbkZxbXdGSUJEWktHTmhjS0l3ODlFVWZlUnA0bVIy?= =?utf-8?B?LzFtbGQ0R21PNHREd2NUUlk5ejF2Ylpza2w1d1hmbnhscDBvRTJ0VWZrNE4r?= =?utf-8?B?bFRRQlh6TlhTRFU4MDM3RUxaTjUrMnd5aHNGbzN3QVpSeEhxQTg3N05qRGlN?= =?utf-8?B?cFVFaC8wTFNLZlErTEk4bGlSWmx6VDJ4VkN0alNRSU9aUXBlV2ljUWxSVVJI?= =?utf-8?B?c09HWFR4d3dwTy9taDJEcEpSTEdxMURvbms2THV0NVp1NGd2cE1HUTdzd3My?= =?utf-8?B?czdtWk4xZVVocFFpcTEzN3pYU01uWXRMNlhLVjE0QkZVZ2p5amdOUzhweFd6?= =?utf-8?Q?CctRWwN/JsaQ4T1TQRs5T6U=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 428027f1-c2b1-447d-2ff1-08d9fcfd40aa X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2022 10:04:49.3643 (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: WVgtC3j4Bm9DQSuNyLLd6HRNoBBJB4Q/oImdYbFNspCFb8Ee7uLxIrfs8ZwonqlLqpAWGg2SF5MMYPuDclIdkA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3311 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1646301922060100001 Content-Type: text/plain; charset="utf-8" From: Lasse Collin It's good style. I was also told that GCC 7 is more strict and might give a warning when such comments are missing. Suggested-by: Andrei Borzenkov Signed-off-by: Lasse Collin Signed-off-by: Jiri Kosina [Linux commit: 5a244f48ecbbd03a11eb84819c5c599db81823ee] Signed-off-by: Jan Beulich Reviewed-by: Luca Fancellu Acked-by: Andrew Cooper --- Linux has meanwhile further moved to using the "fallthrough" pseudo- keyword, but us doing so requires the tool stack to first make this available for use in at least stubdom builds. --- v2: Retain the other S-o-b, for lack of mailing list source of the original submission. --- a/xen/common/xz/dec_stream.c +++ b/xen/common/xz/dec_stream.c @@ -583,6 +583,8 @@ static enum xz_ret __init dec_main(struc if (ret !=3D XZ_OK) return ret; =20 + /* Fall through */ + case SEQ_BLOCK_START: /* We need one byte of input to continue. */ if (b->in_pos =3D=3D b->in_size) @@ -606,6 +608,8 @@ static enum xz_ret __init dec_main(struc s->temp.pos =3D 0; s->sequence =3D SEQ_BLOCK_HEADER; =20 + /* Fall through */ + case SEQ_BLOCK_HEADER: if (!fill_temp(s, b)) return XZ_OK; @@ -616,6 +620,8 @@ static enum xz_ret __init dec_main(struc =20 s->sequence =3D SEQ_BLOCK_UNCOMPRESS; =20 + /* Fall through */ + case SEQ_BLOCK_UNCOMPRESS: ret =3D dec_block(s, b); if (ret !=3D XZ_STREAM_END) @@ -623,6 +629,8 @@ static enum xz_ret __init dec_main(struc =20 s->sequence =3D SEQ_BLOCK_PADDING; =20 + /* Fall through */ + case SEQ_BLOCK_PADDING: /* * Size of Compressed Data + Block Padding @@ -643,6 +651,8 @@ static enum xz_ret __init dec_main(struc =20 s->sequence =3D SEQ_BLOCK_CHECK; =20 + /* Fall through */ + case SEQ_BLOCK_CHECK: if (s->check_type =3D=3D XZ_CHECK_CRC32) { ret =3D crc32_validate(s, b); @@ -665,6 +675,8 @@ static enum xz_ret __init dec_main(struc =20 s->sequence =3D SEQ_INDEX_PADDING; =20 + /* Fall through */ + case SEQ_INDEX_PADDING: while ((s->index.size + (b->in_pos - s->in_start)) & 3) { @@ -687,6 +699,8 @@ static enum xz_ret __init dec_main(struc =20 s->sequence =3D SEQ_INDEX_CRC32; =20 + /* Fall through */ + case SEQ_INDEX_CRC32: ret =3D crc32_validate(s, b); if (ret !=3D XZ_STREAM_END) @@ -695,6 +709,8 @@ static enum xz_ret __init dec_main(struc s->temp.size =3D STREAM_HEADER_SIZE; s->sequence =3D SEQ_STREAM_FOOTER; =20 + /* Fall through */ + case SEQ_STREAM_FOOTER: if (!fill_temp(s, b)) return XZ_OK; From nobody Mon May 20 23:49:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1646301952; cv=pass; d=zohomail.com; s=zohoarc; b=nck0JFTlqPOrW9X+25CTU5IXZBxrog0QSL9yapVbcUlD9DON4IuCm8jylHAej19WwK2gWGXK93YIdms8RO5Ohm9WVnhNknq8zrkUA0mopHKxQvg/oh2GIvmI7NpdCsuqxjvUeMq8j1n2WUD2swhCcFFgBO2BkqiiqWW53ucCmEI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646301952; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=A25zh5BjjDRbl+SbPOMZedHC8tdiYgioJS38R9kRtSE=; b=APSdiSEMbp9EYUqCnTq+T2jVSh/6F28y+E1kRHqdKv+mHAbhvoYJfRCrJgkWLQN2F9EFQyb7PPsZVNetJcItdSg8VuZjwwpl0nx6vTCcSQRVyW4JxwAf6+xkqsuQsz71fu4Dbr0RWBOFZKeb/oFFOo6wNiVAqCInaiQz5tNlPs8= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1646301952538626.8978735627533; Thu, 3 Mar 2022 02:05:52 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.282898.481741 (Exim 4.92) (envelope-from ) id 1nPiKr-0001M8-J5; Thu, 03 Mar 2022 10:05:25 +0000 Received: by outflank-mailman (output) from mailman id 282898.481741; Thu, 03 Mar 2022 10:05:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nPiKr-0001M1-FV; Thu, 03 Mar 2022 10:05:25 +0000 Received: by outflank-mailman (input) for mailman id 282898; Thu, 03 Mar 2022 10:05:24 +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 1nPiKq-0001Ia-5B for xen-devel@lists.xenproject.org; Thu, 03 Mar 2022 10:05:24 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 70ae4b13-9ad9-11ec-8eba-a37418f5ba1a; Thu, 03 Mar 2022 11:05:23 +0100 (CET) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01lp2056.outbound.protection.outlook.com [104.47.0.56]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-10-lVBXtSbMPgubX3W_YL5Jkw-1; Thu, 03 Mar 2022 11:05:22 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB3311.eurprd04.prod.outlook.com (2603:10a6:802:f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.25; Thu, 3 Mar 2022 10:05:20 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::d479:b728:345c:bd65]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::d479:b728:345c:bd65%6]) with mapi id 15.20.5038.014; Thu, 3 Mar 2022 10:05:20 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 70ae4b13-9ad9-11ec-8eba-a37418f5ba1a DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1646301923; 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=A25zh5BjjDRbl+SbPOMZedHC8tdiYgioJS38R9kRtSE=; b=Ma7CvuTUnH1TWKgYSajr8Weznh8m23GDGeLmoHyvZJSSqF2B5sRhYPjJkP7srjBo6IjR69 D5CF99rMzMT1ds2T8L70NpwR4/J8kjiF0/AZygZSUS8lbF9FISdHFDrnKS0+LG/DHjmCt4 Utw6kDSOe2PJC8ottYqEtM5Ws0hz/Mg= X-MC-Unique: lVBXtSbMPgubX3W_YL5Jkw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BFbfilM322kOSYz/nQ7WXY94r11oTuVP/kEs0dxhSFUov+pxwEU9/v4Ov287wRfSX5j0pd5qu923K5ZlxjXN2l8KuuQrcfXMzHQ9dLQxEEMKmXX6cI3SfZc8Evg9McapynvozQu3144xxKioKZWGvI59983CaGdychJY9V4i8xYgoPe7/Oa1Lr8mtOzZ8yMtYwBcXF1sZbDCSN5GxHMhWjDC0vSHsBxXxFscvAgHJUstfcek2R7qC6UPrhXRg8dUSYc8n+aIn6UvbAy+HelGjFNrHEORCoQuI2C59w/zcXe/6ovby29ru+jJNgSGo3I0zF0F8vFYiopKHP4dubDZpg== 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=A25zh5BjjDRbl+SbPOMZedHC8tdiYgioJS38R9kRtSE=; b=JleOcDtZ6i8zfGK82DZSp/Kh+JZin+gliWqD4zGavMJ4e2uirvd6yRmJ/jSYFwakY4+rBDEmwE4t/A5U6zwsw381I09FgSZGqa0drxEVHLiA+2ourk8Q7dfTPD7U7C1A3Py85x9aiCFwEJxCkRfSE4m1YvBsOSAXtFbv909NvBO0Kkjv2bDTv79Ep/WSbiy/W+8ZHuJW5AP90mGMrG+ut1gssFu6b8fudE+R08H2TUysqUL+w1nMl+gk12PijS+UsWu6gCbEDvghpwyvXMZStkHxuhp3/L3MEUhzbjOPU5L/o/K2v0WO14U/+GrNrAe1lry4Rui+tjBXl1bipPXjNg== 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: <96b6ce72-9c64-1ca7-56fb-63a30cd8591b@suse.com> Date: Thu, 3 Mar 2022 11:05:17 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: [PATCH v3 2/7] xz: fix XZ_DYNALLOC to avoid useless memory reallocations Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS8PR07CA0046.eurprd07.prod.outlook.com (2603:10a6:20b:459::18) 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: 9a39c6b9-221a-49c2-9392-08d9fcfd531a X-MS-TrafficTypeDiagnostic: VI1PR04MB3311:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4cBCAVLdWfc/iqTj21zyN6NN7PNMjUjHYmmzb0N/K2N5RimRvbG9TSK83OkExGpUSFoUK5N+bbIiM93cfFIVJyPjJ/FUDBmijoMEVv/Eyao+RIHfBWz4pvs0g9Y4lApnsFXhbgR4adD6k7sm0RZqiZ7fFzI3FNxAK6THJSeiOA2ulgbXLj7zL0RoOcMrZK2OiZZEEHkDQjKo+Yi9plArlP2InB6gI/qqUu/a8FyfgyXis+p1QA3I3ArJH9vnHrl2ZwFCxYWbjrWVkItqrKqV400MC1wibj396hrogqIt2VBMnXAT8e80oJ9FuoMnfW8JkyIiPH7bjsAil0DSxnAPyWfz6/NShYWd7qZPmw+HW4Ov3mbQ2GUm3xBfxdv5MufKY4rDMK79v/IAVw7ubE5YHNSvztbBuegPHRooH2UsMvb0Q7D6bP7FeXDN8oBvsKQQmdIJbAf2IIezy4rUT8gakYO23vvGmBQQztsj9LWnaOAuC+8J7gUaXN+IsNx0C/O2aEznb5Sj3rHPw+ZfY6MuZ0qVLz1TUO/fqYEUXptuYNkr3oicjg2nlS4u6OaJxyiLnTY5Qn1ue8h2HsBhhickqbJ5rDXn5C0VALBvkviRr/R3AuynIV+hDdT5PGVEdhcIuArnjPhA42xPJ5HujLtI8wSZr8GTo0lcWogMSafiDm7l/E9Ze7+btOZ5OKZXze0FF/smquKjUcBZzqPXQBKWekSBXlPFyLd5Eig5nn8pXUYH9ZrrzZ5AoKHLOcjJQOF5urlQPRwP0PQO86WDsp9yuxIUad/ZtfkWD507yuYlnvhPMnDhNSOSferJGQ9FR+r7RET6ycxR80dYLgmtQAqCWA== 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:(13230001)(366004)(38100700002)(5660300002)(6916009)(54906003)(966005)(66556008)(8676002)(4326008)(66476007)(66946007)(8936002)(316002)(6486002)(2616005)(186003)(26005)(508600001)(2906002)(6512007)(6506007)(6666004)(31686004)(31696002)(36756003)(86362001)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?clNGRXQwQkdzQ3VJa2lDb2pwcFozL1M0dTZVK0YzMUxKQmFQY0RsVk1iN29V?= =?utf-8?B?UGNwcVh2dUsrN0RSOElYb0h3SklQV1ZTQVhuQ2tIc2RpVkxwVWt2OWprMU1j?= =?utf-8?B?SDFZdlJWSHljeGlMbldIWUZoaWZsY0JrUnNKcXBDVERScXowUkVsQ2tUck5N?= =?utf-8?B?MW5XemRNZUtqNFU5MW94TUpEa2pXVmVqKzgrMytXSWI2M1h5anpwUGllZ2F4?= =?utf-8?B?ZzlESVJRSnR3YjR3cG8wRTFqa3YxekpaVldFZEF6c2ZKeTBpOXF3a0hrK1lz?= =?utf-8?B?ZXcrMWRNbW9IL0VyQ2pJQ1YzZG1rYndXVmxURnZPN1dUWGM4S09tZHVuVXY0?= =?utf-8?B?bGNBMGd4OXZiQnF6NS9TODdhTmZCUjF4dURtcllZK2laT1VpZTFvRkdpK25n?= =?utf-8?B?OEhWNjl4Wms5Mk83R2NaN2N2UlZWTnk2TkdwaGV2OW5rbDBZWncvSHhidzVG?= =?utf-8?B?clVHTktRUERkS2VtSHNFQXdzNFZ3QysxR0U3alA1L3NUbktwcFlSNWh4ZSt6?= =?utf-8?B?UTRHRW5zQ2h6YVRKSHJweFF6YXlBMDVvMFYyRXA0R2dHN2pqSTBmY0FaalNN?= =?utf-8?B?NkM1RXJHdUpOcnk1WDlHdit4R0wzUWxDMlNWZ2IxaktXREQxQlNpaUR0S2lF?= =?utf-8?B?Zit1VUlxOFZMbVpOd0Z1NUtiRFA2aXVjTDZyNlZFcHd5dzE0K2xsVnNMY2tK?= =?utf-8?B?bW11WnZ6dFp2U3IvcGFGWE5JNVRTTHNaaE5ERGRWSXhlUHRkSnFMSU9GSzRu?= =?utf-8?B?bGZPdU8wZ3U4WHV5UEN0OXBpZFRWQTljbFhWcUh0WXVqVGRXNUc3MVVkb3Np?= =?utf-8?B?TEswVEd5YkNtUW00cWxOclVySVlFaFFRWTZXZjFuNjd5UmxuL21HMjh5R1NU?= =?utf-8?B?cGtWMHlGQldlNlZyZUJvbVdHQUI5eTkvRXAzMWxEeU1xMFZ1NW9UVmxtalhq?= =?utf-8?B?SS9lZkJTWXlrT0tUN1pKQzV0cjgzL0JDQ3ZUTGJzODRWTjlWR0dRMGxwbDFZ?= =?utf-8?B?MTloRm1OeTdML0wxcmRnQ2p2SEthUnhjVHRVRUppTUZHdHJESE16YmY0U2Vt?= =?utf-8?B?bDB0TmVRN3Z5OEZxd2xJNmFzZUhKNXNqTS9kS3JkVVZjYjhQall3d1BoR1Vq?= =?utf-8?B?ZzQwYjFPRzUrWlhHRHI2a0xIckhNRjVHTTU0aUJqeVVYY3ZGMHBSU3RaYkRy?= =?utf-8?B?dUI0dXMvbGlYRm5iTERJSXVrMmVLcjRuZTU1YXpvY013ajFuZ2hLUi9BUWp2?= =?utf-8?B?RnhTQTh5OW82VGc0dmNKTkhOZHhpYkVxYlZ2SlVGVjJsZ1B3RXVsVGVxbWhp?= =?utf-8?B?VGd5djJ5eWZhZ0JsbzR1UUFUcUJJQlBJam5iY2pMbERFdGhGT1dxR2JVTndN?= =?utf-8?B?K3VaYzY2Y0cyc1VyQnJzTGxlODRNTEpqMW1RcmpzVUFzcjgwSkFmTGVKMDNC?= =?utf-8?B?RUZnOWs5bVEwbkpqdU51SHFndWJNQlpRcHJySUtrVVRpblkwaW9neXd1dUM4?= =?utf-8?B?U2FoS2R4NStXRzVvZ2wybm9VZERheVM1M3JtY3VkQmRxajJXakZ1WkQ3ZUN0?= =?utf-8?B?cmdydEJXdDJESnV4NkdpRlVaeWFhZEMxQlErNll3djZhWG9QZWE2Y2FlSEN4?= =?utf-8?B?cTBXdklIM1BzaStkckVsMU5MSTFVK0VwcE5ocThyWWVnYnRsNXlGdmhreXhj?= =?utf-8?B?TlRVUGZsbjBRRVc4SlIyVC92RXR6NVV6eDhEcmF6SXczMURnMGRCOEZKNHBW?= =?utf-8?B?MlhPNUJXTVFZbWxZbWs4aEY1K25HMUVOUFAwUjIxMzRXVENUM2VObkh1dXVV?= =?utf-8?B?K1Y2VjlrYTZJREIzYWZVcHNzQW1CUmI0M2NvSzJmS3BTVjlRbnNpc1RzSzV0?= =?utf-8?B?QnJkeUFGMzEzeG8xaklZSU1rVC9XMEFwZUsrTjMrM2FCaHVUWnZFbHo2L1lM?= =?utf-8?B?TnU5N3FOdzF3RFIxbEYwUDN4YnVGTisvb09Gb3BBVXorMEpEWnhGcGZha2xH?= =?utf-8?B?cU9IenV1amtmdStnTTE3OTJzM1o3RWk1NWVPZnlXSGlwZTdMVDBjQjhBNSt2?= =?utf-8?B?NkcwQzlHMjRlREIyeGFVTUJxVkNYL1pYbUhjb1BURkhSRHNWT0dHOHlvVVVI?= =?utf-8?B?SElzZUl3ejZORTJpMnFDUTNuQm54N1JOT0k1eFF1R2tzd01NNTN4VnFhdEcz?= =?utf-8?Q?mcCigTwdN61BHlimLIT23Ek=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9a39c6b9-221a-49c2-9392-08d9fcfd531a X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2022 10:05:20.2530 (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: r2pVIqO0g/cJMcHQCC8gGNWYht9VLAGr33eqv9lyKMBsgeHThgKnhYsrHq7Hw6/xnzFTlrm49uIuk3c2HkPSPQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3311 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1646301954577100001 Content-Type: text/plain; charset="utf-8" From: Lasse Collin 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 Reported-by: Yu Sun Signed-off-by: Lasse Collin Acked-by: Daniel Walker Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds [Linux commit: 8e20ba2e53fc6198cbfbcc700e9f884157052a8d] Signed-off-by: Jan Beulich Reviewed-by: Luca Fancellu Acked-by: Andrew Cooper --- v3: Retain all Linux side S-o-b, as per 5e326b61693c. --- a/xen/common/xz/dec_lzma2.c +++ b/xen/common/xz/dec_lzma2.c @@ -1146,6 +1146,7 @@ XZ_EXTERN enum xz_ret __init xz_dec_lzma =20 if (DEC_IS_DYNALLOC(s->dict.mode)) { if (s->dict.allocated < s->dict.size) { + s->dict.allocated =3D s->dict.size; large_free(s->dict.buf); s->dict.buf =3D large_malloc(s->dict.size); if (s->dict.buf =3D=3D NULL) { From nobody Mon May 20 23:49:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1646301989; cv=pass; d=zohomail.com; s=zohoarc; b=UZqtntqYRVZPWYzMH50a0Ol/JcNCUG1GE2E3nHcmoVak4YRUjRmMiP8RB/xV39k/qKlA5e1Lthr+fXIzexbh9Qsw0hAOTqz7MMe8wES+C0nv6bTsmsFFeYuS6aCCeCVkBKSaOtgKTRxSXdanTgwCfP6vqqaSW87m3Gpjd6e3xr0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646301989; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=czqxhntDmPvVjF13ScNMIxw0RdrjFUc3x6QkChagSno=; b=TRQm7jkt50ye33dYQ0bdrk1QsPbRTcb20qUvpHMmAwDSHCfdhlBynicBcgdkx+rcuOsD2pJw7MBnSejOsaVREjI7YkqAOBwDLP1212N7+oWO9fBmQb+QnG4yzd4VVurZmZ/b1oZS34gwMa6UEZJ7UaFLjn62XL7fAtfsp44/Cwk= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1646301989778552.6190151170998; Thu, 3 Mar 2022 02:06:29 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.282905.481752 (Exim 4.92) (envelope-from ) id 1nPiLJ-0001sY-Rd; Thu, 03 Mar 2022 10:05:53 +0000 Received: by outflank-mailman (output) from mailman id 282905.481752; Thu, 03 Mar 2022 10:05:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nPiLJ-0001sP-OE; Thu, 03 Mar 2022 10:05:53 +0000 Received: by outflank-mailman (input) for mailman id 282905; Thu, 03 Mar 2022 10:05:52 +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 1nPiLI-0001Ia-CD for xen-devel@lists.xenproject.org; Thu, 03 Mar 2022 10:05:52 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8011eb29-9ad9-11ec-8eba-a37418f5ba1a; Thu, 03 Mar 2022 11:05:49 +0100 (CET) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01lp2057.outbound.protection.outlook.com [104.47.0.57]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-4-8CtoAN92OBCwP41myE49Rw-1; Thu, 03 Mar 2022 11:05:47 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB3311.eurprd04.prod.outlook.com (2603:10a6:802:f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.25; Thu, 3 Mar 2022 10:05:46 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::d479:b728:345c:bd65]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::d479:b728:345c:bd65%6]) with mapi id 15.20.5038.014; Thu, 3 Mar 2022 10:05:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 8011eb29-9ad9-11ec-8eba-a37418f5ba1a DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1646301948; 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=czqxhntDmPvVjF13ScNMIxw0RdrjFUc3x6QkChagSno=; b=Mgsg8p9rLiOMzE26mWS+WGjsPEjMJftPkkt1owSwN07Y5fhtTiu/KBL+TJRpx6PaGwiSFe txe7kKnE/Hj6WpcNbIaL/ZlIKVA3RggaTxAxHY45KonXWA9q9fEsdd704fpfh1Khm5Ud3X TsGLt8y5yQcTifFqL+j5Rk5xzI8RprE= X-MC-Unique: 8CtoAN92OBCwP41myE49Rw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mWgN3gEVs+Go2tXmB/MTgSsMTUWg4xmwH0Y1dFLeb/0AcRpKTpEbBiIFgkSx6tlR99FwjEOY0/8YJYORIu+xxoHyGrFzYF6uxdybCDbkdxewtHiviGYdPsgKCUfnDe5STk/FSnOM0LjI6z6A1ttLFQ3C4sMEe0bYqcXnb5fC3wd0nOZL1JbXSNCal8Q3FuDkTPA6zQIYjSbyqvfT9P4ZN5i1PPg+bRWePaTN/TnIVIKnauW73Yx+xZlMV3vYzpkVx2jOvsRi7kt22frpsN3bunqXFVeKGncCHS4s3GbdtT0MofiBL0C0EkpckGvy60G2mZSrc+YEHebP2RE1SFexXQ== 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=czqxhntDmPvVjF13ScNMIxw0RdrjFUc3x6QkChagSno=; b=kOMm8N+JttOmqIzFUyB1KWcvLpkdRi1V77Z6TbZan5U/rBsZR/BZlmgqDj4uNOm+ZndTDoR1Z0xM7YDy/QDABtNriPMup6v0EYuwP0kOFUyIheGIGQdFBZZrcm4Jwft9hpm+DAItUv6uKcZl1N5yI2RGbjTFjuLHmivi+V4s5sjezRL5QpeqUhHNy2srhkXi9rlGLlUP7itCeoHt2C/f+SstAgGkXcdY0F+AgMDogylXSK7J87Xw9Bo12F8scNso79DzadgoZJ+FTk2SG7ln4el5jPDFKIUTcVsQU30ZKXMo5NKQpdIe1ugPpvwxHPIwm+72d1wY7QDUo4qfWEWkWA== 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: <6f81b2aa-cd27-d83e-790d-b80c41619c11@suse.com> Date: Thu, 3 Mar 2022 11:05:44 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: [PATCH v3 3/7] decompressors: fix spelling mistakes Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR06CA0354.eurprd06.prod.outlook.com (2603:10a6:20b:466::9) 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: d4766f35-6c31-451f-3a1e-08d9fcfd6297 X-MS-TrafficTypeDiagnostic: VI1PR04MB3311:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XcrSoDsQZBnE0/lr6ZUQtVQH1HazpTZsUbJavvj57ebP9Vs5XXAen1sf491Y8ToIANH1G483N9rPNL55je/bvDvSdLYhqiC6yrdoFjm9iDedzJ7WkvsCoN9sRgBQlLeXHniEOH9cyDz2Dqd2smezMvxDapu/J+ZSYOsntWp/WMRMHo0u+IzelfaajS8XJXMuZL+XE0C42Und9bXbMvB8XLdyJQvIc/pEp+wq7ZlFqEOcswWjVBrNK0yF2kq6wt5NYBDZ7GwmFDrXgZWuaNsKRRk3e9wmmmIE2kCqB1foS1uvBoI4r+CNzNXZr5lqIIpAgDT2M8jKjrSTh+8mqrripnPzv6RPjnCXPBcoSEY3i+0yEQ1gfwaO0Z24MmFypM9wfFC8OLNPokzTravzsK1mJtz72TL8rm9pCiREo9SU4xwhYwe8LZLkH3oUmSZES223YgckrhODD+SKUY/JjSnkbQbxFJoQ+1GkerhFVwWHxWoKrl4hjMnYSB9/n0GGMzV2x+bK9No2L8UqqQ8ciGp99z7sHoQWfswaR4B5w1ZFuNj42WIAeV9ePJfqsWc7RBbtObQEhZdw/0vRme7VSXCqhHvt8CO2JI5/C04iz6TT3CK8ca5kOYSt2R9DcovNWJRQZwZjYvx9Gx0k30LV1BmGcq9bKRyEgMxpc/dOKU3dws/EOaWVBCv72wT6m2D9FuiylMp+iyMGk341v1xNXiHRDubAHKsqnro4llT96RGd9YXwSUrEf3O7KmE2PPrwuPoVh6a6UgG8dWsMAxsJeH7JU/d9ETLoGxT8cnRHJEfwwIAuWU1FmyUqHe3wXnhvUIQU3/E81RdkMMYluJlMPZebLw== 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:(13230001)(366004)(83380400001)(38100700002)(5660300002)(6916009)(54906003)(966005)(66556008)(8676002)(4326008)(66476007)(66946007)(8936002)(316002)(6486002)(2616005)(186003)(26005)(508600001)(2906002)(6512007)(6506007)(31686004)(31696002)(36756003)(86362001)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UFFSRHgxeHZBS0lVRlhSOStvZ3E0N1lHRTQ5cU5UOVVFZDhySHdPdWxBQUFZ?= =?utf-8?B?T1ZhZmZhLzY4QzA4dEQ3V0VPVnArazFacE13SGo4TWR0VUdMMGkvbUFNUVJ2?= =?utf-8?B?TFNoeXlpK2haNW0xRmhHeUxpZ2xqYU0ySWU5MTBDTzlLYkFqTGE4M0VRRlE2?= =?utf-8?B?NEhPdG1hblpqbVFwcFNFSFlZa2lvMEhDK3FsQXkybFhaQkVReVpoUzdIc3pv?= =?utf-8?B?REIraHlISFZISTduOW1MSjBKN1lPaGZBNWhOY1VtQTJjT1lJV0VFSGtNVU5j?= =?utf-8?B?Y2NHeVpjWVN6S3RrYTFlVEhtRzZONUJObE9qUHJ5S0NYZkNtOUVBSURPMEdR?= =?utf-8?B?cjdEeXVYNm8yTVNRWmRLdjNnUmU1YU5TRUVqNklBSGU3cWFSeUYyVm4zTEl1?= =?utf-8?B?TVcvUmJlaWpjNU5MQWphZ3VnYUdjZHpNRVYrakVoSnZEbFEyQTBqNUxNZzQ0?= =?utf-8?B?eE9xSUVDVHpiaDZ5cFlhLzMwbEt6ZlpyUS9xY0xCd3BIdE5RZFdyanp5UFFs?= =?utf-8?B?SGFwTlgzNjhuSGVJWW5YckFWbis4amMrRlhKeGpnVjNJaERPQTlPaURQQnRw?= =?utf-8?B?M3FhTmpucFhWakc3ZHJDb2cwOEJvdVFaaHVuc2dsN3Z6MWt0VU5mcE5ITUNI?= =?utf-8?B?b21CTTVEY3RTRDJKeGk2UXdqcXFveDRnYUEyRWZZZDF5M2hMaDJZUEkzUDFD?= =?utf-8?B?MDRRMSswejM1TU5vSm9UVVBXQm9haytJeTRyWHY1SGR5ZGhtTVkxamc0eWs3?= =?utf-8?B?U0MwdTl1RFBNMkhqUUk3M2d3ZnF5ek5GUkNhYmM5Y3dSRmYrVjdyd2tlNHU4?= =?utf-8?B?K2V6Qi9WTWIwZ2U4UzdZTGErb1puM0hwK3NKTTl2QlZuOUtUR1I3S3RZbWsy?= =?utf-8?B?RXhMMitwdW5LYlVVTFdwZmtRT0Q1b21FazVyTTZhWUJoalNCRnhlTWRONndW?= =?utf-8?B?YUVzRTlWY2l0TTNUNXFETndHeHRuQXlKSzZaaVRacjJmV0Ivb3l4dTNqSzV5?= =?utf-8?B?Ym5zWUZWYVdHdjdTa2V1cGNJVGZFM0tNOEVDQVRidWlJcDRQajZ0Z1c1UHFB?= =?utf-8?B?Q3RTN01nWEZKZmNoWlhGb0pMWTZJQlNhU2ZtcGZPNTdSTlkxZmJqbnBYeHZh?= =?utf-8?B?Y2tqMC9tQkFDYWxVOGFUVW5HUG1hMlZpaktnV0h5UzFzYzRNaGIzQzdwOHBu?= =?utf-8?B?OE1rSURhRVk2bC8zVmROOVZ5NlZaWVZUQ25mOEhqN0EyczVRdjZkVXhIS1pw?= =?utf-8?B?YjRES1k3cnVsMllwVHRlUC9VNEdGS2M3b2QzMjhFbUdpQ2dJVlJCSlQ3WXRJ?= =?utf-8?B?c2xVU3JsdXQyaEV0S0RHNTJ4UlpiR1piWEJOYy9Id2lvbHc1RVNzUFNSa2hY?= =?utf-8?B?RGx4NGI0ZWVHRkl4bzdIejdQK3JMbWxsRC9TNkxTWEM4OVlDTE5SbDhrSy9m?= =?utf-8?B?b1MzWWJyMUxtNzkxOXl6MkFZaDQrS09xT0I2bDJzNTE5MlRkcGdxVGJCeWRK?= =?utf-8?B?NHBrSUNvN28vcldSLzZUclgzQUMwWWZOV2MwTVpJOHY5U3gyemxubFNIMkhn?= =?utf-8?B?MERMbzFCbTZnNW1XRzczRjRSS1dmVGZCVUgxZTdndkpuQWZHOWlxcTd5ZDlh?= =?utf-8?B?MXN3TnJ1OXlvUW1xL2JSTEV1V21HdDdKTkpTbWk3bFhscVNpclJPMkkyYlZn?= =?utf-8?B?VFRETmwxeFBad3ZIY0FVcmIraGxMNFN1SFpGWVRuOTJCMnkyczN3b3hmSU5W?= =?utf-8?B?NlphVEpyeURhT25PQjJteDFNMldWc3pZUUljN25xekpleVA5eXlVbVp6S09D?= =?utf-8?B?bHpOclB1M2ZNUGpsZW1uUG52QzJlSWtGZlpKaDRRZEVvM0lURXBqMzd3c0Fl?= =?utf-8?B?Q3pHZkZMNXFpRDEwRW9QeWN6RnlnODFIa2lVRU1rckJya2dYRlVRSGQzL213?= =?utf-8?B?d3hzZ1VKM2FMdXBzcGdLSk1Mb2tGL2tvYlpsZGdMTHNUR2RTeldHQnFnQzZJ?= =?utf-8?B?ZFdEOXBQekJGTkN0ajBuMWpDSi9DVTZkVWZRM21zdXhUaHpYNXdtMFNyS0xk?= =?utf-8?B?WW5DenpBc3RnZTN0VHFwU3hRK0FNTHNCZVVja05YRWRRNGFMV05Tck5BZStm?= =?utf-8?B?NGcwZUV6bW9SVkJJNmcvT2laRGVOdGRKZzQ4djg1VXBhZzNtRE1nTDBadjdm?= =?utf-8?Q?PYoweQctqqXg1CFq7i/kO/A=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4766f35-6c31-451f-3a1e-08d9fcfd6297 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2022 10:05:46.2045 (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: fOngXPT+0olejHMQW+UB/y9caSKV33OF4nOYTLQWBIPgee1jdbu4/rQLAC0TYVGVo3dhzQN7f6i8W1LaBJvOGA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3311 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1646301990899100001 Content-Type: text/plain; charset="utf-8" From: Zhen Lei Fix some spelling mistakes in comments: sentinal =3D=3D> sentinel compresed =3D=3D> compressed immediatelly =3D=3D> immediately dervied =3D=3D> derived splitted =3D=3D> split nore =3D=3D> not independed =3D=3D> independent asumed =3D=3D> assumed Link: https://lkml.kernel.org/r/20210604085656.12257-1-thunder.leizhen@huaw= ei.com Signed-off-by: Zhen Lei Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds [Linux commit: 05911c5d964956442d17fe21db239de5a1dace4a] Signed-off-by: Jan Beulich Reviewed-by: Luca Fancellu Acked-by: Andrew Cooper --- v3: Retain all Linux side S-o-b, as per 5e326b61693c. --- a/xen/common/bunzip2.c +++ b/xen/common/bunzip2.c @@ -73,7 +73,7 @@ =20 /* This is what we know about each Huffman coding group */ struct group_data { - /* We have an extra slot at the end of limit[] for a sentinal value. */ + /* We have an extra slot at the end of limit[] for a sentinel value. */ int limit[MAX_HUFCODE_BITS+1]; int base[MAX_HUFCODE_BITS]; int permute[MAX_SYMBOLS]; @@ -326,7 +326,7 @@ static int __init get_next_block(struct pp <<=3D 1; base[i+1] =3D pp-(t +=3D temp[i]); } - limit[maxLen+1] =3D INT_MAX; /* Sentinal value for + limit[maxLen+1] =3D INT_MAX; /* Sentinel value for * reading next sym. */ limit[maxLen] =3D pp+temp[maxLen]-1; base[minLen] =3D 0; --- a/xen/common/unxz.c +++ b/xen/common/unxz.c @@ -23,7 +23,7 @@ * uncompressible. Thus, we must look for worst-case expansion when the * compressor is encoding uncompressible data. * - * The structure of the .xz file in case of a compresed kernel is as follo= ws. + * The structure of the .xz file in case of a compressed kernel is as foll= ows. * Sizes (as bytes) of the fields are in parenthesis. * * Stream Header (12) --- a/xen/common/unzstd.c +++ b/xen/common/unzstd.c @@ -16,7 +16,7 @@ * uncompressible. Thus, we must look for worst-case expansion when the * compressor is encoding uncompressible data. * - * The structure of the .zst file in case of a compresed kernel is as foll= ows. + * The structure of the .zst file in case of a compressed kernel is as fol= lows. * Maximum sizes (as bytes) of the fields are in parenthesis. * * Frame Header: (18) --- a/xen/common/xz/dec_bcj.c +++ b/xen/common/xz/dec_bcj.c @@ -422,7 +422,7 @@ XZ_EXTERN enum xz_ret __init xz_dec_bcj_ =20 /* * Flush pending already filtered data to the output buffer. Return - * immediatelly if we couldn't flush everything, or if the next + * immediately if we couldn't flush everything, or if the next * filter in the chain had already returned XZ_STREAM_END. */ if (s->temp.filtered > 0) { --- a/xen/common/xz/dec_lzma2.c +++ b/xen/common/xz/dec_lzma2.c @@ -147,8 +147,8 @@ struct lzma_dec { =20 /* * LZMA properties or related bit masks (number of literal - * context bits, a mask dervied from the number of literal - * position bits, and a mask dervied from the number + * context bits, a mask derived from the number of literal + * position bits, and a mask derived from the number * position bits) */ uint32_t lc; @@ -484,7 +484,7 @@ static always_inline void rc_normalize(s } =20 /* - * Decode one bit. In some versions, this function has been splitted in th= ree + * Decode one bit. In some versions, this function has been split in three * functions so that the compiler is supposed to be able to more easily av= oid * an extra branch. In this particular version of the LZMA decoder, this * doesn't seem to be a good idea (tested with GCC 3.3.6, 3.4.6, and 4.3.3 @@ -761,7 +761,7 @@ static bool_t __init lzma_main(struct xz } =20 /* - * Reset the LZMA decoder and range decoder state. Dictionary is nore reset + * Reset the LZMA decoder and range decoder state. Dictionary is not reset * here, because LZMA state may be reset without resetting the dictionary. */ static void __init lzma_reset(struct xz_dec_lzma2 *s) --- a/xen/common/zstd/huf.h +++ b/xen/common/zstd/huf.h @@ -131,7 +131,7 @@ typedef enum { HUF_repeat_none, /**< Cannot use the previous table */ HUF_repeat_check, /**< Can use the previous table but it must be checked.= Note : The previous table must have been constructed by HUF_compress{1, 4}X_repeat */ - HUF_repeat_valid /**< Can use the previous table and it is asumed to be = valid */ + HUF_repeat_valid /**< Can use the previous table and it is assumed to be= valid */ } HUF_repeat; /** HUF_compress4X_repeat() : * Same as HUF_compress4X_wksp(), but considers using hufTable if *repeat= !=3D HUF_repeat_none. From nobody Mon May 20 23:49:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1646302006; cv=pass; d=zohomail.com; s=zohoarc; b=FTGnl3GfLMrkbWJV5UT72FJ9oqcNqYM5+0IKEmekt9b9Sz7/FMxKTMRgebHFNomqSXjbiKbVc4jfeLk6HdquS/4dtIDsI4Vg6y+2ebvSUnYae/umdtwJdB28IrE/alqKp7RNXtFH+3KQ+lYm+kIThlVET9mIg3HAtR7jnvT9Obs= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646302006; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dWQiEscHMitckPtyowVTpPJHsuAivRldTvGBRFOefis=; b=VTV+e7t6AnwmQFwTHkt7t61wv40wzCN17GHQxqAPhHr9PNH10OaSBLM81Pp/Eg62ep64Qa4iPe0iswQY+HNfz06+h0/H/RqnCb9GRNCzkaaBZ14OsTZ9PpDZTQP5Tv3ksoED2tHwLNOntydHLBxL45fxG56Ixh3nFfi4iUlDxTM= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1646302006516668.7251497216895; Thu, 3 Mar 2022 02:06:46 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.282911.481774 (Exim 4.92) (envelope-from ) id 1nPiLi-0002wk-HG; Thu, 03 Mar 2022 10:06:18 +0000 Received: by outflank-mailman (output) from mailman id 282911.481774; Thu, 03 Mar 2022 10:06:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nPiLi-0002wZ-DF; Thu, 03 Mar 2022 10:06:18 +0000 Received: by outflank-mailman (input) for mailman id 282911; Thu, 03 Mar 2022 10:06:16 +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 1nPiLg-0001Ia-Md for xen-devel@lists.xenproject.org; Thu, 03 Mar 2022 10:06:16 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8ff7ac00-9ad9-11ec-8eba-a37418f5ba1a; Thu, 03 Mar 2022 11:06:15 +0100 (CET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2056.outbound.protection.outlook.com [104.47.13.56]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-6-Y0uCy6dQPaWPXR-MYMKb2Q-1; Thu, 03 Mar 2022 11:06:14 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by DBAPR04MB7256.eurprd04.prod.outlook.com (2603:10a6:10:1a3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Thu, 3 Mar 2022 10:06:12 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::d479:b728:345c:bd65]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::d479:b728:345c:bd65%6]) with mapi id 15.20.5038.014; Thu, 3 Mar 2022 10:06:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 8ff7ac00-9ad9-11ec-8eba-a37418f5ba1a DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1646301975; 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=dWQiEscHMitckPtyowVTpPJHsuAivRldTvGBRFOefis=; b=EWvubYFjPAFE3G12+Ya8iogmoE4A8iMhERuFpHP55DJ+Ad9CIhnL1uET6ixxclFnHG72Tu nyxa21ioGaFQhKOqUohwKtnCQDwzeUbMWLER7HvxZv2SVne6aOsq2oIN/er0wPHmyWXkts AI0UtCmukBZ+Y7ytRRwKfrJ/LQav4g0= X-MC-Unique: Y0uCy6dQPaWPXR-MYMKb2Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iZSHlQYFNNgv9wilX+mNqihXLn1O31wR1A0IuQjoNCjHM41bRt+md6SuVAggjT3Mhp5DC/sTQoU8NgqEkrbb59nH8mBBx6d2YO19lbT18vOTqmTtkgGI/o6ttMNk/s2T+Ix5Tek0rAxrjE5nGg76GcNEJOHMU/AHdkqEZJpO083BI5N2TUNtbN4LhsfQrsdIPJljiO65qthntZdD9UUBwwxipuVNc09+Nhzvmoc5+OY2CoSoLbAWC54nP98mruniZwaTXlpEPJvr43H2X+LAEPXW7PWAxHaVfOeJVc2+F/bAVFzFe3lQeAnp6/RtciYH2Ej0fi7AN9ST3596QzHPnA== 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=dWQiEscHMitckPtyowVTpPJHsuAivRldTvGBRFOefis=; b=TDUFvB2C+Os5lzooH53pJ66m4lpwWupxyLZtyb74dvcSAwtP6So5w9kESvI5G7lKnZQurhzR9wqlu7MEb6UssDHUod2aHllHny5u4xveFwyByBfL7cXmtDqhgCbp1g1tibZb4PnpuYd8Vb1qEWh2LVhFKH/coV5uy2xweFwJmBVKpkJPGvP8JmleAcdCz22ybtqb9nxJFe+AG5CxrdOImWZ9bcTuq29ab/GGdVdaDGtp4A2RTciS11U7rVEfpTBBFZVSQtShr60D9S8I2tRcVZXQrk50lacOcivybVyym+COjOJS6r7uCawJ8AJYDswOb38FE+aozhYcq9bZQSm/Rw== 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: Thu, 3 Mar 2022 11:06:09 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: [PATCH v3 4/7] xz: avoid overlapping memcpy() with invalid input with in-place decompression Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM6P191CA0060.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:7f::37) 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: 96213b40-a0e5-4bb5-9307-08d9fcfd7205 X-MS-TrafficTypeDiagnostic: DBAPR04MB7256:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0SOUlTGlz3Fs5jlVf2tHPG0E7/j20G37gvGrKhnTzubEr/AB2KkBhqnN6DyCY3mLD6P6U4Fq/fjk9yMHWsfLe4NmoxvJ7oytgdTFM8oscFYzKUzDxEpyxpWXUM7jjp9LNsn/LovL6y8JK24ZkQsaZHDhKfrJLbkNFQsPx78xtTLBo0C+Ndbq9au+v0FTxhIFaB16JPF8m8tDSQjQuSCjfsz2FVHLIJMNDbj34bxu1E06/v5mL3i/j38lXmvwqh9HQtu21848MKd9D7tP8aNvrDfd4zC0M3nIA9Bkyt6RJGpt/8z63h2x/bEsgiqU5iK12e52ABr5lINdDW/7BXcSdFRug/4sAMssqUoO72RR6lAZCpn4VPpVd83QbsA5vC5ZYxIMD7KApvJnWcBY9W19y5D3LTlNuwi5uQ2uiHgBJmnfhbpA1m9QqgYS/K2iWUK9movRlHZ7Q9L2mcB7W6s5sV/32GFvSzutb9PdNP7NBN3HeBoIDp1ckBk6i+fWP9NxpH5Vcqfh9Eo0N9cEpNy8j4DIsP7UHMbKwpHf94w5yUxpad2v2cEOT0p4KUkyE87anuRu6EXUI7ykoNEAA1tPcPqiFW4w3E44YJQ7gY4+XuBbXkup9Ya71tk3YNozo6qcimZctxqS0tGcU4nXh1d+3M9y5zOqJ6DSV0n6iHEIUYwFU9Ajh99sB7mOGDhR89Lb6I/E08wsQ6NyapNmhs/AOkUUrGAyl6kZM0nctxC4vL5I4H1+g4+rvIz2ujZXsb5/D7DSzUaRQvEzazGPVmPd5Q209WSyrYQwmOcB3jkRkJegSx9L9CXvZ/ygu3HJezqtFlpgoDlUzmyAa2Ygnr7YMw== 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:(13230001)(366004)(186003)(5660300002)(26005)(8936002)(508600001)(54906003)(6512007)(6916009)(38100700002)(6506007)(6666004)(966005)(6486002)(86362001)(2616005)(66556008)(31696002)(4326008)(66476007)(8676002)(316002)(31686004)(2906002)(36756003)(66946007)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WlVoNmhGa2F3a3lzcWhXTjN6MU9HWlNMNU1WK0gyV0JXQ2k1L3ZHbWl5cW41?= =?utf-8?B?QkdyRjY5ZTBQT3RwR01Ta2JsYWxWTlZuYUh4VmJ6R0RkUnMrMWVVbmhFSURK?= =?utf-8?B?TUJoYjdXTk1IUXRtMXR6c0VMakkzNXFkMjNKWnlQU0JIS3lqMGRCNHdWN3lr?= =?utf-8?B?NVE2dUtGck85NWptNnFSNE1Ta2NqNmlJWGJjclVlMTlLY1hxZzk2blpWb0pT?= =?utf-8?B?dGxyQU52ZWhKdVpiKzdHWk1LS09ySndicVBXNWtrb3BJQnlObGhlayt5eERL?= =?utf-8?B?bkhQUU96WVpLU2FtdW1JUHRxVG5ybVg1YTZwcXhjTWwyR0Q4b3ZnSkNpSFFC?= =?utf-8?B?SzJDRTdEM082UC9yMmhnQ3VKTTdLZE1RUkkydXBSYWo0YVlyV1JKNUU3Y3Iy?= =?utf-8?B?TS82UkE5OG9aNDhYRVhickNhSldHUEl0OExicHdFWjV3dHM3NXdMSFlGazFt?= =?utf-8?B?TWVwQjl0eW4xZ2RMWHpjK3VzY25wZmN3NXNmZ3orUVowSmF5c0JzTGhraWJq?= =?utf-8?B?SFJDM08rUVEzRldVU2R3OVJTdU53S0lTb1lXd1loV1hxTi9TdVVtZENrb3Vv?= =?utf-8?B?bnlwclZUeW04ZUxUZ0V5THVSZnFkdlpZTVk1azhGclZncE9iOWRreVdoRDBh?= =?utf-8?B?S2t0OHcyUDRRaERweDM3L3JSWTZKVDZJaWp6RGNNUlhwMi8xcXl1ZUVNWXB4?= =?utf-8?B?UWRiWTQrYVdDTEJpb1FROE5GVVlYZS9TT2RQaStMaGlUTUtLRVlDSE80czBB?= =?utf-8?B?MlFDU045djYwd0xPcENXOUVWbDZCVGpnUDJUcFF4NUxMcHo4Z016Z1l2bkI1?= =?utf-8?B?emFabEllWHRXTEVqc0VPdmlRQlh0eDZsRmQ4SGFIT1ppNmlrRDFYMG9LVXJP?= =?utf-8?B?L3VsSWF2Uk9CVWxNRy9jbW5zZXcvckZpZklmZnhCNVJQeXBqQ0k4SHk4bXpZ?= =?utf-8?B?QUg5SEp1b3JybVJTSlJhT3JDbVdIcjZONmZlNC9PWlROYnNZclZrT0ZHZzVE?= =?utf-8?B?VE1vemcrS0IyazhqazhmZGl1V0hWL2E2OTNJOThuanFPRDUyYi9YUW5zc3BW?= =?utf-8?B?Z3ZyWG5jTnEzNVpvL3lMeGRPMm9qYStFRGx1aU0wOXBxSVhzeGJQdy9jRGZQ?= =?utf-8?B?TnNrVUxxb1RDZ2NTVTdrdjlHWHNMWXR6M2tFTkorUk5ZUi9XRlRjb1RLY3Az?= =?utf-8?B?RGF4NXVWSWF5YW15WkphYnpDc1BPUFoxOVMrMFhOSUtEK0FtRFcwaWVuQ3JZ?= =?utf-8?B?SlpWbjVwN1ZVUzI0YVlxUE9aQm1YaGNvSU8xZ0hwek50Y2RQZVhvWG1YWjdY?= =?utf-8?B?SUp4dXRNcGRqV09EczRXeFFVS2NRRWtaNmRSWUZmMjZDdEFCRlZ6dVZHY2kv?= =?utf-8?B?VER5LzR1dHlqWXZFYzBQNDdiWWJtd2ZNeXBEWkhHVEx2d0E4QXJJdFROMmRx?= =?utf-8?B?dkFHUlVIU3BzZFZiQnNwbmRrbmF6ZURULy9oY2FYYzVVR2VLWjJRamkyTlRG?= =?utf-8?B?VE1JdG51UDF2ZUVxdkdlQjNPRnV1RmpETzBBOUl4QzZRUEpBYWlmK1NqRlVw?= =?utf-8?B?dTQzSTZPS01iRHNVUDRxTnQwSHVyck9hMzBPMGxHbGdid2JOdm5ENktubXlK?= =?utf-8?B?NkUwcnpic3ozWGswaDFZRi9rdmI3NXZ4VkdyRW4wSDFCWVBuZ2JHWDdMb3lU?= =?utf-8?B?MmdmVTNDbm9sQ2xVS3NoRkFnUFluaTJiWUhTYUpGVDJHZjk0NXcxbHpnWmNX?= =?utf-8?B?TnNaM1ROamJHZFFKME1jekhtdERGZ0RFOGx3N3RnMG14eTdlczVta1dBdE4w?= =?utf-8?B?ZGY2ODY2Qmx2Uk13Q3lEYnVUSzlYYzN5QVArOFJIZkRTTXUyN0s2S1lSZlZH?= =?utf-8?B?bHJQUTFZN0dDYlVRZ2Z5Zk5rMGxsMmlMQTI4dE1aL2hGSDFyamFnMUcrMUxF?= =?utf-8?B?eHcxREpOa1lHbWdsS3o1TS9XVU1JamlrZ0hwOFJiejU0STBsRzVidW5QazYy?= =?utf-8?B?M2VsNG16eGNMYzJIQTFodC9EVjRIOW1MTllhMk52eHdiYTZWY2d6L0xnYnly?= =?utf-8?B?eE9EL2E5WWN1b0pxZDJyc0YrZVpxZU5HbXIzUnJYSDYzeEV4Z1BpVGxVWnZL?= =?utf-8?B?ZlUxbDZvQzdsVi90REJkVGVKNU4yVkNvZ0tLQkk4WkJpN2NRRFg0WFZkNDJo?= =?utf-8?Q?IoPPvXvQsl+kWXSb58tBRb4=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96213b40-a0e5-4bb5-9307-08d9fcfd7205 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2022 10:06:12.2029 (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: QUETtAAQP1SRkl8Y3f23rZCG+2FUSK+c1L1V3bMixyF+8fl64AvV2KXX3u34MkW8u5S6RH6j3GmMhWsi0FBkww== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7256 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1646302009072100001 Content-Type: text/plain; charset="utf-8" From: Lasse Collin With valid files, the safety margin described in lib/decompress_unxz.c ensures that these buffers cannot overlap. But if the uncompressed size of the input is larger than the caller thought, which is possible when the input file is invalid/corrupt, the buffers can overlap. Obviously the result will then be garbage (and usually the decoder will return an error too) but no other harm will happen when such an over-run occurs. This change only affects uncompressed LZMA2 chunks and so this should have no effect on performance. Link: https://lore.kernel.org/r/20211010213145.17462-2-xiang@kernel.org Signed-off-by: Lasse Collin Signed-off-by: Gao Xiang [Linux commit: 83d3c4f22a36d005b55f44628f46cc0d319a75e8] Signed-off-by: Jan Beulich Reviewed-by: Luca Fancellu Acked-by: Andrew Cooper --- v2: Retain one more S-o-b. --- a/xen/common/unxz.c +++ b/xen/common/unxz.c @@ -127,7 +127,7 @@ * memeq and memzero are not used much and any remotely sane implementation * is fast enough. memcpy/memmove speed matters in multi-call mode, but * the kernel image is decompressed in single-call mode, in which only - * memcpy speed can matter and only if there is a lot of uncompressible da= ta + * memmove speed can matter and only if there is a lot of uncompressible d= ata * (LZMA2 stores uncompressible chunks in uncompressed form). Thus, the * functions below should just be kept small; it's probably not worth * optimizing for speed. --- a/xen/common/xz/dec_lzma2.c +++ b/xen/common/xz/dec_lzma2.c @@ -387,7 +387,14 @@ static void __init dict_uncompressed(str =20 *left -=3D copy_size; =20 - memcpy(dict->buf + dict->pos, b->in + b->in_pos, copy_size); + /* + * If doing in-place decompression in single-call mode and the + * uncompressed size of the file is larger than the caller + * thought (i.e. it is invalid input!), the buffers below may + * overlap and cause undefined behavior with memcpy(). + * With valid inputs memcpy() would be fine here. + */ + memmove(dict->buf + dict->pos, b->in + b->in_pos, copy_size); dict->pos +=3D copy_size; =20 if (dict->full < dict->pos) @@ -397,7 +404,11 @@ static void __init dict_uncompressed(str if (dict->pos =3D=3D dict->end) dict->pos =3D 0; =20 - memcpy(b->out + b->out_pos, b->in + b->in_pos, + /* + * Like above but for multi-call mode: use memmove() + * to avoid undefined behavior with invalid input. + */ + memmove(b->out + b->out_pos, b->in + b->in_pos, copy_size); } =20 @@ -421,6 +432,12 @@ static uint32_t __init dict_flush(struct if (dict->pos =3D=3D dict->end) dict->pos =3D 0; =20 + /* + * These buffers cannot overlap even if doing in-place + * decompression because in multi-call mode dict->buf + * has been allocated by us in this file; it's not + * provided by the caller like in single-call mode. + */ memcpy(b->out + b->out_pos, dict->buf + dict->start, copy_size); } From nobody Mon May 20 23:49:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1646302021; cv=pass; d=zohomail.com; s=zohoarc; b=NAuRw9CVCnjA9cURhPp/SYs+www4YdpNSCwhbm9P6Q43JKlQTYp8rkVOKUehC09Gg3iv897FmaDexhKRaQExumEIrzpRUYaz3IuhVyrI2JfANVZwTRAisPKHM/MScLF7cEmlH1d2AE0nS/cx4NUFoTCtSfNh73WG2ptaWCq2b/U= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646302021; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rp6zR0202WWrjoyuiwHgeOxRqJmRNX0SFCkPJp8UDMs=; b=k7d7+Zw9CZR1T/ffIY5gbHzTTdIFyC31WLqjMj6ByYXRwiPmIZMvner+BPl2Kl6lS/GX8w+FX7tea2etYp3Jrzk02QgQZtT7hyk7+mcTRGN00x5f/feVkpK3I82U4QP0cDy3xH7vpnVdr1qHcRdqu60kLanGBPQPh3KxBgIj40c= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1646302021855602.4114392449374; Thu, 3 Mar 2022 02:07:01 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.282920.481785 (Exim 4.92) (envelope-from ) id 1nPiM2-0003hY-Rh; Thu, 03 Mar 2022 10:06:38 +0000 Received: by outflank-mailman (output) from mailman id 282920.481785; Thu, 03 Mar 2022 10:06:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nPiM2-0003hR-NX; Thu, 03 Mar 2022 10:06:38 +0000 Received: by outflank-mailman (input) for mailman id 282920; Thu, 03 Mar 2022 10:06:37 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nPiM1-0002Fn-02 for xen-devel@lists.xenproject.org; Thu, 03 Mar 2022 10:06:37 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 9c358b94-9ad9-11ec-8539-5f4723681683; Thu, 03 Mar 2022 11:06:36 +0100 (CET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2052.outbound.protection.outlook.com [104.47.13.52]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-7-8DiBiTeRNsOnBDitWgBfww-1; Thu, 03 Mar 2022 11:06:35 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by DBAPR04MB7256.eurprd04.prod.outlook.com (2603:10a6:10:1a3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Thu, 3 Mar 2022 10:06:33 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::d479:b728:345c:bd65]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::d479:b728:345c:bd65%6]) with mapi id 15.20.5038.014; Thu, 3 Mar 2022 10:06:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 9c358b94-9ad9-11ec-8539-5f4723681683 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1646301996; 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=rp6zR0202WWrjoyuiwHgeOxRqJmRNX0SFCkPJp8UDMs=; b=BrGodMW3v/UOmA/pptgwpGHOr68hqPVxIDbSQakWDDPbCeUZF8fIfb6e2dDufz9KYUmOGZ 84KgZ+aOaQBdBDDqY6sYAQw/70f8n6+tGBiEKTT9nvAEb5xvm8wlbsTYa9qsKqJl2uGCfO WSzeulrofHNuYANAOTZabUKELfB5Isk= X-MC-Unique: 8DiBiTeRNsOnBDitWgBfww-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bcbsGsINUwnjpexYhsB6kfOFZPzKjy/psg6sGui8MTOkVx/7Gggvc4/M3EJgjt+QbiiqVHUp7GGnTxJLVkEbw4+ilZDoG0mzn4ioj30T1HuePOixBBtkfgkGsQ+CekAar90cFKoLxe0pwlgg6loza1vMb9LFTKuSzlhDH3ljubjEfFuLR4sf46CSF/UU49kIfFyd40j+Jzl80/u69ktcrGYnPfsuMWmLj/XSx4qdlr4d02/YtkaleK6MsnN7nMgrRBh+KKM/SYDIm0a/0RnOQv8wWTaTbrgY4sxA2Lgcnj3qVEH5KsuKthMT0QEEC4CVIdvmF2Qi4lTh+/S2qSt/Ug== 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=rp6zR0202WWrjoyuiwHgeOxRqJmRNX0SFCkPJp8UDMs=; b=UQkA7AkkHXvHbJd9bl9ftagDzlQ6qVK7IjRoUS16KzuCuSTtXhEHpvJmDim8zMjUK/Mfr6oFtpd2dIS/dm+T/6vcgQI1Mx+088/HlMolFZgb5rSol6AaN3pfvdB00tuT6fpHiFs9hx1nEDTyDJxZvM4VFK60NTP1h6aURFfjYXMjYTTacHKEwoU4dnhGsHbhBl8bP3QvM7XQXkHLqmO8hkyfUAWKby32nj89BgkFNegdJVStjcFoEnz3rx0sjaCTTJii7JEVry5BgTWGG75uSz/tM4+GsN5ALqRLkNmHMDarOP32dgX9aT24MsJBrqExKsMagoMzlwJCtIN15Ch0lw== 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: <72cb83c2-ba5c-2ac0-a5eb-dc04f6b938b3@suse.com> Date: Thu, 3 Mar 2022 11:06:31 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: [PATCH v3 5/7] xz: validate the value before assigning it to an enum variable Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM6P191CA0048.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:7f::25) 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: 85888903-d64a-4979-dac7-08d9fcfd7ece X-MS-TrafficTypeDiagnostic: DBAPR04MB7256:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5Xhpd0da39dg0s48+yAks48BDbJ8npeIiwEm2xeemgDeLQ9JmNtSBlrQzQTZai69Nf4giEklMjYRda+PtGkodbCtD7xql/zjRaOP9PXgLWpb2ttoE9wNEojhOjPomD2LRB8sAzkEwAnW2iT+onUC62NN2JNb2Wk3P76FaPqCvylRnmVFYbbcp+XSQWEBq7J1xN0txi8J+rviYfUhRGI1bqX1dszzjDOIDrUJh3k0crbQzpu/J1mH0TeI1Xtn6c/nvlqBhuiQhFnKjKJ5cxdbhlvphbvbG8Z7+nle78EkYqe6Q9u20YDeXTZyWuG9WRSPE+jJYXflnZmTOn30x7pBsr4+lcDO1jQ/1p3CfTXl2s/GxFgtArxJ0gOZah/MI8hli28vHgPXbRIHZg+ucbEXpSRn/vKeOANFt2tO4sBY8vK7hwil52SI3+DJsn/vux4YR54mY5MjMUvgq/NfHmC1wmi+dkSCvTpwZGBqXWARc4o11IcwSa3kZwQaK0nhDIp9dP/r1TGuyTD7kAgSuCzvjPJ/nxY6Q6IjkhwNzzVzDnWeXNKWb1Qs+Jg4COqW7PvEJI+Iat/zUM95lZawB/LfE//3L+Nyw4AYtN/pg31al97BlgQF3HNpHQPN3/bX+jsXsMnPYxaT4+EERmqNXIqH/+IhhH1fZ04tO7C0AZNl9XmKWg764U/7odYLLiPe3Q1l2QzwGOIn/cM9KrG7714ghcZgDHbeA6tQiOTTLCt+ETNJ+EX3e7SmDg3AilQPT4pidpfynbzp9HdIF8hnYOuA3d9KpJLnHpU/JtvFUa0qKf4GoVsPHJlu+SkxKNeL7ypS0zw89EyWqIPpeU6bXA2Nfw== 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:(13230001)(366004)(186003)(5660300002)(15650500001)(26005)(8936002)(508600001)(54906003)(6512007)(6916009)(38100700002)(6506007)(966005)(6486002)(86362001)(83380400001)(2616005)(66556008)(31696002)(4326008)(66476007)(8676002)(316002)(31686004)(2906002)(36756003)(66946007)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YWRjbmhPeTdpS1pOeDYvRFF1SHg5M0tuTkIvR1l6RkEzMTNnOFpzS0QxTGNT?= =?utf-8?B?Z3lpd29iSmZrR1IyMTVQTHhpOThYTEY5UElJelQzdGpEQU9IUjBPOWFlMnJR?= =?utf-8?B?THdlS1NDWTFJemR3RERtYUEwbS8yaU1zMGdwQXdwVnU2dGJMMTFYU2dJTXBM?= =?utf-8?B?am93STM1OVAzNmFIRzU4czY4ZnplRVVQb0JsUmJGZWZ4WmRlNmd6SjhKNTQ0?= =?utf-8?B?cTFMMkNJRWdRSUlOYXVnRVdha0xQNEhyWnJHOFowUHVDMU1JZWVQaEdoZGlp?= =?utf-8?B?V2ZRL1lZU3RWMjFaSm55Y1pmL014VXdlWkNkWE1OWlZEa3J4L0dzZXhrQ2FL?= =?utf-8?B?M1NiWnZXelY1MFkzQllxSHNTNERucHRpVko2bERjdW90TnlNU2ZrYWRPeUF0?= =?utf-8?B?ZHE3dzVzdE1IZkxUdmNqV2xWRWJZU1l3RE5NVUZTU0R2WEY5bEFHTHF0NHlQ?= =?utf-8?B?b3UvRnp2TnM2NGc1QzdMMHpOYmNSL2p6RlRaNVJSOWltR1U4Yk1jbURvdkxR?= =?utf-8?B?a1AweXB4d2lLOEYwUVE1RTZKRGh5QXEybzZtQUs2aE1XVW1GSkRaa0xHT292?= =?utf-8?B?YUhscnpwWmpNeDErWUxLMGZzN2doVnRoblpPZ1czcmFnZFlZRmpvS0liR2dS?= =?utf-8?B?V09PV0lqZE1xN3dMZngvMkpvR2M2WGZmeXZVSENsb3c0TDlsMGVDTG9mZDl1?= =?utf-8?B?UDM2dlhrU0UzZExUaURieXBaQWRrMjJyUklySGJ4N09EQnNWU2NaNlNyMDFF?= =?utf-8?B?UVE0SXlhVnBCenlzNVJHcDNLT0U2b0Zhd0ZscDhqeHpIdTlkUnlZcjlkb0ls?= =?utf-8?B?TUNuWkRKTk9VMk1GMlpqR1dxRXozU1l2Um1NbnU3VWFqdVFvNkdyMFRkdUtE?= =?utf-8?B?UmoxTTAvUEh4anR0eFA4Zm5IVW90Q05WajF1OUc5OUdtakNUbndTL1I2WENx?= =?utf-8?B?MmZXc0RKYlJBMVZZLytvMnNjZGFEb1I3TnN2NlV3eU1obklXS0tCMVQzVjRU?= =?utf-8?B?N014RUgxNUV5RjF3dm1JaVV4ZE9mYlhlWXEvLy9MNHdwa0NrUm1ORmN0RjBv?= =?utf-8?B?V1FIMnFZR1ZQT2VrN3NOUDVwc25LbnJQRlVaVzlSWUo3cGhJdFRtd2dycnRH?= =?utf-8?B?N2VpYWZKVUxBV0FtT25Md092enpFYlc1bXgzZUtrVElOZXVFTEJsbUpTeFhP?= =?utf-8?B?ZS9DRS9VYTQzdmtIVWo4bCtKd3g3US9mSnlHbXpoa0lUZUpWSUZPcEUvUGRU?= =?utf-8?B?bzZEZExWNWVCbjV0Y1I0ODRmSHdIa29EaDUxUHlKUUNWWmNqdm9PSWY1ZlBq?= =?utf-8?B?VDNwYWtpYjFvYUUyZ29ZUmFUNmthZCt6UjE4ZEhJTnVTUGNCcTdKS0F5Z3RK?= =?utf-8?B?ZEdmRzhoR0hnank3Y2p6bmFBdlZNS3VTZDZQLzI5NWkvWE1Xby9zVjNqZWlk?= =?utf-8?B?bXJUWlhtRStQN2dyelRWTDNqUVIvZzNkNVJPQ0pYYWY1SXgxVGkvaU1vc09T?= =?utf-8?B?ajJDK21wekxJNzkwZDRTQm1OS094bHJrMURUSUR0YUZCS1lPeE1BNHJWbUlq?= =?utf-8?B?bEtZcGtCbFVMVkFobmd5K0x5VW9IVTlxRldaLy9BYW1zQWhTbld6dXdybzE1?= =?utf-8?B?UE9paFEvQklCN3h4b2o0V2ZPN0hzcDQzSUx5OW5rK2NNWVRjRXNFSDRjL05U?= =?utf-8?B?clgxSlVEQnI5bEFOclc0UTVLcTFZWllSNm5RbEFES28vMnhyNGtNNWJJRDcw?= =?utf-8?B?Q0JoU1paTzJONmtjSm53aE5nZ0paWm9QQ0VHTnF2YzkzRFF1Rzl1ZDkwNGlL?= =?utf-8?B?SWZ4eDNIY0RCbE40U2dqY0l4UzgzNWJISXJNUzl1TWhzUHJtTklZTkFpSEUy?= =?utf-8?B?Smc4U0R4eURDdjROQ1BDQUpZM3NaSGpzQ1NwRWJpN3R5bE10RU5idjdCVEJQ?= =?utf-8?B?T3N6UEh2Qk9FSmxDbkRVWEpwVEpMeEh4c29rdUZ5RGtTNmF0aXlmUE5sUlk5?= =?utf-8?B?TEYxYnZ3ZjZZNmpHMzdTZ3hFZVFZUndxRzFXOUttWnI2ZmhuMXFvNTl0SUJl?= =?utf-8?B?WlRvUjBsWGR0aE1EN1hjRndwNGdMMzZ6cENab0VsT2tSL3NEQUV4c0xCS1l6?= =?utf-8?B?ejdzbmNyaUZHTDVnUDRlV3dmSXRWY2VzeG5DNVR4RVF5MDNKM251RW5zRlpY?= =?utf-8?Q?PcojXPz5ARD92/xhWmRdy2Y=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 85888903-d64a-4979-dac7-08d9fcfd7ece X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2022 10:06:33.5453 (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: 5s8C20y/V//BlaHDKEWpdM7EpW+IaiD20CrndJpEMeB9ADET1WVStfB9TTOoL/NhhqwXBl+mD8ZKCkb2Tvytlw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7256 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1646302023171100001 Content-Type: text/plain; charset="utf-8" From: Lasse Collin 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.org Signed-off-by: Lasse Collin Signed-off-by: Gao Xiang [Linux commit: 4f8d7abaa413c34da9d751289849dbfb7c977d05] Signed-off-by: Jan Beulich Reviewed-by: Luca Fancellu Acked-by: Andrew Cooper --- v2: Retain one more S-o-b. --- a/xen/common/xz/dec_stream.c +++ b/xen/common/xz/dec_stream.c @@ -402,12 +402,12 @@ static enum xz_ret __init dec_stream_hea * we will accept other check types too, but then the check won't * 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 =3D s->temp.buf[HEADER_MAGIC_SIZE + 1]; =20 #ifdef XZ_DEC_ANY_CHECK - if (s->check_type > XZ_CHECK_MAX) - return XZ_OPTIONS_ERROR; - if (s->check_type > XZ_CHECK_CRC32) return XZ_UNSUPPORTED_CHECK; #else From nobody Mon May 20 23:49:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1646302058; cv=pass; d=zohomail.com; s=zohoarc; b=oFZUxcA1Kk2rCvWgHEWoU4w1Vk1yzrRvysG8i57DoxdBXZHlKkRNUJlNK2nK4glq7iFH1Bzi/XRwLLFc0+9uGR9kwQzY8xg2BZ8X3mT5IoARgRp9q08VQgqRM4OTHODqgUz2506vXHSJNG0bLcYfI4yRD+Ha1LNJZoh+oMdC9TU= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646302058; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0H0YRL04KECEnhSZHc0txOpsgQMjHkGgxeFv8W2+jqE=; b=XYK0GjzvBPTCfu1ADKFEf03akTbGsBxuwwN1N9bdwc2djmMgyMDzVJ1JEWrYzTwzDEwT+VTML6hCWcvwR/J+n3w7PypmT92X1Svxb+3DVTvO+5FTnMZiJl8i5h31Y0x/me3RwMvi51hAcwM2QnHvENndgV+mwNpVrOwLBSpSgFs= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1646302058566220.59268058204145; Thu, 3 Mar 2022 02:07:38 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.282928.481796 (Exim 4.92) (envelope-from ) id 1nPiMT-0004N1-5i; Thu, 03 Mar 2022 10:07:05 +0000 Received: by outflank-mailman (output) from mailman id 282928.481796; Thu, 03 Mar 2022 10:07:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nPiMT-0004Mu-1y; Thu, 03 Mar 2022 10:07:05 +0000 Received: by outflank-mailman (input) for mailman id 282928; Thu, 03 Mar 2022 10:07:03 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nPiMR-0002Fn-NV for xen-devel@lists.xenproject.org; Thu, 03 Mar 2022 10:07:03 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id ac268b65-9ad9-11ec-8539-5f4723681683; Thu, 03 Mar 2022 11:07:03 +0100 (CET) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03lp2051.outbound.protection.outlook.com [104.47.9.51]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-11-x9RipL0rNwSbs3GBe4ORyw-1; Thu, 03 Mar 2022 11:07:01 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by DBAPR04MB7256.eurprd04.prod.outlook.com (2603:10a6:10:1a3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Thu, 3 Mar 2022 10:07:00 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::d479:b728:345c:bd65]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::d479:b728:345c:bd65%6]) with mapi id 15.20.5038.014; Thu, 3 Mar 2022 10:07:00 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: ac268b65-9ad9-11ec-8539-5f4723681683 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1646302022; 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=0H0YRL04KECEnhSZHc0txOpsgQMjHkGgxeFv8W2+jqE=; b=NuJbbU0IMlhvAsnZdTALkoe5HCXfygXXg02tKC5tkeFXfRPQOnca4QS32EFLYB7VB16noY vYwWkTFUy2l8NcuM4Xsvxy+xWflofx3krfx6NdX/EJ7/dVK5lO0BvZhkZ/fTCITtHiOow2 30Kr4WBB3UAKssdnLT64DTQ/xV3EzGc= X-MC-Unique: x9RipL0rNwSbs3GBe4ORyw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j6SgIZsTvZXCcIpSDIrmBMtd5W6kDDHZ0YiUuDOFr5CntfUP41C28cqFxZ7QDTO1hPX32ojBvY1g1Y21aY1kADusU3S/oPorvP9kOwm5VItzNvN6UyLU6ZyuyvzVID93kbNp/Xo9PJQ0s062KEuG597o9U1+vj/OoOOKIvvRyqyk3nQYvXglMNcVcA4LViIERW2js14sKPbmE/accPYfzGMqGPkLqfr7ddJE9jW/acU164DcCXqw/wOEB1OUMhe8YGnL8IOkknM/0ILdxS1oXR2fIpOu8Hkeuvzz7WkaPxoil+cYkbf1rPj09WjcBraW6rt8/07o+VxQbv8oUz6mSQ== 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=0H0YRL04KECEnhSZHc0txOpsgQMjHkGgxeFv8W2+jqE=; b=DjkSOgdZ9TDmZeuR6EdqyvLJ79AYTZSnUHFvXHWanLZV1a5ZdJNBGXrJqcfitEJQ5r68Ri14Ri3MFF9wDYjZEWOMq4KgiVaZ/LY4l4rJyIDLCEx4wXhZSswNnyuuhmapCTn1+9F9ynr46dOyUde+l8NvLW8aBUd1vUsCNE6/oQgsrV2eRZzkO/Qf5e7inHwfY82F06wEaMvBnoeQ8YRrxqsKoJyMB9dKP1uE7p+FNfLMl4oAO+wdHLAWGY6OrKtHDdwaoth/jK7Q4aWIvab572bq0Lv443z4trdOBfySvvU7bsrjEK1QJvFodBSqXc+0kR4tb463IwJyHFydFywboQ== 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: <4daa52f3-2fbe-c218-a8b8-a43c1b23f803@suse.com> Date: Thu, 3 Mar 2022 11:06:58 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: [PATCH v3 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 , Julien Grall , Stefano Stabellini , Wei Liu References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM6P194CA0002.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:90::15) 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: 2cf04b77-d9f3-4fd7-c9aa-08d9fcfd8eb6 X-MS-TrafficTypeDiagnostic: DBAPR04MB7256:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o6StS2Kb+UZgIr3Oxh3XP6GTSNqPQ8FTCb6mMsvm8csGmiBbMLMkkik0F1ILe+QQWOPqpP74zJ4w2JS15Wf4NcVRX35fvnVccCC+uQibt7aZsRYpaLJjb2SKYHaGBNEtf+ZZCWv5ZHz/s5AOispz0wwt8TfC99a9akCKvRaA+Gi1EwMhl95jUm0DF+uF4QflIJ6PwZpp4aoh+5kbyrMFFKz7xxq+F17qUuyCkUBsWt3pzzXqVnTB76o+uNWr61kQMWyjhG37XN1DjjxJaVcy5KtZRoYb9nAryUmCIJ0nCxlS3L8jPLVw/EkqEqYkZsoyDMZvb0rIbPryeXx4UciSguDmt2A3tr20dCL2nXoLRRmDPJ6CMEOYQcTTlrQRKQFSHpDru0ghNY7g+adfK5uGoAdXwIqOYMO4qPG6OJntV6qQBZs4BCxFoZhY6al4jg17nLM4h5Z6dtxVhNK2HgKW4E5jwVD/W2bxT2mEbvDuwJISrGV2SikJEK/Z4/Cbc+jlfIWILfKURNF4hIt4OLx2naXdOCD1KUBBpLILBSEjyPci5uNuxzF8efRGePEvYERf/3/5eJrfc+OuW1wbc43LNIwOmptD0zNt6XXf9CUPG7okwaM/LMDefbCTBEcP+RVjXC5ezQ/oAdZPjPsrV0nOE+7CsZe2hsvF0B08k2STwCTAa++tBhp3/LW5S2Us4+5m0wiU6Yz4/T9YbFMgZD/N7ixn536tU+QM8Jl7bZkO9VXECldtVnN7svHNQ6kUIe+4ltXKpGqWiI6T0NOYY+R0k7ZrgWD60ShcOGBov2MIEiClizZbaKMPiwt8qlkZUrhMImJU0l1audur9E33VQsJ5w== 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:(13230001)(366004)(186003)(5660300002)(26005)(8936002)(508600001)(54906003)(6512007)(6916009)(38100700002)(6506007)(966005)(6486002)(86362001)(2616005)(66556008)(31696002)(4326008)(66476007)(8676002)(316002)(31686004)(2906002)(36756003)(66946007)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Zk1ybkFkakNiVlNGam8wRWVWdjJrK0pEOUpuSjFzMUlCV1I5TktUbFpPV2xj?= =?utf-8?B?ak13d3Z3STNkdzY2Z3RkYW1mSmNvTHEybktZdm4xTVlYeUZycXB3ZWRiY2Z4?= =?utf-8?B?MzJSVEdOMXFvU0tIZmNZWGFpWVFxSGJ5dXR3cXMyalc1c3FJb1U5TzJhYjdl?= =?utf-8?B?Y1c5eWFqT1d2anRpcGtSSHR1eDkwN01iTDBUdXJoS2pocU1vMVlkN0NpM2ZG?= =?utf-8?B?b0dWS1I3anV6ODBqZ1k4OVVqRTIxYkNEVGNiTUpWd2RLNDhvendabWd6em4x?= =?utf-8?B?QkpCcmpONDJ3d2lTMi8zTVNTZi9UYkNyN044bUJsNGJ1VmFCS1Y0aHFwNS8y?= =?utf-8?B?UUswSk5XNncvdzhsZyt1Smx3NG5IcFl1a2VuOUdJdWhEWnFBY2l3QWNjbUlM?= =?utf-8?B?cHhKbXJkQk9SeWZCeWhCSWdhUlRrS3RrNXQvblU3VTJNdEFZVVhPZmk5NmU1?= =?utf-8?B?b3FVMVNOOWt3NmRiczZ3T24xOEhBOEl1OFVSaE5IbjRIVVh1dkxPYmc1aktK?= =?utf-8?B?OFcrSDZmdEF3SVVxbXVHVm5QTVBNV3lCZkZDekxaN3d4a29tNGE3LzYrWHJ1?= =?utf-8?B?eE9weXNFdkVhNzRTRmdTazRZM3Z2cUxkYnVzOWV1SVdqSGdwZ3dYeTNrQjhN?= =?utf-8?B?dkJFSHE5dFowamgzYjF0aFFHbkwrb05MZjVDa3pHKzBSWWRKblpQeUVGamhE?= =?utf-8?B?V29Zc2pGcElZbnNNV1lEbFlWeWltaDNXbUNIYUJrV0laZEJ0M0IzVm5aMlVG?= =?utf-8?B?YkJ2emVIbEE3dE52NXJoV2VjOHR6Ykd1UDR4UmlSUHNHNG1IK0xjOVl4cHZt?= =?utf-8?B?OWdpaDBUZ1dUVGdjNWU5TDd2aVRiS3NXZUY1RWU2V1FoNFR4alg0cUtKdFZW?= =?utf-8?B?eU1UUGxNMThiMjRjQlkvb2F2czFWTElQajBDT3FHTVo4c1lFNUMwdktPR254?= =?utf-8?B?aVgvWERJM01NY3hlWlA2RHhKN1lOTUFXTGk3R1h5SjdyNWQzaUtPRkhkOTlY?= =?utf-8?B?ZlpsSjh5ZEFCV2RsOFhxVEgzbjYzS25JTDkwV1NtTGY0N002Nk5sS0tHOThx?= =?utf-8?B?UzQ1NVdNa1E5SUpkWndrUHZDaTFjS3VJMW95UnlKektFaUtCM0Z3WGtDU29P?= =?utf-8?B?ZUxlTUkvNWxMT0c1cG13eGZFWEh3ang4bGVDRXdZdHRTeER2aHN6WEwzQ0Iw?= =?utf-8?B?ZkRSUy93T3U1WEkwdUkxZk5PQmVFM2hiRUMzMVZZWXIyb2lIdnZjUkVwcnkv?= =?utf-8?B?Tms3cW5KUVllYW5HQUtuSUdJRnY3S25RemR4SnBtZWVxTWpjaXNCcExCZzV4?= =?utf-8?B?TWxoS1F5QnhyemN3di9iRUJ2Q0hUM0VyZTRoejNtZGJUWmw2OFoxdVp4a2lh?= =?utf-8?B?bHp5Zy8rNy95c0J4Mncya0tkbktsdEFBeEN5OHRJM0d1RnhzY2E4L2pqdHRk?= =?utf-8?B?Q1NzczZZM21XN1VDY2k4SE9DbngyTUE0NTlNdWMzemUrTVAyRHQyT3ZBSnBa?= =?utf-8?B?Sy9rcER3N1g0dU1lbitQQ1RtVGMvT1dUZUhJU0owNjlGdVI3eDh1Y01Tc2F5?= =?utf-8?B?SVYvb0ZVTVU0ek5jUldpOElDTWE2dzVaWFJBOVJWWVExc3NpaVgyemJrRHpL?= =?utf-8?B?VmFCRndISWVHS2ovYjdWQk1tM3RpWWl3d1dkUmdReDU3bEhQcHlqWjQya2VD?= =?utf-8?B?anNGNUY2cmVaaW80ekFBVEpZRmR1S2h6SjFmOGVzSU9qL3NKZkdWTnFKYnNt?= =?utf-8?B?SXhGRjRwb0Jmeis0RE1hb1llYzlOVGFWcGNDQXJrYkdBaTVpNC9JVDRLYmk5?= =?utf-8?B?bzVwZlExQW53djVRNHdNNS9xQVFjRWF1alpGNlIzU2sxblVBVUswNHJqOElp?= =?utf-8?B?eVBDUnlSenJvRXBTQThHdWM4SU9Hdm9UNUduek5XemVRdUtIYXl2dFhidm5S?= =?utf-8?B?ZTZyN0oySzVzcDFuaEpUc0FVK2t4Q2ZIVFM1aG5QQ2NRM2hPZUN0UjZ5ekRk?= =?utf-8?B?Y0tMS25UVXdJcHptYjFKcE5oc3piTnJtSEFPMExIaUlJaXdHanpyU3MvbXBU?= =?utf-8?B?N2R2R0d4ZXU4LzAzZkk2czVrT0JKM2NBMU9jaVB2TGhBejN0cy9KK1V5N21P?= =?utf-8?B?c3diMTFKenJBLytrNGFuMFFIeXFrMHpRaU9pWThEUjZxQko2bTNIQjltRkRx?= =?utf-8?Q?QhQot1DctxbE+n8InwI6Hrg=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2cf04b77-d9f3-4fd7-c9aa-08d9fcfd8eb6 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2022 10:07:00.2467 (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: gejgE7lqimsycoa2V9GYU63g0/EbFS/7GS/zAWm3JzH3I11wZBRJiGzH6agFx0RkbCL3lrslEIR5nQYMskdwOQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7256 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1646302061642100001 Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Gao Xiang [Linux commit: a98a25408b0e9b0264abcc3dabfafd9ff2ea1046] Signed-off-by: Jan Beulich Reviewed-by: Luca Fancellu Acked-by: Andrew Cooper --- v2: Retain one more S-o-b. --- 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 =3D 0; s->lzma.rep2 =3D 0; s->lzma.rep3 =3D 0; + s->lzma.len =3D 0; =20 /* * All probabilities are initialized to the same value. This hack @@ -1174,8 +1175,6 @@ XZ_EXTERN enum xz_ret __init xz_dec_lzma } } =20 - s->lzma.len =3D 0; - s->lzma2.sequence =3D SEQ_CONTROL; s->lzma2.need_dict_reset =3D true; From nobody Mon May 20 23:49:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1646302078; cv=pass; d=zohomail.com; s=zohoarc; b=mInzncy59YcUeufzLN2I4twYG1X5xAXKK5bDVO5KSwHqEK9lOa+vs1HznCq1uVv56+JP3vNimGlJ/qyz6X9GBk3kZxrAbE3/1K5RDWNNnQrfIoi5Q6nADLSEKPAqcQDnrlZc8198FlgW+fGkZt15qi/EkJaq+CpbEvT6+6HO7rg= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646302078; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oa6iC2T5QUROEVeYq1WfshK6wYPb0g27s45ej1AfY/A=; b=GVZQFXfIWCuhrbri1b73ApJXVWKnyMttPCy5RpX7iE1KVWtiVu7BOJgU/SudOAeai5PyCoNHxtPPzKwiROX6YBDYl+jxeMh+boFc3MP+dxRoY/Cmd3NHzreyqe0K+MHttJeRbMjREOQBH+5xDWDfeUQVP6KlBrUFHRLcmOmqi9g= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1646302078777363.5097237798294; Thu, 3 Mar 2022 02:07:58 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.282937.481807 (Exim 4.92) (envelope-from ) id 1nPiMv-00054P-Iq; Thu, 03 Mar 2022 10:07:33 +0000 Received: by outflank-mailman (output) from mailman id 282937.481807; Thu, 03 Mar 2022 10:07:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nPiMv-00054I-En; Thu, 03 Mar 2022 10:07:33 +0000 Received: by outflank-mailman (input) for mailman id 282937; Thu, 03 Mar 2022 10:07:32 +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 1nPiMu-00053r-0i for xen-devel@lists.xenproject.org; Thu, 03 Mar 2022 10:07:32 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id bcad49c7-9ad9-11ec-8eba-a37418f5ba1a; Thu, 03 Mar 2022 11:07:30 +0100 (CET) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03lp2051.outbound.protection.outlook.com [104.47.9.51]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-2-lFUJprtaPsKH9rlJTkrhfg-1; Thu, 03 Mar 2022 11:07:29 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by DBAPR04MB7256.eurprd04.prod.outlook.com (2603:10a6:10:1a3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Thu, 3 Mar 2022 10:07:28 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::d479:b728:345c:bd65]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::d479:b728:345c:bd65%6]) with mapi id 15.20.5038.014; Thu, 3 Mar 2022 10:07:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: bcad49c7-9ad9-11ec-8eba-a37418f5ba1a DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1646302050; 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=oa6iC2T5QUROEVeYq1WfshK6wYPb0g27s45ej1AfY/A=; b=ZKMcAs6C+kx+5r2oWgyiPVpAjySJVM8MYDqlziVb15vF6sY34jZXL/Y2j9dDvNVtS3+JSv eRHKb32y0JjWf4+xdqPhmCeRdf1qHjMLqMzdfYcbTYOVih8sDbZiRP+nnXmVYTOgpimc8x BcjhEDLzqsaIdzYfFDwSkdqHm4J91Ik= X-MC-Unique: lFUJprtaPsKH9rlJTkrhfg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JwH6BLAHiHFDQYzqP1Gsim6/Z5fIL+pCEF0bNJhQlqBzaaO/Bbjfar/nFwTPaLkiBSCTec20KnF5VB6AWpC3eNVbtliecg2pqqpy+WFgHCtAUp54F6Dnpw/kg6Ti2d+CJOE7QOp3O5/gjbuubDbC5JmkoDykKA5EZm4LQMcTjZWdScgwz+KAUbGKF8yFmT08QFt4NdyXa1HY/Zy6c4gKOtQB974emSO+QjF4mw4NXHelLir027PEDa15s5dLWnjz19FiW9WImbwg82bE7IL1pD92QFUUSKChcVcBPDgw3hu4WO+rcDchbOMdROom6Ol5brfI24/66b+xva3kGyu0PQ== 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=oa6iC2T5QUROEVeYq1WfshK6wYPb0g27s45ej1AfY/A=; b=cC+jTSUI30HxG6k1gSUcIJIQK6xfpVcWNMB0RTbWKPcGhjavjDq4StIRZ15lneM+jlhcGW9NDJTC360DjdFt40oNq+i4jK1RvVmQ6I8yL7PlvAK3n0gIlxVXgMJzAnFWHdj2HYpMsS77Mgwz4K6HOKoM3wdlRqmISNiuq8h/MHONzcWfwpirKDjPBmv7aVNfGI91g2FAER1pLGk4CRHjY9RQop9rqapm98jAsEsnwnVYf3Zqfp5Ku5PUkmn8k3U3YoxAwxp04ZaOaEn/WGnOBoCfU3FLyqNi1FA7G40hQaUcYQDOh6Y+5BRB9AnePji6ics1/B2UBa2Yf0MXBPqR+w== 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: <202440c9-f515-bde5-ea87-ca06a7f11dab@suse.com> Date: Thu, 3 Mar 2022 11:07:25 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: [PATCH v3 7/7] xz: fix spelling in comments Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM7PR02CA0010.eurprd02.prod.outlook.com (2603:10a6:20b:100::20) 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: facd8390-c249-4aa3-7189-08d9fcfd9f5d X-MS-TrafficTypeDiagnostic: DBAPR04MB7256:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T4U+Ty+wpnWKIzlvJIg2wkORj31DwH/szd4d7F5nabp4bAlr1YVafPHjZJK1lKV7FcShMeMTq1ZT28pYlVo6rY3YEH6oYSmJXe3JspamdNt5PGX3PcGS5dF0FxHLmDCJjImHwzsMRm7W4MXJcUkNZOGgfXWXCkuowTZuflIPyyT7RGF7zM1By90QTudb1W9jHTnT1gm6SEvSqNaWQDL35Q7q8K5yZZc4YzyXk0700ijgH/XTlT9T98C+oR38tX3+zDG49O6d7/RpHGGNhkxEsC4C/iyH/qIyfNK6F7K/KdSzOc7nzczJAz3DyvpaGv1aESuys1uyyMXyzXCHp3afHowjdfxdQJEk0F84sSpzMGzm+xd8Hdv9Q+xPHZMRpqLTmU1bdTAK7FCZ5jEzqHrhRAINX85oUcwmUhKtVBkotpIsAoX+prFeneuU78Cm5OVCys6tVy0jNJHRrzzGZkw5DMN1XEkHvQh0XqXIUKRzECsIi6kFuqzLeFfVCkLWeQ3K1rFtUSam/B8yDvi8zGpzFNneDoKVNRGcAnimVd3Gg7VSYr5bw2j5GSn1z+OaJCzszCgbs2itlQPiyp2ZO6XmWM2MLP/ms9pa35iS/+S4HYPuCXJdaPArqtFhwVyzZm+oz7OpkC2WYiC93qCe/U5ooMjWhpVDj84AKbhFUf//8M3kW0xrvhaJ0lKuGY4z+ZUxsqBPfcysq8iZ/qlc1wsPNkyGEkf3l5ADpnLD1CFQzxu0hD59dQNKEAFFI0PcBYZhkaP6uovN0ZibZ7RYczAefAp/l4N5vsRqO5I2R+zREum2Ez6qLuGP5DVEYdqDZ+Wd 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:(13230001)(366004)(186003)(5660300002)(26005)(8936002)(508600001)(54906003)(6512007)(6916009)(38100700002)(6506007)(6666004)(966005)(6486002)(86362001)(2616005)(66556008)(31696002)(4326008)(66476007)(8676002)(316002)(31686004)(2906002)(36756003)(66946007)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cHRxOGR1RWtqQUhuYmhka3Q5cHduam1IU0ZwUjVmZHMrOFVxcWtNT2k5djF4?= =?utf-8?B?N2ZFdzR0TGZCZmo2VlNrNmJwekpXajVnMmRkaW1GdTlUYnJsTTM3eGduYVRi?= =?utf-8?B?UXJYcktFcFNZdEd2M1k5UW5YY09pcm93a2lnR283NzdvQXE5Rll6R0lxRHlF?= =?utf-8?B?V3R6MmZSTkJ5TDY0bDF6QS9ieCs5RmI1YVdONmpRTFdsZ0lTNnE1dEk0RmZD?= =?utf-8?B?V2F4WU1leHozMDgveUp0Znc5Y1VHZ3RwMTdPay9lVmZRSkpqQmhxQWREMlgz?= =?utf-8?B?WlVTS1RuZEhRNFY1bXk4cnRZVUlUM0NmQ0taUWpYVGVaUmcvV2QvWFhQT2JC?= =?utf-8?B?WCtmYmlsVi9IU3hpdmsyeXdBbkRxRm9sLzF2aTl0UDhJTGxZVitkbGtHRkNX?= =?utf-8?B?emp4RzlveXVOSFVVWWRDMzBqWmRwVGJJQUxUVmNJb0hYZ1l0YWh3eGsrcGtU?= =?utf-8?B?ZnRnN3pjVlZ5S1VZOVg1L2U4Qm56SXFlKzRrMW5GODB3RGg1S3lhb0xxY08r?= =?utf-8?B?QSt0bHYyaEVXSDcyZG0vR21VeUJoTElkT1RiTnV4NlBKRlJRK1dVZGlpS3lp?= =?utf-8?B?YVZ2VWd0alA2dEF0QmlSR2xFejFlTXM3UFJab05BY1NEQzF6OEJ4amhnVVJG?= =?utf-8?B?Um9PWGxRc0V0MHVhd2E4S1E2UnlFTnpQeWt3WGVFNHNQOUx2WXFBTU56SWF1?= =?utf-8?B?NDl5Mlk0TzJpMFIvak1QVURaOWgwNUZoSG91YzFDWlNSbXpRUW5HZFZEOG9N?= =?utf-8?B?MDJ5dXVTVXRaaDN6Y1R4WHl4andCSDdOQlNLWll0dk54by82czNDcXU0YXds?= =?utf-8?B?bDRNSXFrUUpta2txRVQrT1d1Y1RQd3pLZEp2Q2dFTThWdUh4aXBhNGhhcjlG?= =?utf-8?B?RlluN2ZpdjJYa1dnMk9sYzZPMjJaa3lSM1ZFVjdDWlRwZFE2MElpUUsxR3NP?= =?utf-8?B?YllqNnloSTdEblFOWjgvenM1TXBIWm9QY2I2aGxPS3F4RDRMc0dSaFA1eUJT?= =?utf-8?B?UWxCZGJuVFRSWHc3Vytjd2lNQnpVVnNjaFJTbDhqRkFSSVZSNEdaQ2JQWWdo?= =?utf-8?B?RUloNHE4TjZFbVFFY3BIa3c5dlpGYVdMYmhoNlUyWlRyTEJJMHorU0hwUHZQ?= =?utf-8?B?a2d2Y003cDZERkVDZ1FDb0ZhRXhkVWtLS3BjMy9XM2VDVUdjRndCM1IxNTg0?= =?utf-8?B?bTVFVkwwZ044U1hQdU1PZlM5NER4OWZrNldJekhxMXFyVndnUk5nc3B3WFFO?= =?utf-8?B?MVhYSk1BbFZQU1pud0Z2TDY4ekpPY3lmWjF1enYyczlQNE1aYk9KTnpJWnRk?= =?utf-8?B?M3F3bEtCeGR0cmdPYmJjemk0SWJWNEJPWVBSWEl0b3hXRmp0aEkyQmVRL3NZ?= =?utf-8?B?V1JnNmFqTHJtN0ZFZ3pqYlBXL0wxeW5LR25pSFh6VVZzVFdzRisrS1kxVG44?= =?utf-8?B?aE5MVU81YmREaXNQWThhNlVGT2tvcVFyWEMzdDBCaTQ2bWxhNFVvbVU4YkE1?= =?utf-8?B?U2FHOVVCQlpNVnlLbDhGbEttYUs0R3RTWjdqVVpWTDhoNFdOWDFIN1JSMmE2?= =?utf-8?B?bGlNZG0xdVhTQzZPeHNEaXdxNVdFZEQ0OXJPYTRoV0NSSFQrckgyS1lDbVl0?= =?utf-8?B?UmxWT2YyNVlXclRHR0p0VytIbUNnSXZ6ODl6eGVxMVlscjhGM3JRRDRBVG1u?= =?utf-8?B?ZU45MkJSeVo2azZPK2hKL2ljZ3lHZHdEZlhDcUNPUktQZ2RpM0pNVnlkWFlF?= =?utf-8?B?SWRCdzlQaWJoangzR1NJMW9CU0l3dFV0dWdGclMzcXU2cUVZWjVSZmNWZThN?= =?utf-8?B?RjRsRG9nRURQbkYzVHErZnoydmRKdHIyc20wWGF5dWN6WjYxaDhQZ29GWE4z?= =?utf-8?B?bll5WkcwYm5Va2NNTE01ZndNRUd1VlpBWHVMRWhDRytVYUtwK2JiaUx6aWhP?= =?utf-8?B?bUtFdzlsSVBoSmtzaXQ4bE5pZXE3aDdvRTBEdUMwWEtQaTlNaE8zWTRhOHMx?= =?utf-8?B?cDBJdysvN2EvdHF5R3F5MUtwS0Nvbis5SEtvME1yQTVDWFRFTncxWnhtRlA5?= =?utf-8?B?VjB4NSs1ajcweWlSNUxIN0xxR1JtT0NqUVBGRm5rRS9WcHJBWmlHN21UM1Jh?= =?utf-8?B?M3A0bytXbWNqclQ2QW5iL1FrQnZLaTFNYjBoeElBcEpHQkxqWjE1UlM4VFQv?= =?utf-8?Q?rtdbDdMKfgpAzf6ZhXAm7Qc=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: facd8390-c249-4aa3-7189-08d9fcfd9f5d X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2022 10:07:28.1356 (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: azu/V+EkVKUi1oXpLJU16o44iV4V7mvqZLwdCiGKvbrvsWAWsIsybObzyHwNV3pOliMTU/b8vyWz2CE9jnR8+w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7256 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1646302079786100001 Content-Type: text/plain; charset="utf-8" From: Lasse Collin uncompressible -> incompressible non-splitted -> non-split Link: https://lore.kernel.org/r/20211010213145.17462-6-xiang@kernel.org Signed-off-by: Lasse Collin Signed-off-by: Gao Xiang [Linux commit: 0a434e0a2c9f4395e4560aac22677ef25ab4afd9] Signed-off-by: Jan Beulich Reviewed-by: Luca Fancellu Acked-by: Andrew Cooper --- v2: Retain one more S-o-b. --- a/xen/common/unxz.c +++ b/xen/common/unxz.c @@ -20,8 +20,8 @@ * * The worst case for in-place decompression is that the beginning of * the file is compressed extremely well, and the rest of the file is - * uncompressible. Thus, we must look for worst-case expansion when the - * compressor is encoding uncompressible data. + * incompressible. Thus, we must look for worst-case expansion when the + * compressor is encoding incompressible data. * * The structure of the .xz file in case of a compressed kernel is as foll= ows. * Sizes (as bytes) of the fields are in parenthesis. @@ -58,7 +58,7 @@ * uncompressed size of the payload is in practice never less than the * payload size itself. The LZMA2 format would allow uncompressed size * to be less than the payload size, but no sane compressor creates such - * files. LZMA2 supports storing uncompressible data in uncompressed form, + * files. LZMA2 supports storing incompressible data in uncompressed form, * so there's never a need to create payloads whose uncompressed size is * smaller than the compressed size. * @@ -127,8 +127,8 @@ * memeq and memzero are not used much and any remotely sane implementation * is fast enough. memcpy/memmove speed matters in multi-call mode, but * the kernel image is decompressed in single-call mode, in which only - * memmove speed can matter and only if there is a lot of uncompressible d= ata - * (LZMA2 stores uncompressible chunks in uncompressed form). Thus, the + * memmove speed can matter and only if there is a lot of incompressible d= ata + * (LZMA2 stores incompressible chunks in uncompressed form). Thus, the * functions below should just be kept small; it's probably not worth * optimizing for speed. */ --- a/xen/common/xz/dec_lzma2.c +++ b/xen/common/xz/dec_lzma2.c @@ -505,7 +505,7 @@ static always_inline void rc_normalize(s * functions so that the compiler is supposed to be able to more easily av= oid * an extra branch. In this particular version of the LZMA decoder, this * doesn't seem to be a good idea (tested with GCC 3.3.6, 3.4.6, and 4.3.3 - * on x86). Using a non-splitted version results in nicer looking code too. + * on x86). Using a non-split version results in nicer looking code too. * * NOTE: This must return an int. Do not make it return a bool or the speed * of the code generated by GCC 3.x decreases 10-15 %. (GCC 4.3 doesn't ca= re,