From nobody Sun Sep 20 19:52:36 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785930797; cv=none; d=zohomail.com; s=zohoarc; b=TXTaVnYS/0ACauPyXRrep8KK8kooXNGwEv+KcBJRIYwwYwJ9ABLtuk3NFqfZ4E+Yx1IXeAsKy/FqYHeOvBwsalpBQdB8P9Xjj7p5OhEGJZ6Zveiph3PrXuZiUEe6ddLuYJJFU0wbhSJN5y4XiyhbdpjRPyw8rLVW5YjBq5s1YlY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785930797; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7PMTkvaIVO4jhh0ZLegntqLtMpH+bSV5zE9b/jru5SI=; b=gcH06lBg3IUziS6UxW9JnTnKlljJuzV6ASQPgEAp4CuCkXqSvxbwpRqU+vPAuiFWzr9TmC9cZSIT5Vs4mS/9j/TtHpTzD4RtycuEtzjdIbdwSITGT/9acTP/wieaSQrloNlLM4SrmmmLYX0Fztg9BQnBJcRUqUNKIf4JpQQC2oM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785930797440637.236310528809; Wed, 5 Aug 2026 04:53:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wraBM-0007ud-OV; Wed, 05 Aug 2026 07:53:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wraBL-0007uN-WC for qemu-devel@nongnu.org; Wed, 05 Aug 2026 07:53:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wraBK-0007JR-I9 for qemu-devel@nongnu.org; Wed, 05 Aug 2026 07:53:11 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-66-v9HxG4iZNoO8CIW_g-9Flg-1; Wed, 05 Aug 2026 07:53:08 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 079C519560AA for ; Wed, 5 Aug 2026 11:53:08 +0000 (UTC) Received: from localhost (unknown [10.44.22.2]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C6CD3180049F; Wed, 5 Aug 2026 11:53:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785930790; 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=7PMTkvaIVO4jhh0ZLegntqLtMpH+bSV5zE9b/jru5SI=; b=ecV6u7lk2h3GgvEh2lpdMUkWd/BiHULAIOb3h8v9QpF6IC88TqaaSkFFzJZzQ1mkjGKiJ5 jaP4SXzqDR1bKKJtACTIOwGXPeqOn25gG3n0vEwscK2OtT07VVkn5ZOMENdFVsSs7yIp65 uA8CJ3C6zRR3YSi+StYG64CGaJUL4lo= X-MC-Unique: v9HxG4iZNoO8CIW_g-9Flg-1 X-Mimecast-MFC-AGG-ID: v9HxG4iZNoO8CIW_g-9Flg_1785930788 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Wed, 05 Aug 2026 15:51:00 +0400 Subject: [PATCH 10/27] hw/usb/dev-smartcard-reader: reset all I/O state on device reset MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260805-smartcard-fixes-v1-10-187ee9122441@redhat.com> References: <20260805-smartcard-fixes-v1-0-187ee9122441@redhat.com> In-Reply-To: <20260805-smartcard-fixes-v1-0-187ee9122441@redhat.com> To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Developer-Signature: v=1; a=openpgp-sha256; l=3274; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=PUVI70oyctTz1sag9yfTLK9ruJyZ7AFi1cPL+bm/MWE=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqcyOtQjv4bSKqQGnitCXc1gOq+O4OcFALNHb3g 17FIU9PZfGJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCanMjrQAKCRDa6OEJdZac 5YeyD/9Pd903+XcETamlodI78G5D9tJxOEjCsE1yblGkIT4sAxXJehPZ4iBShWDgAvNxCtW8Wbv 4beADbBdH27vJ9ZUNB8DMqZnyNriJs924zPOXHoOFB+AM6BF43XVTaamK5XgWPfDcFFb+SSyJ2Y NjIy559EBSd3R2kmN7hUdP4RBmGxAwFkMHbSkI6GvgPdnSkDQGSOKcvHtqRWkcKu9Hf9T6db/FH P7AxF2haKB7ixaQY3IGNeYEpKybEbKG0Q7JLUVLD9bz6QyxBc/w4lzn1yNGGiDukhc1qkIDflO9 +y7ypjESTylUT6WoZt80RGe5uxxVIn2r+n22i1a/ciOvhTyUd3MmZG17D/8iTkzQN+nx4SBBHyB 56XyejvNOjAbymeeoo5MmzvyC3rEotPcTThRWD491wP5jq60oNBv0iwbyPPSjczIKsgccy7nZm7 AMzCjUI3WXYI6gVPhgNKLmhfMHwGTpw01dgGX6+P+9G6oPoQ5YFzf73S1Cto6SZsa42voKOuPwk mZ3c0zRX0FqUrgXSya7R1OOQvy8CZQ54gFnkTew5brWGA2pf/0gpbESCsKHVEl8XOks0ieP1QJg R3cEDVIHEoDViKrquPphxdanv6nU0gkZD+0QkA7PAzWe1+NRru9CHqoZw8GwqzCN9E5d7Gl9ORj lZbLgEpOOVTJtBA== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 4 X-Spam_score: 0.4 X-Spam_bar: / X-Spam_report: (0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.852, 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785930799431158500 Clear bulk-in entries (len/pos), current_bulk_in pointer, bulk-out position, error status, and protocol parameters during reset. Previously only the bulk-in ring buffer indices and pending answers were cleared, leaving stale state that could corrupt subsequent transfers. Move ccid_reset() after its callees to avoid forward declarations. Drop redundant initialization from realize() since it calls reset(). Fixes: 367071447ec5 ("usb-ccid: add CCID bus") Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/usb/dev-smartcard-reader.c | 60 +++++++++++++++++++++++----------------= ---- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index bed641be4512..12c82c8f6458 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -574,9 +574,16 @@ static void ccid_remove_pending_answer(USBCCIDState *s, =20 static void ccid_bulk_in_clear(USBCCIDState *s) { + int i; + + for (i =3D 0; i < BULK_IN_PENDING_NUM; i++) { + s->bulk_in_pending[i].len =3D 0; + s->bulk_in_pending[i].pos =3D 0; + } s->bulk_in_pending_start =3D 0; s->bulk_in_pending_end =3D 0; s->bulk_in_pending_num =3D 0; + s->current_bulk_in =3D NULL; } =20 static void ccid_bulk_in_release(USBCCIDState *s) @@ -621,26 +628,6 @@ static void *ccid_reserve_recv_buf(USBCCIDState *s, ui= nt16_t len) return bulk_in->data; } =20 -static void ccid_reset(USBCCIDState *s) -{ - ccid_bulk_in_clear(s); - ccid_clear_pending_answers(s); -} - -static void ccid_detach(USBCCIDState *s) -{ - ccid_reset(s); -} - -static void ccid_handle_reset(USBDevice *dev) -{ - USBCCIDState *s =3D USB_CCID_DEV(dev); - - DPRINTF(s, 1, "Reset\n"); - - ccid_reset(s); -} - static const char *ccid_control_to_str(USBCCIDState *s, int request) { switch (request) { @@ -918,6 +905,31 @@ static void ccid_reset_parameters(USBCCIDState *s) s->abProtocolDataStructure =3D defaultProtocolDataStructure; } =20 +static void ccid_reset(USBCCIDState *s) +{ + ccid_bulk_in_clear(s); + ccid_clear_pending_answers(s); + s->bulk_out_pos =3D 0; + s->last_answer_error =3D 0; + s->notify_slot_change =3D false; + ccid_reset_error_status(s); + ccid_reset_parameters(s); +} + +static void ccid_detach(USBCCIDState *s) +{ + ccid_reset(s); +} + +static void ccid_handle_reset(USBDevice *dev) +{ + USBCCIDState *s =3D USB_CCID_DEV(dev); + + DPRINTF(s, 1, "Reset\n"); + + ccid_reset(s); +} + /* NOTE: only a single slot is supported (SLOT_0) */ static void ccid_on_slot_change(USBCCIDState *s, bool full) { @@ -1349,14 +1361,6 @@ static void ccid_realize(USBDevice *dev, Error **err= p) s->dev.speedmask =3D USB_SPEED_MASK_FULL; s->notify_slot_change =3D false; s->powered =3D true; - s->pending_answers_num =3D 0; - s->last_answer_error =3D 0; - s->bulk_in_pending_start =3D 0; - s->bulk_in_pending_end =3D 0; - s->current_bulk_in =3D NULL; - ccid_reset_error_status(s); - s->bulk_out_pos =3D 0; - ccid_reset_parameters(s); ccid_reset(s); s->debug =3D parse_debug_env("QEMU_CCID_DEBUG", D_VERBOSE, s->debug); } --=20 2.55.0