From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.171 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794267689; b=LHxRqXkQzgOS/2T+r/g9PZfw2n7h5EPHY4NF860pckf5LxUKOWy7JZ2WpjusPMdrs745 4jnhY1S/bRvq0Gsyrr64kqelzcAnLAW34rVZdjcpWWH0fZAxVDh4yio24q9pNth+za6V6 HUOBp4GWnA1C77ih1Fqh09lTAHezePTEP9NW1/pi2sPgXIsewSvP0KflKgpiC74tnonX7 Ai/itQSPeu8kD1WbT/71IsRO84XDWIYy3BWaTn3YBWgKOFaUpo57o8C+ZHqa+yTz0ChKS RcZXjy18PUq77rruWdkM6lqBtUQ8h/yzCcfwd6rL9AaKSep/epBElTk2Sp8YYgVrlcQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794267689; 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=ssWTea24tfBe4iDcvBGam4JF6DLANFvuiBeoh6FVqkA=; b=0EUElA4ttq3t2paP3o0U5wJ9licegNQNPFwksedpjrA3IE/GmoNXmrZwi+1r66fb9fcs X29RLbH88GAYM+yw3o3SXQ1jcCPf+onNu2WVT3fn6+dee2S30dMv/L/I/CM7rnm07u35J yMWAiS9m9yD4cYyVfCjxGHWiOHgtuTV83iXd4iYC45Y0w8I1DeNUuVsIvRMnCignFXQNI BxNSIg8vLX5W85S37EXnTxBqsR3sFRmdltfEPlF5b3xypz4cTrP2fhX/Auqkx6triTmSM Asn29B8ylC/OHQZpmsKjXy75YmhcSch9JW5DbXFOHELeW4d1KwXN5LvAn1ubwZLxF7w== 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=qoeR62TY; arc=none smtp.remote-ip=74.125.82.171 Received: from mail-dy1-f171.google.com (mail-dy1-f171.google.com [74.125.82.171]) (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 4CAB460A3815 for ; Mon, 9 Nov 2026 23:41:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 4CAB460A3815 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=qoeR62TY Received: by mail-dy1-f171.google.com with SMTP id 5a478bee46e88-3645f0f3fcdso2867629eec.0 for ; Mon, 09 Nov 2026 15:41:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794267687; x=1794872487; 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=ssWTea24tfBe4iDcvBGam4JF6DLANFvuiBeoh6FVqkA=; b=qoeR62TYBAM/UV7ztueJRFb6QleVC84phvj1ep3q8bzPddPGtTLLce8S4DIIrB+ShI QQO3nnanP5PxOAjdhFKvu7aAKouYw55cgv4fCyNsVUNUaLgzOOog0st4jsn+J+9E2c2i zV2aJbqv2aMewkpzKSi05Vz22RoHbWjWwW2gmisLtQDSXVGgnQtFLJC5Ghq/lJjPZ9wp RN8xWS+ualZzuhNDrEF+fn35aH0GOvbs7HIpkOJOoa0F2Nu38EHZ0n77F89SxuxNflRS J5gBgUx9m1UoVaY8Up93diXCOWGjjI3li0VwfWV3lxaDH542yj/NO/ILIegzBO/enrJO JQ5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794267687; x=1794872487; 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=ssWTea24tfBe4iDcvBGam4JF6DLANFvuiBeoh6FVqkA=; b=VySL24bLr6VZyIUL/lU4euMWYJrfi+nCaCVmZTXH69UE31/uAgrRmEBNvHJriPfpoS FhBk+vFQJcKOxgPg5syhcJC3r7ZTvMiv5NpotE43ACKGK1+UiB34eYAeRLdJeUCYWmrs gsJsXrVxdGHgogcREEucuc3Zh6lbb4G62PrQ2lFtexJZ11A590VszP+3bmWzrQkGC153 BuUROrmeh78dZtiIRq94Qv/UwPtrCLr/gJHJC3yNaLE0dEZeh7VBr/K3oM1cSckZSxhZ vNrruyww+i4zgFwiSm0EDOA4yoxSga0nnKNMb6E1kOwLfF2nCmjEN/4iuCjWBJ24Mc+a pI9Q== X-Forwarded-Encrypted: i=1; AL+hErH0jiYJmD6rHioS55eZyHlqYrhP1E9ivKUhg57robwVldoktnqFc99esU5KpJr13qAhmz0RhyHtOcK4zmU=@vger.kernel.org X-Gm-Message-State: APuU4Z/mFt9fXSuhwnd0oRhwtdNBNsMTS6+tuoQN5XRTAn3ZM6Jmej+z gYa23EYOKtnMqThZ+JzNQ+BzPWB6oY9hzwvQvyVlFfKnOUvKkzqaTBI7wZmkYQ== X-Gm-Gg: AYBFou2FLwVTfwii2eT1npIdySEaFGvj38yLazZgQIT4zcqhUD5EsuSi3D0xeiKFy7X 1IBDvwyUVSUki2QxPy+/9fSRlnJhICsKt3mxVt9S+IlMahS8bdgQm1isftYf70ovEBUX1WJ4N9J KiJ4yiIwjCd3Ivssz0U+vuNkJkdXWqvlLAWXkKR4lgseYCNEscDn2/8dcn7D+ZbXuFs+cJnsp0Y 6HYxfDewr4uFqm7NuesG/iJrAcV3p+IEdXJgiN5xqOfwz+8L2ex2r4gsfcbpiC6DbU2MNH3spjJ uYebQQs+n+3JNgY2trjl170J+PM5hvkSP2kuSF4tcvY3B+VcLoc++bfpiCvfXLgPHDoaUCLXU+i +5WWA0eZgmtwScGNBIVUJ0G4BLB+YumLZjgTBQL0wBfvuvFlHd9WaD9p7KHoW4y4sZyxeXwKt+m DZumw7yEVlKpTu1kii3Y3/N77VcxX5+J7ARzlaCML6B8JRTfi4C+JBcP9Y5mZy9m2y5JOARGSRu uxuK+1wl7hBnDbxjlYSIrLG/csmlajzezS2p0w9wk80c8X6knkqJ1571VOSrJ+gpNtGUwektUCj pa7ukFF9FeFWpGflQJ0oWbmsGSlEpLc2bMcADWu3DXY4Aim0Heq/+DGymQJzVJ9eI4e7iXyQU9k DBfg5pr12YGyrSMMQOQRveM/tan0GKNCIFPpEfeA1NCXZGvc= X-Received: by 2002:a05:7301:9a91:b0:374:ba43:ae2e with SMTP id 5a478bee46e88-3751ee74826mr1055093eec.14.1794267687157; Mon, 09 Nov 2026 15:41:27 -0800 (PST) Received: from localhost.localdomain ([183.96.175.225]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3751fe2ff5dsm1739049eec.5.2026.11.09.15.41.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Nov 2026 15:41:26 -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 v23 10/14] ALSA: virtio: Keep control payloads alive through DMA completion Date: Tue, 10 Nov 2026 08:40:45 +0900 Message-ID: <20261109234049.79534-11-mynameisjune111@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261109234049.79534-1-mynameisjune111@gmail.com> References: <20261109234049.79534-1-mynameisjune111@gmail.com> X-Mailing-List: linux-kernel@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 Control requests can expose caller-owned payloads to the device after a synchronous send times out. Keep request and response headers and payloads in the reference-counted message so caller cleanup cannot invalidate DMA. Keep the queue reference until device completion or post-reset cleanup, even when the caller times out or is interrupted. Consume the caller's reference on every send path, and let response readers retain an extra reference through copyout. Check payload sizes and allocation arithmetic before building the scatterlists. A control value payload is also read by the CPU as a typed structure. DMA cacheline alignment alone does not guarantee the structure's CPU alignment. Align regions to the greater of the DMA cacheline and control-value type alignment, and reserve prefix slack from the buffer base so typed accesses remain aligned while scatterlist regions stay on cacheline boundaries. Keep response values in a separately allocated aligned response buffer so INTEGER64 control accesses are aligned from this patch onward. Fixes: 9d45e514da88 ("ALSA: virtio: handling control messages") Assisted-by: LLM Signed-off-by: Joonho Lee --- sound/virtio/virtio_ctl_msg.c | 289 +++++++++++++++++++++++++++++++---------- sound/virtio/virtio_ctl_msg.h | 24 ++- sound/virtio/virtio_kctl.c | 121 +++++++++-------- sound/virtio/virtio_pcm_msg.c | 2 4 files changed, 300 insertions(+), 136 deletions(-) diff --git a/sound/virtio/virtio_ctl_msg.c b/sound/virtio/virtio_ctl_msg.c --- a/sound/virtio/virtio_ctl_msg.c +++ b/sound/virtio/virtio_ctl_msg.c @@ -3,7 +3,10 @@ * virtio-snd: Virtio sound device * Copyright (C) 2021 OpenSynergy GmbH */ +#include +#include #include +#include #include #include "virtio_card.h" @@ -11,7 +14,12 @@ /** * struct virtio_snd_msg - Control message. * @sg_request: Scattergather list containing a device request (header). + * @sg_request_data: Scattergather list containing request data. * @sg_response: Scattergather list containing a device response (status). + * @sg_response_data: Scattergather list containing response data. + * @dma_buffer: Message-owned storage for all DMA-visible SG regions. + * @request_data_size: Size of the request data buffer. + * @response_data_size: Size of the response data buffer. * @list: Pending message list entry. * @notify: Request completed notification. * @ref_count: Reference count used to manage a message lifetime. @@ -19,7 +27,12 @@ */ struct virtio_snd_msg { struct scatterlist sg_request; + struct scatterlist sg_request_data; struct scatterlist sg_response; + struct scatterlist sg_response_data; + void *dma_buffer; + size_t request_data_size; + size_t response_data_size; struct list_head list; struct completion notify; refcount_t ref_count; @@ -47,8 +60,10 @@ */ void virtsnd_ctl_msg_unref(struct virtio_snd_msg *msg) { - if (refcount_dec_and_test(&msg->ref_count)) + if (refcount_dec_and_test(&msg->ref_count)) { + kfree(msg->dma_buffer); kfree(msg); + } } /** @@ -71,12 +86,73 @@ void *virtsnd_ctl_msg_response(struct virtio_snd_msg *msg) { return sg_virt(&msg->sg_response); +} + +/** + * virtsnd_ctl_msg_request_data() - Get the request data buffer. + * @msg: Control message. + * + * Context: Any context. + */ +void *virtsnd_ctl_msg_request_data(struct virtio_snd_msg *msg) +{ + return msg->request_data_size ? sg_virt(&msg->sg_request_data) : NULL; +} + +/** + * virtsnd_ctl_msg_response_data() - Get the response data buffer. + * @msg: Control message. + * + * Context: Any context. + */ +void *virtsnd_ctl_msg_response_data(struct virtio_snd_msg *msg) +{ + return msg->response_data_size ? sg_virt(&msg->sg_response_data) : NULL; +} + +/** + * virtsnd_ctl_msg_sg_init() - Place one DMA region on cacheline boundaries. + * @sg: Scattergather entry for the region. + * @cursor: Current location in the message-owned DMA buffer. + * @size: Region length. + * @alignment: Alignment for DMA cachelines and typed CPU accesses. + * + * Context: Any context during message allocation. + * Return: 0 on success, -EOVERFLOW if the address cannot be represented. + */ +static int virtsnd_ctl_msg_sg_init(struct scatterlist *sg, u8 **cursor, + size_t size, size_t alignment) +{ + uintptr_t address = (uintptr_t)*cursor; + uintptr_t end; + size_t padding; + + padding = address % alignment; + if (padding && + check_add_overflow(address, (uintptr_t)(alignment - padding), + &address)) + return -EOVERFLOW; + + if (check_add_overflow(address, (uintptr_t)size, &end)) + return -EOVERFLOW; + + padding = end % alignment; + if (padding && + check_add_overflow(end, (uintptr_t)(alignment - padding), &end)) + return -EOVERFLOW; + + sg_init_one(sg, (void *)address, (unsigned int)size); + *cursor = (u8 *)end; + + return 0; } /** * virtsnd_ctl_msg_alloc() - Allocate and initialize a control message. * @request_size: Size of request header. * @response_size: Size of response header. + * @request_data_size: Size of request data buffer. + * @response_data_size: Size of response data buffer. * @gfp: Kernel flags for memory allocation. * * The message will be automatically freed when the ref_count value is 0. @@ -85,20 +161,85 @@ * Return: Allocated message on success, NULL on failure. */ struct virtio_snd_msg *virtsnd_ctl_msg_alloc(size_t request_size, - size_t response_size, gfp_t gfp) + size_t response_size, + size_t request_data_size, + size_t response_data_size, + gfp_t gfp) { struct virtio_snd_msg *msg; - - if (!request_size || !response_size) + struct scatterlist *sgs[4]; + size_t sizes[4] = { + request_size, + response_size, + request_data_size, + response_data_size, + }; + size_t alignment; + size_t dma_buffer_size; + size_t aligned_size; + size_t padding; + u8 *data; + unsigned int i; + int cache_alignment; + int rc; + + if (!request_size || !response_size || request_size > UINT_MAX || + response_size > UINT_MAX || request_data_size > UINT_MAX || + response_data_size > UINT_MAX) return NULL; - - msg = kzalloc(sizeof(*msg) + request_size + response_size, gfp); + cache_alignment = dma_get_cache_alignment(); + if (cache_alignment <= 0) + return NULL; + /* DMA coherence does not remove the CPU's type alignment requirement. */ + alignment = max_t(size_t, cache_alignment, + __alignof__(struct virtio_snd_ctl_value)); + + /* Reserve prefix alignment slack before the first DMA region. */ + dma_buffer_size = alignment - 1; + for (i = 0; i < ARRAY_SIZE(sizes); ++i) { + if (!sizes[i]) + continue; + + padding = sizes[i] % alignment; + aligned_size = sizes[i]; + if (padding && + check_add_overflow(aligned_size, alignment - padding, + &aligned_size)) + return NULL; + + if (check_add_overflow(dma_buffer_size, aligned_size, + &dma_buffer_size)) + return NULL; + } + + msg = kzalloc(sizeof(*msg), gfp); if (!msg) return NULL; - sg_init_one(&msg->sg_request, (u8 *)msg + sizeof(*msg), request_size); - sg_init_one(&msg->sg_response, (u8 *)msg + sizeof(*msg) + request_size, - response_size); + msg->dma_buffer = kzalloc(dma_buffer_size, gfp); + if (!msg->dma_buffer) { + kfree(msg); + return NULL; + } + data = msg->dma_buffer; + sgs[0] = &msg->sg_request; + sgs[1] = &msg->sg_response; + sgs[2] = &msg->sg_request_data; + sgs[3] = &msg->sg_response_data; + for (i = 0; i < ARRAY_SIZE(sizes); ++i) { + if (!sizes[i]) + continue; + + rc = virtsnd_ctl_msg_sg_init(sgs[i], &data, sizes[i], alignment); + if (rc) { + kfree(msg->dma_buffer); + kfree(msg); + return NULL; + } + } + + msg->request_data_size = request_data_size; + msg->response_data_size = response_data_size; INIT_LIST_HEAD(&msg->list); init_completion(&msg->notify); @@ -112,17 +253,15 @@ * virtsnd_ctl_msg_send() - Send a control message. * @snd: VirtIO sound device. * @msg: Control message. - * @out_sgs: Additional sg-list to attach to the request header (may be NULL). - * @in_sgs: Additional sg-list to attach to the response header (may be NULL). * @nowait: Flag indicating whether to wait for completion. * * Context: Any context. Takes and releases the control queue spinlock. * May sleep if @nowait is false. + * Consumes the caller's reference on every return path. * Return: 0 on success, -errno on failure. */ int virtsnd_ctl_msg_send(struct virtio_snd *snd, struct virtio_snd_msg *msg, - struct scatterlist *out_sgs, - struct scatterlist *in_sgs, bool nowait) + bool nowait) { struct virtio_device *vdev = snd->vdev; struct virtio_snd_queue *queue = virtsnd_control_queue(snd); @@ -133,6 +272,7 @@ unsigned int nins = 0; struct scatterlist *psgs[4]; bool notify = false; + unsigned long flags; int rc; virtsnd_ctl_msg_ref(msg); @@ -142,27 +282,27 @@ response->code = cpu_to_le32(VIRTIO_SND_S_IO_ERR); psgs[nouts++] = &msg->sg_request; - if (out_sgs) - psgs[nouts++] = out_sgs; + if (msg->request_data_size) + psgs[nouts++] = &msg->sg_request_data; psgs[nouts + nins++] = &msg->sg_response; - if (in_sgs) - psgs[nouts + nins++] = in_sgs; - - scoped_guard(spinlock_irqsave, &queue->lock) { - if (snd->ctl_msgs_blocked) - rc = -ENODEV; - else - rc = virtqueue_add_sgs(queue->vqueue, psgs, nouts, nins, - msg, GFP_ATOMIC); - if (!rc) { - notify = virtqueue_kick_prepare(queue->vqueue); - - list_add_tail(&msg->list, &snd->ctl_msgs); - if (notify) - virtqueue_notify(queue->vqueue); - } - } + if (msg->response_data_size) + psgs[nouts + nins++] = &msg->sg_response_data; + + spin_lock_irqsave(&queue->lock, flags); + if (snd->ctl_msgs_blocked) + rc = -ENODEV; + else + rc = virtqueue_add_sgs(queue->vqueue, psgs, nouts, nins, msg, + GFP_ATOMIC); + if (!rc) { + notify = virtqueue_kick_prepare(queue->vqueue); + + list_add_tail(&msg->list, &snd->ctl_msgs); + if (notify) + virtqueue_notify(queue->vqueue); + } + spin_unlock_irqrestore(&queue->lock, flags); if (rc) { dev_err(&vdev->dev, "failed to send control message (0x%08x)\n", @@ -173,46 +313,36 @@ * called, it is necessary to decrement the reference count. */ virtsnd_ctl_msg_unref(msg); - - goto on_exit; - } - - if (nowait) - goto on_exit; - - rc = wait_for_completion_interruptible_timeout(&msg->notify, js); - if (rc <= 0) { + } else if (!nowait) { + rc = wait_for_completion_interruptible_timeout(&msg->notify, js); if (!rc) { dev_err(&vdev->dev, "control message (0x%08x) timeout\n", le32_to_cpu(request->code)); rc = -ETIMEDOUT; + } else if (rc > 0) { + if (READ_ONCE(msg->cancelled)) { + rc = -ENODEV; + } else { + switch (le32_to_cpu(response->code)) { + case VIRTIO_SND_S_OK: + rc = 0; + break; + case VIRTIO_SND_S_NOT_SUPP: + rc = -EOPNOTSUPP; + break; + case VIRTIO_SND_S_IO_ERR: + rc = -EIO; + break; + default: + rc = -EINVAL; + break; + } + } } - - goto on_exit; - } - - if (READ_ONCE(msg->cancelled)) { - rc = -ENODEV; - goto on_exit; - } - - switch (le32_to_cpu(response->code)) { - case VIRTIO_SND_S_OK: - rc = 0; - break; - case VIRTIO_SND_S_NOT_SUPP: - rc = -EOPNOTSUPP; - break; - case VIRTIO_SND_S_IO_ERR: - rc = -EIO; - break; - default: - rc = -EINVAL; - break; - } - -on_exit: + } + + /* Drop the reference consumed by this send attempt. */ virtsnd_ctl_msg_unref(msg); return rc; @@ -308,10 +438,23 @@ { struct virtio_snd_msg *msg; struct virtio_snd_query_info *query; - struct scatterlist sg; + size_t info_size; + int rc; + + if (count < 0) + return -EINVAL; + + if (size > UINT_MAX || + check_mul_overflow((size_t)count, size, &info_size) || + info_size > UINT_MAX) + return -EOVERFLOW; + + if (info_size && !info) + return -EINVAL; msg = virtsnd_ctl_msg_alloc(sizeof(*query), - sizeof(struct virtio_snd_hdr), GFP_KERNEL); + sizeof(struct virtio_snd_hdr), 0, info_size, + GFP_KERNEL); if (!msg) return -ENOMEM; @@ -321,9 +464,13 @@ query->count = cpu_to_le32(count); query->size = cpu_to_le32(size); - sg_init_one(&sg, info, count * size); - - return virtsnd_ctl_msg_send(snd, msg, NULL, &sg, false); + virtsnd_ctl_msg_ref(msg); + rc = virtsnd_ctl_msg_send(snd, msg, false); + if (!rc && info_size) + memcpy(info, virtsnd_ctl_msg_response_data(msg), info_size); + virtsnd_ctl_msg_unref(msg); + + return rc; } /** diff --git a/sound/virtio/virtio_ctl_msg.h b/sound/virtio/virtio_ctl_msg.h --- a/sound/virtio/virtio_ctl_msg.h +++ b/sound/virtio/virtio_ctl_msg.h @@ -21,20 +21,28 @@ void *virtsnd_ctl_msg_response(struct virtio_snd_msg *msg); struct virtio_snd_msg *virtsnd_ctl_msg_alloc(size_t request_size, - size_t response_size, gfp_t gfp); + size_t response_size, + size_t request_data_size, + size_t response_data_size, + gfp_t gfp); + +void *virtsnd_ctl_msg_request_data(struct virtio_snd_msg *msg); + +void *virtsnd_ctl_msg_response_data(struct virtio_snd_msg *msg); int virtsnd_ctl_msg_send(struct virtio_snd *snd, struct virtio_snd_msg *msg, - struct scatterlist *out_sgs, - struct scatterlist *in_sgs, bool nowait); + bool nowait); /** * virtsnd_ctl_msg_send_sync() - Simplified sending of synchronous message. * @snd: VirtIO sound device. * @msg: Control message. * - * After returning from this function, the message will be deleted. If message - * content is still needed, the caller must additionally to - * virtsnd_ctl_msg_ref/unref() it. + * This function consumes the caller's message reference on return. A message + * accepted by the control queue keeps its queue reference until completion or + * post-reset cleanup, including when this function returns on timeout or + * interruption. Callers that read the response after success must retain an + * additional reference through that access. * * The msg_timeout_ms module parameter defines the message completion timeout. * If the message is not completed within this time, the function will return an @@ -49,7 +57,7 @@ static inline int virtsnd_ctl_msg_send_sync(struct virtio_snd *snd, struct virtio_snd_msg *msg) { - return virtsnd_ctl_msg_send(snd, msg, NULL, NULL, false); + return virtsnd_ctl_msg_send(snd, msg, false); } /** @@ -63,7 +71,7 @@ static inline int virtsnd_ctl_msg_send_async(struct virtio_snd *snd, struct virtio_snd_msg *msg) { - return virtsnd_ctl_msg_send(snd, msg, NULL, NULL, true); + return virtsnd_ctl_msg_send(snd, msg, true); } void virtsnd_ctl_msg_cancel_all(struct virtio_snd *snd); diff --git a/sound/virtio/virtio_kctl.c b/sound/virtio/virtio_kctl.c --- a/sound/virtio/virtio_kctl.c +++ b/sound/virtio/virtio_kctl.c @@ -3,8 +3,10 @@ * virtio-snd: Virtio sound device * Copyright (C) 2022 OpenSynergy GmbH */ +#include +#include +#include #include -#include #include "virtio_card.h" @@ -157,14 +159,16 @@ struct virtio_snd_ctl_hdr *hdr; struct virtio_snd_ctl_value *kvalue; size_t request_size = sizeof(*hdr); - size_t response_size = sizeof(struct virtio_snd_hdr) + sizeof(*kvalue); + size_t response_size = sizeof(struct virtio_snd_hdr); unsigned int i; int rc; - msg = virtsnd_ctl_msg_alloc(request_size, response_size, GFP_KERNEL); + msg = virtsnd_ctl_msg_alloc(request_size, response_size, 0, + sizeof(*kvalue), GFP_KERNEL); if (!msg) return -ENOMEM; + /* Response lifetime through ALSA value copyout. */ virtsnd_ctl_msg_ref(msg); hdr = virtsnd_ctl_msg_request(msg); @@ -175,8 +179,7 @@ if (rc) goto on_failure; - kvalue = (void *)((u8 *)virtsnd_ctl_msg_response(msg) + - sizeof(struct virtio_snd_hdr)); + kvalue = virtsnd_ctl_msg_response_data(msg); switch (type) { case VIRTIO_SND_CTL_TYPE_BOOLEAN: @@ -233,7 +236,8 @@ size_t response_size = sizeof(struct virtio_snd_hdr); unsigned int i; - msg = virtsnd_ctl_msg_alloc(request_size, response_size, GFP_KERNEL); + msg = virtsnd_ctl_msg_alloc(request_size, response_size, 0, 0, + GFP_KERNEL); if (!msg) return -ENOMEM; @@ -288,22 +292,27 @@ struct virtio_snd *snd = snd_kcontrol_chip(kcontrol); struct virtio_snd_msg *msg; struct virtio_snd_ctl_hdr *hdr; - unsigned int *tlv; - struct scatterlist sg; + size_t request_data_size = 0; + size_t response_data_size = 0; int rc; + switch (op_flag) { + case SNDRV_CTL_TLV_OP_READ: + response_data_size = size; + break; + case SNDRV_CTL_TLV_OP_WRITE: + case SNDRV_CTL_TLV_OP_CMD: + request_data_size = size; + break; + default: + return -EINVAL; + } + msg = virtsnd_ctl_msg_alloc(sizeof(*hdr), sizeof(struct virtio_snd_hdr), + request_data_size, response_data_size, GFP_KERNEL); if (!msg) return -ENOMEM; - - tlv = kzalloc(size, GFP_KERNEL); - if (!tlv) { - rc = -ENOMEM; - goto on_msg_unref; - } - - sg_init_one(&sg, tlv, size); hdr = virtsnd_ctl_msg_request(msg); hdr->control_id = cpu_to_le32(kcontrol->private_value); @@ -312,13 +321,16 @@ case SNDRV_CTL_TLV_OP_READ: hdr->hdr.code = cpu_to_le32(VIRTIO_SND_R_CTL_TLV_READ); - rc = virtsnd_ctl_msg_send(snd, msg, NULL, &sg, false); - if (!rc) { - if (copy_to_user(utlv, tlv, size)) - rc = -EFAULT; - } - - break; + /* Response lifetime through user copyout. */ + virtsnd_ctl_msg_ref(msg); + rc = virtsnd_ctl_msg_send(snd, msg, false); + if (!rc && size && + copy_to_user(utlv, virtsnd_ctl_msg_response_data(msg), + size)) + rc = -EFAULT; + virtsnd_ctl_msg_unref(msg); + + return rc; case SNDRV_CTL_TLV_OP_WRITE: case SNDRV_CTL_TLV_OP_CMD: if (op_flag == SNDRV_CTL_TLV_OP_WRITE) @@ -327,28 +339,16 @@ hdr->hdr.code = cpu_to_le32(VIRTIO_SND_R_CTL_TLV_COMMAND); - if (copy_from_user(tlv, utlv, size)) { - rc = -EFAULT; - goto on_msg_unref; - } else { - rc = virtsnd_ctl_msg_send(snd, msg, &sg, NULL, false); + if (size && copy_from_user(virtsnd_ctl_msg_request_data(msg), utlv, + size)) { + virtsnd_ctl_msg_unref(msg); + return -EFAULT; } - break; - default: - rc = -EINVAL; - /* We never get here - we listed all values for op_flag */ - WARN_ON(1); - goto on_msg_unref; - } - kfree(tlv); - return rc; - -on_msg_unref: - virtsnd_ctl_msg_unref(msg); - kfree(tlv); - - return rc; + return virtsnd_ctl_msg_send(snd, msg, false); + } + + return -EINVAL; } /** @@ -369,27 +369,36 @@ struct virtio_snd_msg *msg; struct virtio_snd_ctl_hdr *hdr; unsigned int n = le32_to_cpu(kinfo->value.enumerated.items); - struct scatterlist sg; - - msg = virtsnd_ctl_msg_alloc(sizeof(*hdr), - sizeof(struct virtio_snd_hdr), GFP_KERNEL); - if (!msg) - return -ENOMEM; + size_t items_size; + int rc; + + if (check_mul_overflow((size_t)n, sizeof(*kctl->items), &items_size) || + items_size > UINT_MAX) + return -EOVERFLOW; kctl->items = devm_kcalloc(&vdev->dev, n, sizeof(*kctl->items), GFP_KERNEL); - if (!kctl->items) { - virtsnd_ctl_msg_unref(msg); - return -ENOMEM; - } - - sg_init_one(&sg, kctl->items, n * sizeof(*kctl->items)); + if (!kctl->items) + return -ENOMEM; + + msg = virtsnd_ctl_msg_alloc(sizeof(*hdr), + sizeof(struct virtio_snd_hdr), 0, items_size, + GFP_KERNEL); + if (!msg) + return -ENOMEM; hdr = virtsnd_ctl_msg_request(msg); hdr->hdr.code = cpu_to_le32(VIRTIO_SND_R_CTL_ENUM_ITEMS); hdr->control_id = cpu_to_le32(cid); - return virtsnd_ctl_msg_send(snd, msg, NULL, &sg, false); + /* Item-buffer lifetime through the control-list copyout. */ + virtsnd_ctl_msg_ref(msg); + rc = virtsnd_ctl_msg_send(snd, msg, false); + if (!rc && items_size) + memcpy(kctl->items, virtsnd_ctl_msg_response_data(msg), items_size); + virtsnd_ctl_msg_unref(msg); + + return rc; } /** 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 @@ -687,7 +687,7 @@ break; } - msg = virtsnd_ctl_msg_alloc(request_size, response_size, gfp); + msg = virtsnd_ctl_msg_alloc(request_size, response_size, 0, 0, gfp); if (msg) { struct virtio_snd_pcm_hdr *hdr = virtsnd_ctl_msg_request(msg);