From patchwork Thu Mar 3 10:06:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12767282 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 437DEC433EF for ; Thu, 3 Mar 2022 10:06:51 +0000 (UTC) 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 X-Outflank-Mailman: Message body and most headers restored to incoming version 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-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: 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?q?adcnhOy7iKZNx6/DQuHx93KnNB/G?= =?utf-8?q?YzFA313g8ZsKD1LcSgyiwobJfkGR215PLxi98XLF9PIIzT3tjDAOHR0O9ae2rQLwe?= =?utf-8?q?KSCY1IzdwDDmaA0m/2iMs0gpAwpVu6tbL11XSgIMpLjowI359P36aHG58s68fzeEU?= =?utf-8?q?PoBlRbFefxZde6gzJ8J544q1L2CIEgQIINaugEWakLP4HrZrG8Z0PuC1MIeePhGhd?= =?utf-8?q?iiWfQ/YYStV21ZJnycZf/MxUweZCdXMNZVDkrx/GsexkCaK3SbZvWzV50Y3BYqHsS?= =?utf-8?q?4DnptiVJ6lDcuotNyMSfkadOyAtdq7w5stMHfLTvcjWlVEbYSYwDNMUFSSDvXF9lA?= =?utf-8?q?GLqt4yPou/FzvNs64g5C7L0zNbcR/jzFTZ5RR9imGU8bMcmDovLQkP0ypxwiK8F0Q?= =?utf-8?q?Q5E6JDhyAq2o6mAK6hMWUmFJDZkLGOovaHlrzpZjMx1+YLK0fs7ghVthnZOgW3rag?= =?utf-8?q?dYYFjoKIbGgRWOOWIjdMq7wLfx/2JoGc6XffyvUHClow4L9l0eCLofd9uP36vXkSE?= =?utf-8?q?3dLTiDbypZAdk22rRIrHbx7ODBsVScZ6Sr01EQQ4IyaVpBzys5RGp3KOE6oFawFlp?= =?utf-8?q?8jxzHu9dRyYr9doIlMCnZDJNOU2MF2ZjGWqEz3SYvRmMnu7UajuQo6Gr0TduKDRj1?= =?utf-8?q?M0/PHxjttxP8fnHUotCNVj1u9G99GmjCTnwS/R6XCq2fWsDJbRA1VY/+o2scdaDoR?= =?utf-8?q?7Nsv6UwyMhnIWKKB1T3V4T7MxEH15EyF1wvmIiUxdOfbXeYq///L4wpkCkRmNFctF?= =?utf-8?q?0oWQH2qYGVPOek7sNP5psnKnrPFUZW9RYJ7phItTmwgrrtG7eiafJULAWAmOnLwOv?= =?utf-8?q?zzEbW5mx3eKkTINeuELBlmJSxXOe/CE/Ua43vkHUj8l+Jwx7Q/fJyGmzhkITeJVIF?= =?utf-8?q?OpE/PdTo6DdLV5eBn5tcR484fHwHkoDh51PyJQCVZcjvoOIf5fPjT3pakib1oaE2g?= =?utf-8?q?oYRaT6kad+zR18dHINuSPcBq7JKAygtJdGfG8hGHgjy7cjznaAvVMKuSd6P/295i/?= =?utf-8?q?XMWo/sV3jeidmrTZXmE+P7grzTVL3jQR/g3d5ROCJXaf5Ix1Ti/iMosOSj2C+mpzL?= =?utf-8?q?I790d4SBmNKOxlrk1DTIDtaFBKYOxMA4rVmIjlKYpkBlULVAhngy+LyUoHU9qFWZ/?= =?utf-8?q?/AamsAhSnWzuwro15POihQ/BIB7xxoj4WfO7Hsp43ILy9nk+cMYTcEsEH4c/NTrX1?= =?utf-8?q?JUDBr9lANrW4Q5Kq1YZYR6nQlADKo/2xr4kM5bID70CBhSZZO2N6kcJnwhNggJZZo?= =?utf-8?q?PCEGNqvc93DQuG9ud904iKIfxx3HcDBlN4SgjcIxS835bHIrMS9uMhsPrmNIYNAiH?= =?utf-8?q?E2Jg8SDxyDCv4NCPCAJY3sZHjsCSpEbi7tylMtENbv7BTBPOszPHvBOEJlCnDUXJp?= =?utf-8?q?TJLxHxsokuFyDkS6atiyfPNlRY9LF1bvwf6Y6jG37SgxEeQYRwqG1W9KmZr6fhn1q?= =?utf-8?q?o59tIBeZToR0lXdthMD7XcFwp4gL36zpCZoElOkR/sDAExsLBKYzz7sncriFGL5gP?= =?utf-8?q?4eWwfItVcesxnC5TxEQy03J3nuEnsFZXPcojXPz5ARD92/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 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 --- 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 = s->temp.buf[HEADER_MAGIC_SIZE + 1]; #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