From nobody Sat Feb 7 10:08:22 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 76BBD221F20 for ; Mon, 19 Jan 2026 14:33:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768833204; cv=none; b=DSU2vcMeIkqm+uUZXI1SVVxMM5so6idSDmi7/Hq6/6aA0NSueoN/k2+L78mZF+K8aekXycN6H+/yuiVWP14LRXn/hbiaN/854otEnseAz+Hd8QqOdVyv7J1/KmWSKhMq+goxOp/HOkknxJ2pTRdaugoDMRD6GZ+FrJMrXBqBxRg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768833204; c=relaxed/simple; bh=pdymbnmF1kP13IRiopT8k7r3dtoiRjxf5iEhRO9RvPE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=klpa9DsmzFtqc0zjkWpyQdIKgYRP+loRniGC+cLJsYH5Fi5twKsy3aWN5G4ZTNPUgE51TaXwcMEef/jclOEtV+bgO8dZFbRd8Wicxg/FiY9pPt6umGh7Zt/rNgZVCTyOTp2VRKoktKqOgQCQgzboUEGDWjKJb/PiD9k+LQ0ExzM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=QLNLoHnm; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="QLNLoHnm" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768833202; 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=wZOclRq+0Ufg6FQk0Ys944pSukFzpwFzpFG8HAyD5A8=; b=QLNLoHnm191sYksH//bbqEvweH6p8Wgs8F8duwA1hebO6dyeqT9Czzeiue/jNhRj6A7nIz 27dsWCfX7YaFR0u8r00xoxt0gKUisbBn73ORensD14QG6YhQcQA+yzTHSfx6HBBch3Bw9D rlrhfe5WzvK0PUZcw3JVL/ekquh1f9Y= Received: from mx-prod-mc-01.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-159-b65oAtAlMKCRwKhKHGXuTg-1; Mon, 19 Jan 2026 09:33:17 -0500 X-MC-Unique: b65oAtAlMKCRwKhKHGXuTg-1 X-Mimecast-MFC-AGG-ID: b65oAtAlMKCRwKhKHGXuTg_1768833196 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 02C101954237; Mon, 19 Jan 2026 14:33:16 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.44.33.172]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8F61F1800577; Mon, 19 Jan 2026 14:33:12 +0000 (UTC) From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: "Michael S . Tsirkin " Cc: virtualization@lists.linux.dev, Yongji Xie , Xuan Zhuo , Maxime Coquelin , Stefano Garzarella , jasowang@redhat.com, =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Laurent Vivier , Cindy Lu , linux-kernel@vger.kernel.org Subject: [PATCH v15 01/13] vhost: move vdpa group bound check to vhost_vdpa Date: Mon, 19 Jan 2026 15:32:54 +0100 Message-ID: <20260119143306.1818855-2-eperezma@redhat.com> In-Reply-To: <20260119143306.1818855-1-eperezma@redhat.com> References: <20260119143306.1818855-1-eperezma@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Remove duplication by consolidating these here. This reduces the posibility of a parent driver missing them. While we're at it, fix a bug in vdpa_sim where a valid ASID can be assigned to a group equal to ngroups, causing an out of bound write. Cc: stable@vger.kernel.org Fixes: bda324fd037a ("vdpasim: control virtqueue support") Acked-by: Jason Wang Signed-off-by: Eugenio P=C3=A9rez --- v12: Add Fixes tag (MST). --- drivers/vdpa/mlx5/net/mlx5_vnet.c | 3 --- drivers/vdpa/vdpa_sim/vdpa_sim.c | 6 ------ drivers/vhost/vdpa.c | 2 +- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5= _vnet.c index ddaa1366704b..44062e9d68f0 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -3640,9 +3640,6 @@ static int mlx5_set_group_asid(struct vdpa_device *vd= ev, u32 group, struct mlx5_vdpa_dev *mvdev =3D to_mvdev(vdev); int err =3D 0; =20 - if (group >=3D MLX5_VDPA_NUMVQ_GROUPS) - return -EINVAL; - mvdev->mres.group2asid[group] =3D asid; =20 mutex_lock(&mvdev->mres.lock); diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_= sim.c index c1c6431950e1..df9c7ddc5d78 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c @@ -606,12 +606,6 @@ static int vdpasim_set_group_asid(struct vdpa_device *= vdpa, unsigned int group, struct vhost_iotlb *iommu; int i; =20 - if (group > vdpasim->dev_attr.ngroups) - return -EINVAL; - - if (asid >=3D vdpasim->dev_attr.nas) - return -EINVAL; - iommu =3D &vdpasim->iommu[asid]; =20 mutex_lock(&vdpasim->mutex); diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c index 05a481e4c385..9d25b735b43d 100644 --- a/drivers/vhost/vdpa.c +++ b/drivers/vhost/vdpa.c @@ -680,7 +680,7 @@ static long vhost_vdpa_vring_ioctl(struct vhost_vdpa *v= , unsigned int cmd, case VHOST_VDPA_SET_GROUP_ASID: if (copy_from_user(&s, argp, sizeof(s))) return -EFAULT; - if (s.num >=3D vdpa->nas) + if (idx >=3D vdpa->ngroups || s.num >=3D vdpa->nas) return -EINVAL; if (!ops->set_group_asid) return -EOPNOTSUPP; --=20 2.52.0