From nobody Sat Apr 27 16:08:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605709976; cv=none; d=zohomail.com; s=zohoarc; b=n3+KmjH8HEeC1eGlpGGjjPbvgGSoVXb0zWQi8oz3TvPz3GWSuz++5bN+NLlwj16vFHE4B+nyOZt5fXCblN0R/5XdnzXUIjssyqyVY6kFSlhPpxDCHumdM0hUYWbwedccnwS5YBxKHK5GzCYL/6JpooNwxlX/neSvB1BxCmueynw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605709976; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=lsjjKuTU5FeUgm6fKP8gxE37SO0uwkFQXm1/9t11QP0=; b=gtcSzo3uMuxHQgKoCledFhVb6M7Pxd3aTYJ02hX9578D2ThGMqyz2gZm5XXfGiUgotjdj7RTaFruYRy/8XsOdsl/QU0H+SDajaIG3ByU68qjLdJPjWtG4lTkdgDgGjsnbidcK7kwiV4VlgGFyBOo6jkc4PLEnGOka3slEV0OHyo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605709976702887.7587929902095; Wed, 18 Nov 2020 06:32:56 -0800 (PST) Received: from localhost ([::1]:36242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfOVy-0008AK-7v for importer@patchew.org; Wed, 18 Nov 2020 09:32:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfOUv-0007Ia-8J for qemu-devel@nongnu.org; Wed, 18 Nov 2020 09:31:49 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:32598) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfOUs-0002nz-FF for qemu-devel@nongnu.org; Wed, 18 Nov 2020 09:31:48 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-249-MVvtT-wkPd-KXSFzeLCYgg-1; Wed, 18 Nov 2020 09:31:40 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BAC3F10C624A; Wed, 18 Nov 2020 14:29:53 +0000 (UTC) Received: from localhost.localdomain (unknown [10.33.36.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 760215B697; Wed, 18 Nov 2020 14:29:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605709904; 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; bh=lsjjKuTU5FeUgm6fKP8gxE37SO0uwkFQXm1/9t11QP0=; b=WG6Zvr3QdLPIM48eVfYtaPyq1cCG+QmLYwQxkWCrkmy1umVfBHDwlQoYQULwAnMxQZlFnZ vjlwnKGDtMxVVyqXqMIcD+yYpxENIAAp2kmO44iGanN+YOEbvMYet1mLmYHVlTIRYlkqP3 DMafqvwJYJWSxny0kLlPZvltDfM2ReM= X-MC-Unique: MVvtT-wkPd-KXSFzeLCYgg-1 From: P J P To: John Snow Subject: [PATCH] ide:atapi: check io_buffer_index in ide_atapi_cmd_reply_end Date: Wed, 18 Nov 2020 19:57:45 +0530 Message-Id: <20201118142745.112579-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ppandit@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=ppandit@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 00:38:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wenxiang Qian , QEMU Developers , Prasad J Pandit Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Prasad J Pandit During data transfer via packet command in 'ide_atapi_cmd_reply_end' 's->io_buffer_index' could exceed the 's->io_buffer' length, leading to OOB access issue. Add check to avoid it. ... #9 ahci_pio_transfer ../hw/ide/ahci.c:1383 #10 ide_transfer_start_norecurse ../hw/ide/core.c:553 #11 ide_atapi_cmd_reply_end ../hw/ide/atapi.c:284 #12 ide_atapi_cmd_read_pio ../hw/ide/atapi.c:329 #13 ide_atapi_cmd_read ../hw/ide/atapi.c:442 #14 cmd_read ../hw/ide/atapi.c:988 #15 ide_atapi_cmd ../hw/ide/atapi.c:1352 #16 ide_transfer_start ../hw/ide/core.c:561 #17 cmd_packet ../hw/ide/core.c:1729 #18 ide_exec_cmd ../hw/ide/core.c:2107 #19 handle_reg_h2d_fis ../hw/ide/ahci.c:1267 #20 handle_cmd ../hw/ide/ahci.c:1318 #21 check_cmd ../hw/ide/ahci.c:592 #22 ahci_port_write ../hw/ide/ahci.c:373 #23 ahci_mem_write ../hw/ide/ahci.c:513 Reported-by: Wenxiang Qian Signed-off-by: Prasad J Pandit --- hw/ide/atapi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index 14a2b0bb2f..b991947c5c 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -276,6 +276,9 @@ void ide_atapi_cmd_reply_end(IDEState *s) s->packet_transfer_size -=3D size; s->elementary_transfer_size -=3D size; s->io_buffer_index +=3D size; + if (s->io_buffer_index > s->io_buffer_total_len) { + return; + } =20 /* Some adapters process PIO data right away. In that case, we ne= ed * to avoid mutual recursion between ide_transfer_start --=20 2.28.0