From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from AM0PR02CU008.outbound.protection.outlook.com (mail-westeuropeazon11023090.outbound.protection.outlook.com [52.101.72.90]) by lore.virtuozzo.com (Postfix) with ESMTPS id 320A48017D for ; Thu, 12 Nov 2026 17:12:51 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=O+PRvAFkq+nZlKqjmEFEUDtnRKSG/hR3Gvi2hm8VANYiFMOBNF5CtdMJBUu4sOp09aLEwaIyHXqoMw5g+n7lnwMF9GBqd5M1TX9q7D88/qxjG2ucSdn5aLJbIP2a5qCKjhhrtPMYk449xKIJtcm/BmjV6p6m1hPm5GnnGfMI/bFXMheqkwQCIcb66m/lb5NFgStrGB/z1vKhJ9vlzsFYfVuJKa0iypRR1hnMJY/iFXIk+NyoPgTyXch+7r/8oi+b3R/jKfzix0u0VaE6pDzQ0O0ka7xz2+BTbBMz5ZIs8Tc39jPwjXwV/yPKxT3B8dnZLiV4GrUvWgsak1QL5I8kow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=CmAJJBt5qzy88A1L72U/6lt62nsCOPBQSr7mGmw4PZ4=; b=SQCb8cuVSNaFz24YGUXvJ5vo8HnqxK8QvLTFt4ORdhNgtge3RFh2Uuiuw/QY/uF7z705PCshq9QybA8tF09HGXcSc91WRV1rjDF76qCw2zi3L5OhcNkttC/yUcSSim3NVFq5HvJLiykQlijCIfm3clvE/aKZ3VY/5iM7gzzmbRp49PQgPp8RGHtVwuVwWE6OijiRhV+OS16qxXyadRI1GLQRNBOtAcxPOCsWJ3waGCQc9ikoxPbspWn9EXkZksacA/QWBgkCFY3Q0w6npFsnm7CqTAk41tX3LcKH7dY1N8Z80L+JQJpFmlFuMfC4BSXTalR61fKZCf4xqBqOdgN31A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CmAJJBt5qzy88A1L72U/6lt62nsCOPBQSr7mGmw4PZ4=; b=Jlm3hMjxce9TIRdHUsYDd8HMnxNJsXKtbXlSK+pK+YvGwSSSzdazt2Y/ee/QDCZhwLpOdD6+17LQnx+WEJmOVtLBPX8H90UaRvAPNcrETXn6bsP/UlMN75vrWoAslxgHN1bTRWIUvNxFlwjsW/IR7nHUllG3iUQoch5P4d4Kn0luHEMxm5bOYsATfyq3ZuBw9DtuXQTwsbTyD9fIwsh2tCaLMWFx9cD+g5oZ4EwN91nT+0B6QpHXQc6YTQENPnlxVOQwvYyFowgNyhZ6IpLB/4OdxTwvTaLXpCwcnWP0uNFxaKb6N62+a6cayHD2lJ8Mr1ZT5z9aXYeTES+aXzWJVQ== Authentication-Results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by DU0PR08MB9874.eurprd08.prod.outlook.com (2603:10a6:10:422::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.546.12; Thu, 12 Nov 2026 17:12:48 +0000 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com ([fe80::4e37:b189:ddcd:3dd8]) by VI0PR08MB10656.eurprd08.prod.outlook.com ([fe80::4e37:b189:ddcd:3dd8%4]) with mapi id 15.21.0592.013; Thu, 12 Nov 2026 17:12:48 +0000 Message-ID: <4b94b1ff-59d1-4b08-8a25-428790a367b8@virtuozzo.com> Date: Thu, 12 Nov 2026 19:12:46 +0200 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH hci-dev 1/1] hw/ide/atapi: fix abort on CD-ROM reads past LBA 2^31 #VSTOR-154795 To: "Denis V. Lunev" , svt-core@virtuozzo.com References: <20261112134758.646697-1-den@openvz.org> <20261112134758.646697-2-den@openvz.org> Content-Language: en-US From: Andrey Drobyshev In-Reply-To: <20261112134758.646697-2-den@openvz.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR4P281CA0102.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:cb::9) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|DU0PR08MB9874:EE_ X-MS-Office365-Filtering-Correlation-Id: 9c9961ee-70a7-4adb-e0bc-08df40e02cce X-LD-Processed: 0bc7f26d-0264-416e-a6fc-8352af79c58f,ExtAddr List-Id: svt-core@virtuozzo.com X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|23010399003|261026140227099003|56012099006|261028144727099003|261021121427099003|261009223027099003|4143699003|5113699003|261021123027099003|261102123227099003|261026121527099003|18002099003|10067099003|22082099003|261022105027099003; X-Microsoft-Antispam-Message-Info: 9Dr30KdGMe0AqJaZDEDp0ySbNE4yO4gTnwUTPZQRGWWIxQ9JiuaQB043qabeeVBgPIKulJ1YfiYJH24zwdfc+eMmukgu3lxBU1Umg/XXAfz+qi90ypFjrDOdbZ8cateM/cnUFf6T+Da8Z4A3FMYb+cv9y8btyDuQhD/2GXOw1H7USXGuPYOlPb5Up8pHiY21PTxzEoL2Wh/Q6SSeLxcu0K0jjBPKgvbkWS7o3VammBbQ2qcnXoPYNd+iUijGagjz4tMiEwGreBNjw3U6Kzcj67wAtB4HDsMhhwLScb3Kjg1aTbVyttqGmvygZLLiqL3bWC6jQiMLXSDfzZZK8iV4tEK9i1RU1AZceCiVpEiMRKvOyL+Txkxhppdfymm/uGh47h2iURRisXc1UpsFiHqH6Ej5PJuRLy4r8I/6APb50+S3LDtn9CiMPNId3tWFTby6fPcIADF7ZWVB2xHKlBAss7sWChqpKhvz9yvyiHvvJCX2/5/nhmWkUkW83d01tbv8nSHjelarfxqsx5Vl7mPUwT0HAdQawRnBoIctfL+vTQOBnD/JM+VlAjaoezg+z3vUKQpEmVS898lUfzRtppg+dAhIYctXKKCZbw5uQtQDE1QIkjpKPfLeM7AAdxnvedRo8LM5tb4WtfTXMS7PinM1LUmpzlp+ft0wuYCCJEt3TtI= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI0PR08MB10656.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(23010399003)(261026140227099003)(56012099006)(261028144727099003)(261021121427099003)(261009223027099003)(4143699003)(5113699003)(261021123027099003)(261102123227099003)(261026121527099003)(18002099003)(10067099003)(22082099003)(261022105027099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RmhiTmljQXRoS3JLMmJFQzNmcDVjdTJsWE1NWG52RWJVT0QzcENydnpPK0dx?= =?utf-8?B?NlVUMUV0SGZaS3BoNjMxOVJOZEJSUFY3emc4VVFnb3NlNDVGcW5vQTVGU1Bv?= =?utf-8?B?aWJhNDVreEFmTTFxNGdhY3Q2M1hwWFBJWVdVRjh1cFczck1NdXh6dDhYa2Q2?= =?utf-8?B?aUhOK2dJcWE5U25EOXBYeEU4OXhzZE1xTjNBMUtwL1p5M0Vqb2tySWpzS3VW?= =?utf-8?B?VVd0ODRvUFpEMHdjWi9oZEM4dUFxekw2TDVud1MvRGVYUVVCWkVDT053V1Za?= =?utf-8?B?SVdTSGpjT2VKdnhTN29EdzlmTVpqa1pDUHV5R3VQdHdKWlZveGE4WitWM1U3?= =?utf-8?B?NHZHR2NsU3NqdDUxOVYvdURtOUpDWGNVbEU4UGhrNkxNeXdWSVl6N0lZblhN?= =?utf-8?B?MUxia0dBbGgwdnlrQTBTRExleHV4M1plUnlCTHd6blhsdHRDdTVUUjNqbitq?= =?utf-8?B?dldCelZRNWVlcjhSeUxhUEFjVTFtM3lycmV0SWUvVkwwRFY4V0pqZ1Q0WDIv?= =?utf-8?B?YkZjRW1sTGxWVmJSalQzcHNEQkM2SERUa1VhYVdIQ3NJdnh1MmhUOC9TREZi?= =?utf-8?B?c3lYYzBFdmt4aEd4RG5oT0VWUC9DeTAwMnlEQ2h4U2xVQjVraG5XaXMyb3lK?= =?utf-8?B?d2tBNlZna0hSNzVjS1lYWW1tZ2JmU09xejk1ZkJmMDcxWHlaV2JHbk4ySlZO?= =?utf-8?B?b1N6YVVLNzh2ZXhWa2N6Wk9NYWVCRWlIdEtWaHE0eW5YQ2M0dzR5dER6aklt?= =?utf-8?B?czhJMWhpeVlUaTlqK1k0WW82WFZhM1h5L3VsbzA3ZVl6RTJ0bjV5TndTNlNx?= =?utf-8?B?enYwV1hFc2Q0MlhUdWdia1YzMnRFNyt4MUgvYytsVEM3TlhrbU11a2xkRlJo?= =?utf-8?B?VHVCWWFzSis5VEF3TkJxWXI5T1U0M0s0THcrZWUrbW1hREdGcVZBNm4xZTY0?= =?utf-8?B?eHRnQzJPQ3FCY3doMmJFT1g2cW85Z0dHenh3WFZUaVBXT3JacFN5dFh0RkJv?= =?utf-8?B?ZU9ZT25yQk5MaitUNG9LV0NsNjhDME53V1pvc2RIMmZ1YWEvbXRxVTdJM3VT?= =?utf-8?B?ZUw4aDNnR0tjVnNvUWhDTitxeW04UWtaejJaUUFNZXk1WGdXaVk5MDhHUFl5?= =?utf-8?B?VGNFSm42YjF2VVAycGgrRVN0UDh4RDhkOGhYeHVFamhKcFZvZmd0dEVpOGJR?= =?utf-8?B?dkRHRnlCQWt2SG9QYmZEdzEzTEpmL2VlcDA5bENzcGY3S2ZYN09RSFltNFkx?= =?utf-8?B?Mmc3UG9YMEY0aW5nWG9XeU1SNUZ0U1B2YVZXYjQ5aDdvUTZ4cXo3Qk9CNUkz?= =?utf-8?B?eXJycXVEZStYOWRwN2xQU2tpdXlESWQ2MHdmYVJ3WXlBZVIrN0ZTcTNOVGNs?= =?utf-8?B?WTlGYlpCZFB3OTRpZFhiK043YlBWaFU4MFNyeUhlYzFXcHpVdkdNQktJSklS?= =?utf-8?B?VE9LUjR1NzkzK0twNkQzVW5yTDl3STlhbWJHc0VIYndESnlsMG5zZEFqeTZD?= =?utf-8?B?RlBGbWtnM1N0VU1tSW9JUFZLaElFbjJaYmxObEdpN0ZGYThMTzBFYkZxK2Qr?= =?utf-8?B?bnNqaDdvemhjOHptenpMK1JZbzhIaXE0cWhkZXM5dThmTHk0dU5JbElORFRy?= =?utf-8?B?QVZyNElzUjhTOXNrSkc5SEZHQ3hvaW1oOUwzSUVBeUh6akx0R05qL0JuZnJm?= =?utf-8?B?WDFpRHlxV3hBeUNWWENiWWVDcFBVeHhBaGNpb2ZaZXNnUUhHZHRtVXNWZjBG?= =?utf-8?B?cUEwelZjbnNRODB4NXRIL2FwOEtmRkRTajV2Z05lbVVOVXkzZzVWZGpIUlhh?= =?utf-8?B?SUlCWDdmcmYxdDYvMXJ3WW1YcmRQNXUvV0dUcUhBNHUweEt3Y2Vmbjc3eDFQ?= =?utf-8?B?TnVVK0l1WW5DbVp5WFRScGNwV2pYM2pmS1VQZy9yM0dlRWNmVTdSZG00MVhj?= =?utf-8?B?RGFRa3h4ckM5K3BjS0hKT21qTnBHMkV0UFdBOUtUWVlod3cvWlR1UE16YkEx?= =?utf-8?B?RWprRmhhZEJDbE1pbU85bWdKUE1rV29hVEs0dWRqQkpuZjRmT3ZGai9zU3Z0?= =?utf-8?B?ODBObllSVzJRZms3bG9oV1BOWXZjbWVRYkFjT1VONlh0NDBhUW5pR1RxUzd3?= =?utf-8?B?b2RVL2xJR0cyUDYxVVBsWUt6ZTJMUlQ3bU9wQ0wySTREeHNSYU9MZjZ4Qkpo?= =?utf-8?B?K1RwRUxpRTlhSlN2ejc3M1BXSjF6dFdZVzVhZmp3V1pXUjZ2NmxGNUFucm41?= =?utf-8?B?YWVqWWZMU0hoeXN6OG52L00rdm5DeFlOOTlCbnZKcSs1eFZ5TVNaMXlhOEpm?= =?utf-8?B?Um4yakM2NFpuM0hoblBFVldiMUhiY2lSZTI4eDlUTmNuNS9WV0swRUZhdTN6?= =?utf-8?Q?VcKBR+iaTVrqDjZ0=3D?= X-Auto-Response-Suppress: DR, OOF, AutoReply X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9c9961ee-70a7-4adb-e0bc-08df40e02cce X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2026 17:12:48.0594 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: K1QogAM6mfgIkHrmiLtyOos50WmZ4KwQ3/nVKMoM+aCkvY5ytly581zuSZXhPWGijKRypp2w2zVHoIxAdarA9TK7T4VYD2zTHE0dsYrDEhQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB9874 Ack Applied to hci-dev On 11/12/26 3:47 PM, Denis V. Lunev wrote: > From: Denis V. Lunev > > cmd_read() and cmd_read_cd() check the 32-bit LBA from the CDB against > the medium size, then pass it to ide_atapi_cmd_read() as an int. On a > medium larger than 4 TiB, a read at LBA 2^31 or above passes the range > check, turns negative and trips the assertion: > > hw/ide/atapi.c:315: ide_atapi_cmd_read_pio: Assertion > `0 <= lba && lba < (s->nb_sectors >> 2)' failed. > > Reading the last sector is enough, e.g. a UDF anchor probe, so the > guest aborts QEMU just by looking at the disc. > > Pass the LBA as uint32_t, which is what the CDB carries, and widen > IDEState.lba to int64_t so it holds every valid LBA and keeps -1 as > the "not a sector read" marker. The field is not migrated. > > Fixes: b8d7f1bc5927 ("ide: atapi: check logical block address and read size (CVE-2020-29443)") > Signed-off-by: Denis V. Lunev > Cc: John Snow > Cc: Fabiano Rosas > Cc: Laurent Vivier > --- > hw/ide/atapi.c | 18 +++++++++--------- > hw/ide/macio.c | 2 +- > hw/ide/trace-events | 8 ++++---- > include/hw/ide/ide-dev.h | 2 +- > tests/qtest/ahci-test.c | 36 ++++++++++++++++++++++++++++++++++++ > 5 files changed, 51 insertions(+), 15 deletions(-) > > diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c > index a31b945a66a..1fa73041938 100644 > --- a/hw/ide/atapi.c > +++ b/hw/ide/atapi.c > @@ -47,7 +47,7 @@ static void padstr8(uint8_t *buf, int buf_size, const char *src) > } > } > > -static void lba_to_msf(uint8_t *buf, int lba) > +static void lba_to_msf(uint8_t *buf, int64_t lba) > { > lba += 150; > buf[0] = (lba / 75) / 60; > @@ -71,7 +71,7 @@ static inline int media_is_cd(IDEState *s) > return (media_present(s) && s->nb_sectors <= CD_MAX_SECTORS); > } > > -static void cd_data_to_raw(uint8_t *buf, int lba) > +static void cd_data_to_raw(uint8_t *buf, int64_t lba) > { > /* sync bytes */ > buf[0] = 0x00; > @@ -318,10 +318,10 @@ static void ide_atapi_cmd_reply(IDEState *s, int size, int max_size) > } > > /* start a CD-ROM read command */ > -static void ide_atapi_cmd_read_pio(IDEState *s, int lba, int nb_sectors, > - int sector_size) > +static void ide_atapi_cmd_read_pio(IDEState *s, uint32_t lba, > + int nb_sectors, int sector_size) > { > - assert(0 <= lba && lba < (s->nb_sectors >> 2)); > + assert(lba < (s->nb_sectors >> 2)); > > s->lba = lba; > s->packet_transfer_size = nb_sectors * sector_size; > @@ -423,10 +423,10 @@ eot: > > /* start a CD-ROM read command with DMA */ > /* XXX: test if DMA is available */ > -static void ide_atapi_cmd_read_dma(IDEState *s, int lba, int nb_sectors, > - int sector_size) > +static void ide_atapi_cmd_read_dma(IDEState *s, uint32_t lba, > + int nb_sectors, int sector_size) > { > - assert(0 <= lba && lba < (s->nb_sectors >> 2)); > + assert(lba < (s->nb_sectors >> 2)); > > s->lba = lba; > s->packet_transfer_size = nb_sectors * sector_size; > @@ -441,7 +441,7 @@ static void ide_atapi_cmd_read_dma(IDEState *s, int lba, int nb_sectors, > ide_start_dma(s, ide_atapi_cmd_read_dma_cb); > } > > -static void ide_atapi_cmd_read(IDEState *s, int lba, int nb_sectors, > +static void ide_atapi_cmd_read(IDEState *s, uint32_t lba, int nb_sectors, > int sector_size) > { > trace_ide_atapi_cmd_read(s, s->atapi_dma ? "dma" : "pio", > diff --git a/hw/ide/macio.c b/hw/ide/macio.c > index c23bf32d2b1..b539a31f1ce 100644 > --- a/hw/ide/macio.c > +++ b/hw/ide/macio.c > @@ -396,7 +396,7 @@ static void ide_dbdma_start(const IDEDMA *dma, IDEState *s, > MACIO_DPRINTF("\n\n------------ IDE transfer\n"); > MACIO_DPRINTF("buffer_size: %x buffer_index: %x\n", > s->io_buffer_size, s->io_buffer_index); > - MACIO_DPRINTF("lba: %x size: %x\n", s->lba, s->io_buffer_size); > + MACIO_DPRINTF("lba: %" PRIx64 " size: %x\n", s->lba, s->io_buffer_size); > MACIO_DPRINTF("-------------------------\n"); > > m->dma_active = true; > diff --git a/hw/ide/trace-events b/hw/ide/trace-events > index ca696ebd6d7..c0aaeb15a03 100644 > --- a/hw/ide/trace-events > +++ b/hw/ide/trace-events > @@ -47,17 +47,17 @@ bmdma_read_via(uint64_t addr, uint32_t val) "bmdma: readb 0x%"PRIx64" : 0x%02x" > bmdma_write_via(uint64_t addr, uint64_t val) "bmdma: writeb 0x%"PRIx64" : 0x%02"PRIx64 > > # atapi.c > -cd_read_sector_cb(int lba, int ret) "lba=%d ret=%d" > -cd_read_sector(int lba) "lba=%d" > +cd_read_sector_cb(int64_t lba, int ret) "lba=%"PRId64" ret=%d" > +cd_read_sector(int64_t lba) "lba=%"PRId64 > ide_atapi_cmd_error(void *s, int sense_key, int asc) "IDEState: %p; sense=0x%x asc=0x%x" > ide_atapi_cmd_reply_end(void *s, int tx_size, int elem_tx_size, int32_t index) "IDEState %p; reply: tx_size=%d elem_tx_size=%d index=%"PRId32 > ide_atapi_cmd_reply_end_eot(void *s, int status) "IDEState: %p; end of transfer, status=0x%x" > ide_atapi_cmd_reply_end_bcl(void *s, int bcl) "IDEState: %p; byte_count_limit=%d" > ide_atapi_cmd_reply_end_new(void *s, int status) "IDEState: %p; new transfer started, status=0x%x" > ide_atapi_cmd_check_status(void *s) "IDEState: %p" > -ide_atapi_cmd_read(void *s, const char *method, int lba, int nb_sectors) "IDEState: %p; read %s: LBA=%d nb_sectors=%d" > +ide_atapi_cmd_read(void *s, const char *method, uint32_t lba, int nb_sectors) "IDEState: %p; read %s: LBA=%"PRIu32" nb_sectors=%d" > ide_atapi_cmd(void *s, uint8_t cmd) "IDEState: %p; cmd: 0x%02x" > -ide_atapi_cmd_read_dma_cb_aio(void *s, int lba, int n) "IDEState: %p; aio read: lba=%d n=%d" > +ide_atapi_cmd_read_dma_cb_aio(void *s, int64_t lba, int n) "IDEState: %p; aio read: lba=%"PRId64" n=%d" > # Warning: Verbose > ide_atapi_cmd_packet(void *s, uint16_t limit, const char *packet) "IDEState: %p; limit=0x%x packet: %s" > > diff --git a/include/hw/ide/ide-dev.h b/include/hw/ide/ide-dev.h > index 92e88687800..d6f646528aa 100644 > --- a/include/hw/ide/ide-dev.h > +++ b/include/hw/ide/ide-dev.h > @@ -101,7 +101,7 @@ struct IDEState { > int packet_transfer_size; > int elementary_transfer_size; > int32_t io_buffer_index; > - int lba; > + int64_t lba; > int cd_sector_size; > int atapi_dma; /* true if dma is requested for the packet cmd */ > BlockAcctCookie acct; > diff --git a/tests/qtest/ahci-test.c b/tests/qtest/ahci-test.c > index 26082eed3a1..30564982722 100644 > --- a/tests/qtest/ahci-test.c > +++ b/tests/qtest/ahci-test.c > @@ -1691,6 +1691,40 @@ static void test_cdrom_pio_raw(void) > ahci_test_cdrom_raw(3, false); > } > > +/* Regression test: read the last sector of a medium over 4 TiB. */ > +static void ahci_test_cdrom_high_lba(bool dma) > +{ > + AHCIQState *ahci; > + g_autofree unsigned char *tx = g_malloc0(ATAPI_SECTOR_SIZE); > + uint64_t lba = (uint64_t)INT32_MAX + 1; > + AHCIOpts opts = { > + .size = ATAPI_SECTOR_SIZE, > + .lba = lba, > + .atapi = true, > + .atapi_dma = dma, > + .post_cb = ahci_cb_cmp_buff, > + .opaque = tx, > + }; > + > + ahci = ahci_boot_and_enable("-blockdev driver=null-co,node-name=cd0," > + "read-only=on,read-zeroes=on,size=%" PRIu64 " " > + "-M q35 " > + "-device ide-cd,drive=cd0 ", > + (lba + 1) * ATAPI_SECTOR_SIZE); > + ahci_exec(ahci, ahci_port_select(ahci), CMD_ATAPI_READ_10, &opts); > + ahci_shutdown(ahci); > +} > + > +static void test_cdrom_dma_high_lba(void) > +{ > + ahci_test_cdrom_high_lba(true); > +} > + > +static void test_cdrom_pio_high_lba(void) > +{ > + ahci_test_cdrom_high_lba(false); > +} > + > /* > * Regression test: a buffered ATAPI read completing after a command > * engine restart must not dereference the cleared cur_cmd. Cover both > @@ -2234,6 +2268,8 @@ int main(int argc, char **argv) > qtest_add_func("/ahci/cdrom/pio/single", test_cdrom_pio); > qtest_add_func("/ahci/cdrom/pio/multi", test_cdrom_pio_multi); > qtest_add_func("/ahci/cdrom/pio/raw", test_cdrom_pio_raw); > + qtest_add_func("/ahci/cdrom/dma/high_lba", test_cdrom_dma_high_lba); > + qtest_add_func("/ahci/cdrom/pio/high_lba", test_cdrom_pio_high_lba); > > qtest_add_func("/ahci/cdrom/pio/bcl", test_atapi_bcl); > qtest_add_func("/ahci/cdrom/eject", test_atapi_tray);