From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.48 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794461726; b=qqlidOuK5nRWk2koPzkkxmEdCUm4y2B7Ar7wPEKuiZpRxhNkVc6LDFBcN+mS69mBRrCt 54NwFriwcy0BhIfFb29Wl1U9QeBQy/oaqcsZM4XELGkcDQkjUE2Q8Gzg7e+JzBZTZliNy yO3sw7OOUNTn5wuQOBnKDQTnqwgBo3bE3sIPYgoYIZvLBxusDIEXck2GaafFx3v33AKDt NlXMp6gIphmNc/tdACi9XNXOmYdFdGZGJBtbltig/kzKln4Wk7e9dJ7POqYnn14n1Dfkn 62Do8ZZD+TzK6dllzCIucq2IujvieyVpE2f+J+2s+fLNdgRV7XVni994DGB0QSGBuHw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794461726; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=HjEqMRpJHMxBlJx8PrvbXzsvZE9iPcCWrDVwQeSTNAI=; b=fq0saZlIotVXpNKpexRLu2WC3TZTT9biSRXwJWyqwehP50ErVtsAdSi118tmutKFg7x3 sIUlHqQ7AZuxIJF/GDyGWnZOIY5AkrniptybhIdyy62v1QtgEeLXLjVLfI1XwlxqCEyRa BFk3K9tbeaxZt8F0X4KUPR9qXz/+TFJxo3FOGFAuQ0ZfVZbSZPDg9hyrmG4iAAZ+EwVmt MLao66fGqX1lkXw+3wljr5PXl5WiDgMGhxXyNOYfjlqMyl0Lvx0jiTQuqM26b65ELP/kV t1rJq77GJVKqRuLC01EvqnI6BdPyLLkc96SARXa8sKxlnkp9sVQaFvvh5liSXHes60g== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=vYa2FiRl; arc=none smtp.remote-ip=74.125.82.48 Received: from mail-dl1-f48.google.com (mail-dl1-f48.google.com [74.125.82.48]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 25C0860A2639 for ; Thu, 12 Nov 2026 05:35:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 25C0860A2639 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=vYa2FiRl Received: by mail-dl1-f48.google.com with SMTP id a92af1059eb24-1a3c08d6928so6474581c88.0 for ; Wed, 11 Nov 2026 21:35:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794461724; x=1795066524; darn=vger.kernel.org; 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=HjEqMRpJHMxBlJx8PrvbXzsvZE9iPcCWrDVwQeSTNAI=; b=vYa2FiRl5/4PuMNg1NAKdPZGDH3GhYEKafGtCxu2U9WBMZw/rRvxrKcKthrIfGQI3A gP8rzWel7ZWo6/1wFWyweNgHlI7qrjDTceIEOeX5ud6byMw/Cn46dfPfBjosW8HdMgLa JP/JPbWFG693divjRoTQy+rujJ7gTfWdp2j8z9bpTfXsFgHaTxbOyjv91fKQFtnWIEvd xQIeKO+I0kXr5eLxq2YdnKrcjDAG5dvldfiezrW5ybLani6IUtnhBQWShtXc7FtOEEUx brjEv/SLyGLrEfMyNPCHln64LVMwc7gqE263z7elP/G+UkgBEereb2wT8TPtohIReMVS aQxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794461724; x=1795066524; 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=HjEqMRpJHMxBlJx8PrvbXzsvZE9iPcCWrDVwQeSTNAI=; b=G7dLQwWuoI8/GKqKGDXtXppf6ZMXJ8bL9//scAQpW26ys+0DVOlyNnXuExPvV3pqM4 c1Snax1zvRbSglkzYb/W5Z1qphGJWnFSVgujlybXbpXNhqadyT+KKfgThdHSw1/REjZR fPxYTTqEVig0IveyrvZdbdMT7kciAwaLhbeLYtNezh8xt+FQ68GRsh0xxiEBIT1in/G+ 2NiMNOMHwwNGewRRJo7DecDep9YUMdh5G64febBoHK/RI4/96o3KeAbuCdhQ8rYbnA8D XGCoWU0A5oJPqlEafpok11uEppdqF+sqVPLgsbUV28C+TkAIy8rmZbp7xfVsB+BFUgIn lTpA== X-Forwarded-Encrypted: i=1; AL+hErEQ98zqBse25H3lGmU7DhlqjS0KMNGt9TbIK2FbM8DwIZ7FndCLxFCBbVDrb4Seg3Ldtzk1tiBoBis=@vger.kernel.org X-Gm-Message-State: APuU4Z9BpCYq96DswNUTkr5ntcR+uLPZ9PdeSnN9FasbyxpE3GyYXvoX 8eMtiEkT2yXFbrDKQznrMJNjmVY7fB1IUJbbyac92zTAMvgf8TQE1K74 X-Gm-Gg: AYBFou0DmEoHySrq5dQquJv3Bq3OXHLOtl08U5Yj86TvyP9Lt3UdLcOZ0iWhUIxS45n m5vgyfNfB9gzmNVi5lxU0Twtqb8+omJ9O88k3AfzNalU1K+W11hWkTZ+a1dIxXdnjzudVtjRi78 LFtr34h9aTwkEyQDanUxxj5m9PNLgYECB7VqnDwvumzIQ0D1ylOBS1dP2hV9VKotj2l73iVY6Vn ScGkqA1y/659+vVvvvxMhpqEpzTuNkG0WPXvcTstHiaVmS648FoS/XnskkWCFlg2PTu+3075+fF uYb0VHtz4lw4QEbXI+pL1gJk9NNxjb4r5lUpfRD5k6qP4JnYxJ6y9thG42XI2vqZ/C33GdLbiOY b0SvHOBmJ2x8fbGaTKmkk0XgeJcd1qccujct9YdnX219ZyNsFc8Z89vAwzZrIbHt/5vHer49f5v vsegHqru16rRy6q4F7jCddNDNe5UU/2c+d0QqzvIiQN6+qQ7qDINfBOtkccfMAawFpqBS5MRhjU wxDmNik5Z2fYACfhvRpncSKT+QhgsJva2YNyUgFPluVIBGIvmj6x6X2ePQmGZiUVF4OpMHCw4cP Toe5UFrpfg4n3TjRrU4lalWqAVDtsnMzIW9E0wawMAt8AMdsPEN85PPMb9x5NuMhDFQxhsS+jDP FHE8sMw89Q8KeIJQ3Pacx+SKlm3l8+VoF7WRL3Omig4fFTWQ= X-Received: by 2002:a05:701b:454c:10b0:159:2c6d:fcc3 with SMTP id a92af1059eb24-1b3c034b3e4mr3915281c88.33.1794461724116; Wed, 11 Nov 2026 21:35:24 -0800 (PST) Received: from localhost.localdomain ([183.96.175.225]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1b3b5890c0esm21953240c88.1.2026.11.11.21.35.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Nov 2026 21:35:23 -0800 (PST) From: Joonho Lee To: linux-sound@vger.kernel.org Cc: tiwai@suse.com, perex@perex.cz, anton.yakovlev@opensynergy.com, mst@redhat.com, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, corbet@lwn.net, skhan@linuxfoundation.org, rdunlap@infradead.org, linux-doc@vger.kernel.org, Joonho Lee Subject: [PATCH v29 09/17] ALSA: virtio: bound PCM transfers and retain DMA buffers Date: Thu, 12 Nov 2026 14:34:38 +0900 Message-ID: <20261112053446.73504-10-mynameisjune111@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261112053446.73504-1-mynameisjune111@gmail.com> References: <20261112053446.73504-1-mynameisjune111@gmail.com> X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Validate ACK geometry, conversion bounds and queued-byte accounting before submitting transfers. Retain the backing DMA pages until message retirement. Check RX status and upper payload bounds while accepting bounded short responses, including at STOP and PAUSE. Preserve the legacy RX completion and ACK policy until the request-owned conversion, including the legacy handling of empty PAUSE returns. The fixed-offset layout still has short-response data gaps; request-owned capture and its queue/accounting contract arrive together in patch 12. Non-MMU copies use only the validated returned payload length. Fixes: f40a28679e0b ("ALSA: virtio: handling control and I/O messages for the PCM device") Assisted-by: LLM Signed-off-by: Joonho Lee --- sound/virtio/virtio_pcm.h | 11 + sound/virtio/virtio_pcm_msg.c | 306 +++++++++++++++++++++++++++++++++++------ sound/virtio/virtio_pcm_ops.c | 113 +++++++++++++++ 3 files changed, 386 insertions(+), 44 deletions(-) diff --git a/sound/virtio/virtio_pcm.h b/sound/virtio/virtio_pcm.h --- a/sound/virtio/virtio_pcm.h +++ b/sound/virtio/virtio_pcm.h @@ -13,6 +13,7 @@ struct virtio_pcm; struct virtio_pcm_msg; +struct page; /** * struct virtio_pcm_substream - VirtIO PCM substream. @@ -42,6 +43,10 @@ * @msgs: Allocated I/O messages. * @nmsgs: Number of allocated I/O messages. * @msg_count: Number of pending I/O messages in the virtqueue. + * @dma_pages: Pages backing DMA messages, retained until messages are freed. + * @ndma_pages: Number of retained pages. + * @owned_dma_area: Driver-owned PCM buffer backing asynchronous messages. + * @owned_dma_bytes: Size of @owned_dma_area. * @msg_empty: Notify when msg_count is zero. */ struct virtio_pcm_substream { @@ -68,6 +73,12 @@ struct virtio_pcm_msg **msgs; unsigned int nmsgs; unsigned int msg_count; + struct page **dma_pages; + unsigned int ndma_pages; +#ifndef CONFIG_MMU + u8 *owned_dma_area; + size_t owned_dma_bytes; +#endif wait_queue_head_t msg_empty; }; diff --git a/sound/virtio/virtio_pcm_msg.c b/sound/virtio/virtio_pcm_msg.c --- a/sound/virtio/virtio_pcm_msg.c +++ b/sound/virtio/virtio_pcm_msg.c @@ -3,6 +3,9 @@ * virtio-snd: Virtio sound device * Copyright (C) 2021 OpenSynergy GmbH */ +#include +#include +#include #include #include "virtio_card.h" @@ -13,6 +16,7 @@ * @xfer: Request header payload. * @status: Response header payload. * @length: Data length in bytes. + * @data_offset: Offset of the fixed PCM ring slice for ordinary I/O. * @sgs: Payload scatter-gather table. */ struct virtio_pcm_msg { @@ -20,6 +24,7 @@ struct virtio_snd_pcm_xfer xfer; struct virtio_snd_pcm_status status; size_t length; + size_t data_offset; struct scatterlist sgs[]; }; @@ -37,9 +42,8 @@ }; /** - * virtsnd_pcm_sg_num() - Count the number of sg-elements required to represent - * vmalloc'ed buffer. - * @data: Pointer to vmalloc'ed buffer. + * virtsnd_pcm_sg_num() - Count the sg-elements for a page-backed buffer. + * @data: Pointer to the page-backed buffer. * @length: Buffer size. * * Context: Any context. @@ -47,14 +51,18 @@ */ static int virtsnd_pcm_sg_num(u8 *data, unsigned int length) { - phys_addr_t sg_address; - unsigned int sg_length; + phys_addr_t sg_address = 0; + unsigned int sg_length = 0; int num = 0; while (length) { struct page *pg = vmalloc_to_page(data); - phys_addr_t pg_address = page_to_phys(pg); + phys_addr_t pg_address; size_t pg_length; + + if (!pg) + return -EINVAL; + pg_address = page_to_phys(pg); pg_length = PAGE_SIZE - offset_in_page(data); if (pg_length > length) @@ -75,11 +83,80 @@ return num; } -/** - * virtsnd_pcm_sg_from() - Build sg-list from vmalloc'ed buffer. +#ifdef CONFIG_MMU +/** + * virtsnd_pcm_dma_pages_put() - Release retained PCM buffer pages. + * @vss: VirtIO PCM substream. + * + * Context: Process context. + */ +static void virtsnd_pcm_dma_pages_put(struct virtio_pcm_substream *vss) +{ + while (vss->ndma_pages) + put_page(vss->dma_pages[--vss->ndma_pages]); + kfree(vss->dma_pages); + vss->dma_pages = NULL; +} + +/** + * virtsnd_pcm_dma_pages_get() - Retain the pages backing the PCM buffer. + * @vss: VirtIO PCM substream. + * @data: PCM buffer address. + * @length: PCM buffer size. + * + * Keep the backing pages alive while virtqueue descriptors can still refer to + * them, even if ALSA releases the vmalloc mapping after a failed drain. + * + * Context: Process context. + * Return: 0 on success, -errno on failure. + */ +static int virtsnd_pcm_dma_pages_get(struct virtio_pcm_substream *vss, + u8 *data, size_t length) +{ + size_t i; + size_t npages; + size_t span; + + if (!data || !length || !is_vmalloc_addr(data)) + return -EINVAL; + if (vss->dma_pages || vss->ndma_pages) + return -EBUSY; + + if (check_add_overflow(length, (size_t)offset_in_page(data), &span)) + return -EOVERFLOW; + + npages = span / PAGE_SIZE + !!(span % PAGE_SIZE); + if (npages > UINT_MAX) + return -EOVERFLOW; + + vss->dma_pages = kcalloc(npages, sizeof(*vss->dma_pages), GFP_KERNEL); + if (!vss->dma_pages) + return -ENOMEM; + + for (i = 0; i < npages; i++) { + struct page *page = vmalloc_to_page(data + i * PAGE_SIZE); + + if (!page) + goto err_put_pages; + + get_page(page); + vss->dma_pages[vss->ndma_pages++] = page; + } + + return 0; + +err_put_pages: + virtsnd_pcm_dma_pages_put(vss); + + return -EINVAL; +} +#endif + +/** + * virtsnd_pcm_sg_from() - Build an sg-list from a page-backed buffer. * @sgs: Preallocated sg-list to populate. * @nsgs: The maximum number of elements in the @sgs. - * @data: Pointer to vmalloc'ed buffer. + * @data: Pointer to the page-backed buffer. * @length: Buffer size. * * Splits the buffer into physically contiguous parts and makes an sg-list of @@ -132,36 +209,97 @@ int virtsnd_pcm_msg_alloc(struct virtio_pcm_substream *vss, unsigned int periods, unsigned int period_bytes) { - struct snd_pcm_runtime *runtime = vss->substream->runtime; + struct snd_pcm_runtime *runtime; + size_t buffer_bytes; unsigned int i; + int rc; + + if (vss->msgs || vss->nmsgs || vss->dma_pages || vss->ndma_pages) + return -EBUSY; +#ifndef CONFIG_MMU + if (vss->owned_dma_area || vss->owned_dma_bytes) + return -EBUSY; +#endif + if (!periods || !period_bytes) + return -EINVAL; + + if (check_mul_overflow((size_t)periods, (size_t)period_bytes, + &buffer_bytes)) + return -EOVERFLOW; + + if (!vss->substream || !vss->substream->runtime) + return -EINVAL; + runtime = vss->substream->runtime; + if (!runtime->dma_area || buffer_bytes > runtime->dma_bytes) + return -EINVAL; + +#ifdef CONFIG_MMU + rc = virtsnd_pcm_dma_pages_get(vss, runtime->dma_area, buffer_bytes); + if (rc) + return rc; +#else + vss->owned_dma_area = kzalloc(buffer_bytes, GFP_KERNEL); + if (!vss->owned_dma_area) + return -ENOMEM; + vss->owned_dma_bytes = buffer_bytes; +#endif vss->msgs = kzalloc_objs(*vss->msgs, periods); - if (!vss->msgs) - return -ENOMEM; + if (!vss->msgs) { + rc = -ENOMEM; + goto err_free_pages; + } vss->nmsgs = periods; for (i = 0; i < periods; ++i) { - u8 *data = runtime->dma_area + period_bytes * i; - int sg_num = virtsnd_pcm_sg_num(data, period_bytes); + int sg_num; struct virtio_pcm_msg *msg; + u8 *data; +#ifdef CONFIG_MMU + data = runtime->dma_area + (size_t)period_bytes * i; +#else + data = vss->owned_dma_area + (size_t)period_bytes * i; +#endif + sg_num = virtsnd_pcm_sg_num(data, period_bytes); + if (sg_num < 0) { + rc = sg_num; + goto err_free_msgs; + } msg = kzalloc_flex(*msg, sgs, sg_num + 2); - if (!msg) - return -ENOMEM; + if (!msg) { + rc = -ENOMEM; + goto err_free_msgs; + } msg->substream = vss; + vss->msgs[i] = msg; sg_init_one(&msg->sgs[PCM_MSG_SG_XFER], &msg->xfer, sizeof(msg->xfer)); sg_init_one(&msg->sgs[PCM_MSG_SG_STATUS], &msg->status, sizeof(msg->status)); + msg->data_offset = (size_t)period_bytes * i; virtsnd_pcm_sg_from(&msg->sgs[PCM_MSG_SG_DATA], sg_num, data, period_bytes); - - vss->msgs[i] = msg; } return 0; + +err_free_msgs: + virtsnd_pcm_msg_free(vss); + return rc; + +err_free_pages: +#ifdef CONFIG_MMU + virtsnd_pcm_dma_pages_put(vss); +#else + kfree(vss->owned_dma_area); + vss->owned_dma_area = NULL; + vss->owned_dma_bytes = 0; +#endif + + return rc; } /** @@ -177,6 +315,13 @@ for (i = 0; vss->msgs && i < vss->nmsgs; ++i) kfree(vss->msgs[i]); kfree(vss->msgs); +#ifdef CONFIG_MMU + virtsnd_pcm_dma_pages_put(vss); +#else + kfree(vss->owned_dma_area); + vss->owned_dma_area = NULL; + vss->owned_dma_bytes = 0; +#endif vss->msgs = NULL; vss->nmsgs = 0; @@ -228,8 +373,15 @@ bool notify = false; int rc; + if (!bytes) + return 0; + if (!period_bytes || !vss->msgs || offset >= vss->buffer_bytes || + bytes > vss->buffer_bytes - offset) + return -EINVAL; start = offset / period_bytes; end = (offset + bytes - 1) / period_bytes; + if (end >= vss->nmsgs) + return -EINVAL; for (i = start; i <= end; i++) { struct virtio_pcm_msg *msg = vss->msgs[i]; @@ -248,6 +400,33 @@ if (msg->length == period_bytes) { msg->xfer.stream_id = cpu_to_le32(vss->sid); memset(&msg->status, 0, sizeof(msg->status)); + +#ifndef CONFIG_MMU + if (vss->direction == SNDRV_PCM_STREAM_PLAYBACK) { + struct snd_pcm_runtime *runtime = + vss->substream ? vss->substream->runtime : NULL; + size_t data_bytes = msg->length; + + if (!runtime || !runtime->dma_area || !vss->owned_dma_area || + msg->data_offset > runtime->dma_bytes || + data_bytes > runtime->dma_bytes - msg->data_offset || + msg->data_offset > vss->owned_dma_bytes || + data_bytes > vss->owned_dma_bytes - msg->data_offset) { + dev_err_ratelimited(&vdev->dev, + "SID %u: invalid playback buffer for I/O message\n", + vss->sid); + msg->length -= n; + if (msg_count != vss->msg_count && + !(vss->features & + (1U << VIRTIO_SND_PCM_F_MSG_POLLING)) && + virtqueue_kick_prepare(vqueue)) + virtqueue_notify(vqueue); + return -EINVAL; + } + memcpy(vss->owned_dma_area + msg->data_offset, + runtime->dma_area + msg->data_offset, data_bytes); + } +#endif if (vss->direction == SNDRV_PCM_STREAM_PLAYBACK) rc = virtqueue_add_sgs(vqueue, psgs, 2, 1, msg, @@ -356,42 +535,83 @@ size_t written_bytes) { struct virtio_pcm_substream *vss = msg->substream; + bool capture_invalid = false; /* - * hw_ptr always indicates the buffer position of the first I/O message - * in the virtqueue. Therefore, on each completion of an I/O message, - * the hw_ptr value is unconditionally advanced. + * Completed requests can return captured data after STOP while the PCM + * buffer remains prepared. Once preparation ends, completions only retire + * queue ownership. */ guard(spinlock)(&vss->lock); - /* - * If the capture substream returned an incorrect status, then just - * increase the hw_ptr by the message size. - */ - if (vss->direction == SNDRV_PCM_STREAM_PLAYBACK || - written_bytes <= sizeof(msg->status)) - vss->hw_ptr += msg->length; - else - vss->hw_ptr += written_bytes - sizeof(msg->status); - - if (vss->hw_ptr >= vss->buffer_bytes) - vss->hw_ptr -= vss->buffer_bytes; + if (vss->direction == SNDRV_PCM_STREAM_CAPTURE && + (!vss->prepared || vss->xfer_xrun || + (vss->stopped && written_bytes <= sizeof(msg->status)))) { + msg->length = 0; + vss->msg_count--; + if (!vss->msg_count) + wake_up_all(&vss->msg_empty); + return; + } + + /* Validate the returned payload before advancing the capture pointer. */ + if (vss->direction == SNDRV_PCM_STREAM_CAPTURE && + (written_bytes < sizeof(msg->status) || + le32_to_cpu(msg->status.status) != VIRTIO_SND_S_OK || + written_bytes - sizeof(msg->status) > msg->length)) { + dev_err_ratelimited(&vss->snd->vdev->dev, + "SID %u: invalid capture position, status or length\n", + vss->sid); + vss->xfer_xrun = true; + capture_invalid = true; + } +#ifndef CONFIG_MMU + if (vss->direction == SNDRV_PCM_STREAM_CAPTURE && + vss->prepared && !capture_invalid && + written_bytes > sizeof(msg->status)) { + struct snd_pcm_runtime *runtime = + vss->substream ? vss->substream->runtime : NULL; + + if (!runtime || !runtime->dma_area || !vss->owned_dma_area || + msg->data_offset > runtime->dma_bytes || + written_bytes - sizeof(msg->status) > runtime->dma_bytes - msg->data_offset || + msg->data_offset > vss->owned_dma_bytes || + written_bytes - sizeof(msg->status) > vss->owned_dma_bytes - msg->data_offset) { + dev_err_ratelimited(&vss->snd->vdev->dev, + "SID %u: invalid capture buffer for I/O message\n", + vss->sid); + vss->xfer_xrun = true; + capture_invalid = true; + } else { + memcpy(runtime->dma_area + msg->data_offset, + vss->owned_dma_area + msg->data_offset, + written_bytes - sizeof(msg->status)); + } + } +#endif + /* Publish pointer progress only for a complete TX or valid RX request. */ + if (!capture_invalid) { + vss->hw_ptr += vss->direction == SNDRV_PCM_STREAM_CAPTURE && + written_bytes > sizeof(msg->status) ? + written_bytes - sizeof(msg->status) : msg->length; + if (vss->hw_ptr >= vss->buffer_bytes) + vss->hw_ptr -= vss->buffer_bytes; + } msg->length = 0; - - vss->xfer_xrun = false; vss->msg_count--; if (vss->xfer_enabled) { - struct snd_pcm_runtime *runtime = vss->substream->runtime; - - runtime->delay = - bytes_to_frames(runtime, - le32_to_cpu(msg->status.latency_bytes)); - + if (!capture_invalid) { + struct snd_pcm_runtime *runtime = vss->substream->runtime; + + runtime->delay = + bytes_to_frames(runtime, + le32_to_cpu(msg->status.latency_bytes)); + } schedule_work(&vss->elapsed_period); - } else if (!vss->msg_count) { + } + if (!vss->msg_count) wake_up_all(&vss->msg_empty); - } } /** diff --git a/sound/virtio/virtio_pcm_ops.c b/sound/virtio/virtio_pcm_ops.c --- a/sound/virtio/virtio_pcm_ops.c +++ b/sound/virtio/virtio_pcm_ops.c @@ -25,6 +25,8 @@ * signal or due to a timeout. In this case, the device can still access * messages even after calling ops->hw_free(). It can also issue an interrupt, * and the interrupt handler will also try to access message structures. + * The messages retain references to the PCM buffer pages until they are + * freed, so late DMA does not target pages released by ALSA. * * Therefore, freeing of already allocated messages occurs: * @@ -262,10 +264,21 @@ struct virtio_pcm_substream *vss = snd_pcm_substream_chip(substream); struct virtio_device *vdev = vss->snd->vdev; unsigned int msg_count; + size_t period_buffer_bytes; bool stopped; int rc; virtsnd_pcm_close_ack(substream, false); + + /* Fixed descriptors require whole-byte periods covering the buffer. */ + if (check_mul_overflow((size_t)params_periods(hw_params), + (size_t)params_period_bytes(hw_params), + &period_buffer_bytes) || + period_buffer_bytes != params_buffer_bytes(hw_params) || + (params_period_size(hw_params) * + (u64)snd_pcm_format_physical_width(params_format(hw_params)) * + params_channels(hw_params)) % 8) + return -EINVAL; scoped_guard(spinlock_irqsave, &vss->lock) { msg_count = vss->msg_count; @@ -608,6 +621,96 @@ int error; }; +/* Caller holds @vss->lock and the PCM stream lock. */ +static int virtsnd_pcm_playback_ack_validate(struct virtio_pcm_substream *vss, + struct snd_pcm_runtime *runtime, + const struct snd_pcm_indirect *rec) +{ + snd_pcm_uframes_t appl_ptr; + snd_pcm_uframes_t appl_diff; + snd_pcm_uframes_t signed_max; + snd_pcm_uframes_t back; + u64 buffer_bits; + u64 appl_bits; + size_t appl_bytes; + s64 queued_bytes; + s64 sw_ready_total; + s64 total_bytes; + s64 int_max; + unsigned int hw_queue_size; + + if (!runtime->control || !runtime->boundary || + runtime->control->appl_ptr >= runtime->boundary || + rec->appl_ptr >= runtime->boundary) + return -EPIPE; + + /* Keep the signed frame conversion used by frames_to_bytes() in range. */ + signed_max = (~(snd_pcm_uframes_t)0) >> 1; + if (runtime->boundary > signed_max || + runtime->buffer_size > signed_max || !runtime->frame_bits || + check_mul_overflow((u64)runtime->buffer_size, + (u64)runtime->frame_bits, &buffer_bits) || + buffer_bits > signed_max || buffer_bits % 8 || + buffer_bits / 8 != vss->buffer_bytes) + return -EPIPE; + + /* Match the indirect helper's appl_ptr boundary-wrap calculation. */ + appl_ptr = runtime->control->appl_ptr; + if (appl_ptr >= rec->appl_ptr) { + appl_diff = appl_ptr - rec->appl_ptr; + } else { + back = rec->appl_ptr - appl_ptr; + if (back <= runtime->boundary / 2) + return -EPIPE; + appl_diff = runtime->boundary - back; + } + + if (appl_diff > runtime->buffer_size) + return -EPIPE; + /* The indirect helper advances appl_ptr even if frames_to_bytes truncates. */ + if (!runtime->min_align || appl_diff % runtime->min_align) + return -EBADFD; + if (check_mul_overflow((u64)appl_diff, + (u64)runtime->frame_bits, &appl_bits) || + appl_bits % 8) + return -EPIPE; + + if (!rec->hw_buffer_size || !rec->sw_buffer_size || + rec->hw_buffer_size != vss->buffer_bytes || + rec->sw_buffer_size != vss->buffer_bytes || rec->hw_ready < 0 || + rec->sw_ready < 0 || rec->hw_data >= rec->hw_buffer_size || + rec->hw_io >= rec->hw_buffer_size || + rec->sw_data >= rec->sw_buffer_size || + rec->sw_io >= rec->sw_buffer_size || + (unsigned int)rec->sw_ready > rec->sw_buffer_size) + return -EPIPE; + + hw_queue_size = rec->hw_queue_size ? rec->hw_queue_size : + rec->hw_buffer_size; + if (!hw_queue_size || hw_queue_size > rec->hw_buffer_size || + (unsigned int)rec->hw_ready > hw_queue_size) + return -EPIPE; + + int_max = (int)(~0U >> 1); + if (hw_queue_size > int_max || appl_bits / 8 > int_max) + return -EPIPE; + appl_bytes = frames_to_bytes(runtime, (snd_pcm_sframes_t)appl_diff); + if (appl_bytes != (size_t)(appl_bits / 8) || + check_add_overflow((s64)rec->sw_ready, (s64)appl_bytes, + &sw_ready_total) || + sw_ready_total > int_max) + return -EPIPE; + + /* hw_ready already excludes device completions accounted by the pointer. */ + if (check_add_overflow((s64)rec->hw_ready, (s64)rec->sw_ready, + &queued_bytes) || + check_add_overflow(queued_bytes, (s64)appl_bytes, &total_bytes) || + total_bytes > (s64)vss->buffer_bytes) + return -EPIPE; + + return 0; +} + static void virtsnd_pcm_trans_copy(struct snd_pcm_substream *substream, struct snd_pcm_indirect *rec, size_t bytes) { @@ -670,7 +773,15 @@ rc = -EPIPE; } else { transfer.indirect = vss->pcm_indirect; - rc = snd_pcm_indirect_playback_transfer(substream, + rc = virtsnd_pcm_playback_ack_validate(vss, + substream->runtime, + &transfer.indirect); + if (rc == -EBADFD || + (rc && substream->runtime->state == + SNDRV_PCM_STATE_PAUSED)) + return -EBADFD; + if (!rc) + rc = snd_pcm_indirect_playback_transfer(substream, &transfer.indirect, virtsnd_pcm_trans_copy); if (!rc)