From nobody Fri Jul 4 13:28:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bYZGV4BB5z6156r; Fri, 04 Jul 2025 13:28:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bYZGT47XPz3M4N; Fri, 04 Jul 2025 13:28:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751635729; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wKfbflxrYoh5+zX1cgKXEeRnwqzYVOMqS+yBrYl9ee0=; b=qTBvg7u/aucmsWraVWwpV5Yb46bKKD8gJQu96ujDwte6WcN8Cy6F40grW55ckz8V0KInla GJcciUHivTKIdZ8QwH/R0X75a/9CzY4MsC+OuV64rYcD7BBSScwFCY70AanOSaB8FRBV03 uBxdzmhNgJG5atHFdFkVtH/SdmEe/akUnJsEm42AsvL15xC9n4nL93K+HygZTaoujUtzOk +EtYs9W+6zVUJTYghnLrwt3EXtwJhEkwPB4dUV49vI3aQC/2vu0xahnh4EQx/w5IZePc2T a+slQbng6SPztNQhwEV12aonLSQyRldrRas5gv/LrNY3dHNdq6rN5/EKvDNIzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751635729; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wKfbflxrYoh5+zX1cgKXEeRnwqzYVOMqS+yBrYl9ee0=; b=qCAf0hZ5X9iM+59GXImbkrjxCaNAVReCyWfENs3IufHXpXGRVug+xbjcELEEgHl4lu60gk o2Gylbe5/mHNW6+y2KdlQhZ0k14gUPcEFbgYhe9EuVsiaVtt4/b7LNypayfubo5Xz7arRZ EYrYMSczl2JxGnI2+5p1eL17spQ9XV4KWjkAfU2Iio+Hl0M7iOKV6QSwPxxdYYhHKUSyO6 d4FFJemR37XiIFu1bSGGIgalMXELY5OY0n6RPjj0bjrVrkVzyAyui6pk6fLJp916ELd4o8 Vrb0sxNoA3gHMUn0piZ/vq7GRj1lPMmt+SHq3Gg8f/lWe/+0UjiRHO5nsydLRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751635729; a=rsa-sha256; cv=none; b=p+/O9ZNbbDcLHxUuPcxmGZB7TwZif/LHXC/+HejHK/l5ASvAeZ/xR9hYbJL/Do0ztFkra2 rrfM5vHM8PwMEENnKJTdpaF6iTUqTkkdpTeKvS1SPYT0AcOHW+eZUOjoUCXGQ6LIhkcIro Y2cPPFucuy/rhgZwR4nuHVX5gNI159VjK3/rir8vhafTI9EO5FKOOhN06RCK6vQwi/b8/m +mNzQv5vLPquxL9gITiY1vwYTc9nnZnAmUolvqXKP4pLwGzqGnQaQK/sMjpbfXT4wHYJ6/ ryt/VSRxEtqSrc0k5H7hHOST3yhZK/nJnE4UYnOVqq54UyarXr0pqojVvVaqdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bYZGT3NHDzs11; Fri, 04 Jul 2025 13:28:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 564DSnHU005952; Fri, 4 Jul 2025 13:28:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 564DSn5U005949; Fri, 4 Jul 2025 13:28:49 GMT (envelope-from git) Date: Fri, 4 Jul 2025 13:28:49 GMT Message-Id: <202507041328.564DSn5U005949@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Popov Subject: git: f5cc62e54a7f - stable/14 - virtio_p9fs: fix panic on qemu/kvm List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f5cc62e54a7f8ae9b8bb1484e0ebb22352c95d36 Auto-Submitted: auto-generated The branch stable/14 has been updated by arrowd: URL: https://cgit.FreeBSD.org/src/commit/?id=f5cc62e54a7f8ae9b8bb1484e0ebb22352c95d36 commit f5cc62e54a7f8ae9b8bb1484e0ebb22352c95d36 Author: Danilo Egea Gondolfo AuthorDate: 2024-07-06 16:51:51 +0000 Commit: Gleb Popov CommitDate: 2025-07-04 13:28:06 +0000 virtio_p9fs: fix panic on qemu/kvm When the module is loaded on a system running on qemu/kvm the "modern" virtio infrastructure is used and virtio_read_device_config() will end up calling vtpci_modern_read_dev_config(). This function cannot read values of arbitrary sizes and will panic if the p9fs mount tag size is not supported by it. Use virtio_read_device_config_array() instead. It was tested on both bhyve and qemu/kvm. PR: 280098 Co-authored-by: Mark Peek Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1320 (cherry picked from commit 814bf1fddd27aea69740f9e7426302354285cad4) --- sys/dev/virtio/p9fs/virtio_p9fs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/virtio/p9fs/virtio_p9fs.c b/sys/dev/virtio/p9fs/virtio_p9fs.c index e87659da2732..f7bc3f00fe6a 100644 --- a/sys/dev/virtio/p9fs/virtio_p9fs.c +++ b/sys/dev/virtio/p9fs/virtio_p9fs.c @@ -352,9 +352,9 @@ vt9p_attach(device_t dev) mount_tag = malloc(mount_tag_len + 1, M_P9FS_MNTTAG, M_WAITOK | M_ZERO); - virtio_read_device_config(dev, + virtio_read_device_config_array(dev, offsetof(struct virtio_9pnet_config, mount_tag), - mount_tag, mount_tag_len); + mount_tag, 1, mount_tag_len); device_printf(dev, "Mount tag: %s\n", mount_tag);