From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from PA4PR04CU001.outbound.protection.outlook.com (mail-francecentralazon11023082.outbound.protection.outlook.com [40.107.162.82]) by lore.virtuozzo.com (Postfix) with ESMTPS id B75768169B for ; Thu, 12 Nov 2026 13:48:09 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=X2G2ekJAcokinb/Mn7SNJyYH3zglQPH6w3piHYSQSOkJQswVGHfuhflXAFeK57Q1vLCqttN1jg8Sm/NgUco5YDM1N1VHvN5qXTVGIB5CSa9NRU8x7nhTgs3CP21KaIfDLH0UFl6VRV37BshrqFV65Kzkcu65VhRc0oH3FNgQ/FdjO9HEiVvqg70hCocx5VGDnjpnJQtVoxsaDA7aJYYiI9W2XM8psb9wG3Pf1a25iyX9Od1C9SZZYpU7/cItolm7tI5HJyn1gD3eyGj8kgH53oQU/ImsLOMRjat/2w6I6GTHSjrMCsMzIwk2kGToGIod1dQvQ1hpyRZ+IbIYPQ4QmQ== 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=ol8AuzKhreAabPd3Bp1bIvGTlneBxJx8j+4Ho/eKNn0=; b=Y6DqLKXwyWrIo/0FVfN12dLpPIWBA8sd5HhklK9ytmJm/mC4DNq5cKgwUKLNJK+3zwE9b9GMPjwHDnagWtow9VSkxYDARTtRnjKO2H/QrApftzW5Zp4JqgsvovwOoUcUkKEJsu8VJkadSKfw/F96auWPF9xp9Mip1MQd7cjS6vckz7c3knUEeQtGal8llmKbHxFi8Y1aSDcv9Dn3FBCgXQ8WeuyTL8TjkgGM6OQzrCwMA69bbVql4YshrSZq2AkqaYBgtWVvsMxjqGtjF3xfdMfyG0DB/pzUbCcQg5XDZFun8LTBmCVCYkGSJvGT1WE8FlaKNehjzS9pSerwK2ZWCQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 2a00:1450:4864:20::32e) smtp.rcpttodomain=virtuozzo.com smtp.mailfrom=openvz.org; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=openvz.org; dkim=pass (signature was verified) header.d=openvz.org; arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.onmicrosoft.com; s=selector2-virtuozzo-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ol8AuzKhreAabPd3Bp1bIvGTlneBxJx8j+4Ho/eKNn0=; b=Iymwb6ef3eqKBnJOrCkb53rfvp50jDRijFtMe8HWPS9A9PCUgkS18ttrg1grbM94eAFnk4ePnGA4eyN2WhFS4yQpe4/7VKLtGB5VYnwWYHilVliM/k8b0Z5Cnq8Z0he2kbnNOCG7/4SJOp4ZQRNAjQzpDyx5Ne/wwgjCNS5BLL0= Received: from PA7P264CA0062.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:2de::17) by AMDPR08MB11553.eurprd08.prod.outlook.com (2603:10a6:20b:71c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.615.10; Thu, 12 Nov 2026 13:48:05 +0000 Received: from ZR1PEPF0000E6B1.eurprd05.prod.outlook.com (2603:10a6:102:2de:cafe::83) by PA7P264CA0062.outlook.office365.com (2603:10a6:102:2de::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.615.10 via Frontend Transport; Thu, 12 Nov 2026 13:48:05 +0000 Authentication-Results: spf=pass (sender IP is 2a00:1450:4864:20::32e) smtp.mailfrom=openvz.org; dkim=pass (signature was verified) header.d=openvz.org;dmarc=pass action=none header.from=openvz.org; Received-SPF: Pass (protection.outlook.com: domain of openvz.org designates 2a00:1450:4864:20::32e as permitted sender) receiver=protection.outlook.com; client-ip=2a00:1450:4864:20::32e; helo=mail-wm1-x32e.google.com; pr=C Received: from mail-wm1-x32e.google.com (2a00:1450:4864:20::32e) by ZR1PEPF0000E6B1.mail.protection.outlook.com (2603:10a6:918::158) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.615.4 via Frontend Transport; Thu, 12 Nov 2026 13:48:03 +0000 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4a2d6d01ecbso27842605e9.0 for ; Thu, 12 Nov 2026 05:48:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvz.org; s=google; t=1794491283; x=1795096083; darn=virtuozzo.com; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=ol8AuzKhreAabPd3Bp1bIvGTlneBxJx8j+4Ho/eKNn0=; b=Y1LtGdbZlaIv2XmD4WCaoGvbhmGeW5DqCVCGmqgxs2dZW1W38YZ17c66xXGiV6w7ly r8DFSjU/ycRj910Tc6cL8RbwMHGlz84ESxxXs95OGIUet9FhS2L3wt2JzDYi9J6Qy9XA 9VbiXFdL9jkqYPkM1XQYYEL+9xiuFoOn2YzN04UFJkAR8nd/sFFS7hA2H6oi+fke92ru FPJXdTl7s2AeSJqTextRNVcttvgEXQKRbXPVtF1FP7WkfHjxEUcLtiI5hxQhVRAfnzGP 7GSsoALAM7/HGc8J/JjxznBdvwYShCgFsVAlpSpYK5VReD+2lse7Zey5G/aUp5dLkPda L/HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794491283; x=1795096083; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=ol8AuzKhreAabPd3Bp1bIvGTlneBxJx8j+4Ho/eKNn0=; b=EWIHRkS3EjQOD85eHDciiZgtxfb8TsX+YowU+uulaMBn/5GIxtuLe1Io56/RCf8k5D rvQXeFF5nkhKxjj5F2pLzWXfNhK0sFf1o36Ok5CjTOlpfDYZduBs0bzziE2H7IJojlIH D7EYLq688I4Als4vsAjagTfmaGf33jGNfUvH96kFqVIL0K0Qnv/80yY/5CD7hgmprh44 M1pnYW4vhsTNF7HXZMNVrbZc7iJoDZFpauZ5FpTgxq4oL24bUaQtBXlw6+mUYe2RUCRg U1P3dhRbgCY2tZlbxbwsTS7B7pobTQVz4aGvrXYDddOkHrlSe16GqqAE97MQ84v8Slet R10w== X-Gm-Message-State: APuU4Z8teiHRxaX92BTXt7CGWeMDFdzdhNaTTlWqdrJmNTgtDfKVcOxS NpWMYLbRaiJgl8SSpA6K9cpMbY8w4JolB5IrdYJtpI/YDu17Fx2fSt48QU5suyP7m6lh2GQxOz4 gmlaQEn8= X-Gm-Gg: AYBFou2pLoaIiC5cHCtZroOAWGIb5zvl3/pgh5IvN+xRZpyCz2LtWQOZhn+ae7WnjKS 1nJretP+S1aj/2W8uzBQCk1ZsDVChEMKD+NaVof9kBF79TP+O4PhSC3xb+d7Y/4B2+lJ4fl5E88 QF2caq95IN1AlZro1RDnlmKnhj859h4NxZHCetSxn3mD9S+/E4kO70l0kc4FIXmq2s9fkiStcNp iv5DXvBV07U3DVP1WWs6FIGriBmidhuHZD+T+HukHwNNDsWiJXrM7HJwlnhwvvBSFE99OaYTa/4 qsdSXtc5lbqX7HNpoVgz/xNJZGQCpXuSSLMk7YJ1UTsSMMf0lEvsgw/nrPKa+lXEtY5fAyIdJHi Zn/KpIOlkX/+zbyr39/WPz0J06sjoaKO+134KCR9ejvy84JJAzjzUVbOCC8LY1MuO2jKFINC88d SiqC4KMPC9iC1VYQqITlS7IIAP83pqjdwO9orvowAzdn8try+NzAUbluWvr4SU+3anjbtBaWPMh 6Iox8E4IcV1H0Xwe9xCvGHmdH2JebqSpP2qWMAqSZNLMn0/6DHZwGsuCLfFVCbD3Kg0w5DId8ar +9tBd/CkcXd1bMzZsYXD2GgJEA== X-Received: by 2002:a05:600c:8b34:b0:4ba:e7:ef3d with SMTP id 5b1f17b1804b1-4ba09321cbemr102137755e9.1.1794491282819; Thu, 12 Nov 2026 05:48:02 -0800 (PST) Received: from athena.sw.ru ([2a06:5b06:b600:300:4137:317f:4748:6f80]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4ba0953d26asm77837635e9.4.2026.11.12.05.48.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2026 05:48:01 -0800 (PST) From: "Denis V. Lunev" To: svt-core@virtuozzo.com Cc: andrey.drobyshev@virtuozzo.com, den@openvz.org Subject: [PATCH hci-dev 1/1] hw/ide/atapi: fix abort on CD-ROM reads past LBA 2^31 #VSTOR-154795 Date: Thu, 12 Nov 2026 14:47:58 +0100 Message-ID: <20261112134758.646697-2-den@openvz.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261112134758.646697-1-den@openvz.org> References: <20261112134758.646697-1-den@openvz.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-EOPTenantAttributedMessage: 0bc7f26d-0264-416e-a6fc-8352af79c58f:0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: ZR1PEPF0000E6B1:EE_|AMDPR08MB11553:EE_ X-MS-Office365-Filtering-Correlation-Id: b0a822ef-2346-45a5-eaa5-08df40c392c9 X-LD-Processed: 0bc7f26d-0264-416e-a6fc-8352af79c58f,ExtAddr X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 0 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|9140799003|48200799018|6059299003|376014|61400799027|43022699015|82310400026|10067099003|56012099006|5063699009|261022105027099003|261021123027099003|261021121427099003|261009223027099003|261102123227099003|261026121527099003|261026140227099003|261028144727099003|55112099003|18002099003|22082099003|16102099003; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?aI5kpH3Os5zEEzeHzBbxqQIEkwvZFLFLaukV2mTdpHeaVJ3cDLzBjjekPGKX?= =?us-ascii?Q?UPLuHmYDRaQea0hWZ2EOuV3zd5rkFLNc908iSU1MunP2FchUGDp6BQfkrAhT?= =?us-ascii?Q?b3qJYZoQwk4EyOlXGq/47xahp2vRmifte1u/XcmBzztQDEtIEKCnpEn+/eiw?= =?us-ascii?Q?1lwdcQqqnDm/+y30gfSoQIXX6FBoA6wJS9BclkSUZ59ibEgtmEjjTpmixTmx?= =?us-ascii?Q?83DovyB1sJGc2Ahv86t/tSkdEQArIR3fYxFsS2SN3cFUBqxKzHzSPGZc51e0?= =?us-ascii?Q?Kw5g9P/YqmPSZt1Xd7SS1EUxAkCuj2hotiBcBnjqyVuh5eYkOhzfc1UjL8hJ?= =?us-ascii?Q?leeMtEKov7c32p+HEt+aGIZGH9kJquVtSWkIxx3i0EPAhBx2bU7CXbUhjsLG?= =?us-ascii?Q?/A/PxxR2onbxJvQ19WA4zbrlTzeJ2MGN80PPggJ5SxPNdkjTgpXdR2jwRu+Z?= =?us-ascii?Q?UlJ/otcgX6lZwIhIWfFBV4b/fBxXkJrv+99GvGixJuQjdCclFOgq9i9XxwcU?= =?us-ascii?Q?ksrdyw0TKmKZXUjj7p0j8YYOhWpy0npNA+qRKZlOk6sJRp8amaT33St7A78c?= =?us-ascii?Q?Efw/6QdLllEo8JkSc5Y+qsgbCn94GTlfjz88qhVM5pO5gER1bMyRUPpRQyBH?= =?us-ascii?Q?Q0tqi8VgbhLdZ+4lNkwZ7liO357O96VS+IbgVaKpWYtMeahCJqwXotqpp8DI?= =?us-ascii?Q?R0fL9qaRbe4wyb3e3zcSw45yjGtqThj5ReXUeS3NMSgLja6OpfwtWXSHv4ML?= =?us-ascii?Q?R0Zwhua8jA2pzCjZ08kf5ZmywQgcKid0ElMlLPglleteyv1gOlp4kxp9XJgM?= =?us-ascii?Q?p1ztwxQb4Eid6JZsFw7GGLZogHiojPnjfEJTt8OMv2qJwriSZ1w962z+ZMuZ?= =?us-ascii?Q?+FcYHOFYS+T96Huuk1hzAeQOnFPNpg9h9JFDIstEMqTr5+7s2FB0s/bMFgK8?= =?us-ascii?Q?22+BrAUpTZcM3SQIfKmiOA=3D=3D?= X-Forefront-Antispam-Report: CIP:2a00:1450:4864:20::32e;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail-wm1-x32e.google.com;PTR:mail-wm1-x32e.google.com;CAT:NONE;SFS:(13230040)(9140799003)(48200799018)(6059299003)(376014)(61400799027)(43022699015)(82310400026)(10067099003)(56012099006)(5063699009)(261022105027099003)(261021123027099003)(261021121427099003)(261009223027099003)(261102123227099003)(261026121527099003)(261026140227099003)(261028144727099003)(55112099003)(18002099003)(22082099003)(16102099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fckgOXWPozCADmPD7Y0sqENxIDH2bmw4KFW++MCe6xYTI1PBH8PtdjVe8AHcTSzlkx0X2cUHyCbCvIwI2dvNHmnj3Au1/pJbhDWF0CUOhwL2zrFoTagSjUIj7uh01lIrNsp/KVdqM7dlprD1C9SBXu8BheORh2uqZ/7qdBEVSKz6xVWVqSbZcWC5a7/iL5d6mp4zXoZlDfV52NA6BFvSlt3KHZuSy8d7Qx/W5++2keNnNJhi/T0f7FVZQAB1ZMgEzHROVeXmpuXqAcyCX+S6uA1hriMHWa7OWAov6jRFZrOKjYj+/5uoFxAu6vet9cAbrl4HHomtRJzf80c8w/7TtoYL3psLvj67gBNgjB1r74eIRTTtROhpz1yLDI/WO+S96Fu/cTOAOS8YfkcZsPf8zz9OroGi8qCuiNMLq0E6zqgVaGGEkVADkUqfe/VNCDlE X-ExternalRecipientOutboundConnectors: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-Auto-Response-Suppress: DR, OOF, AutoReply X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2026 13:48:03.3823 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b0a822ef-2346-45a5-eaa5-08df40c392c9 X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-AuthSource: ZR1PEPF0000E6B1.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-Transport-CrossTenantHeadersStamped: AMDPR08MB11553 List-Id: 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); -- 2.53.0