From nobody Wed Oct 1 21:27:07 2025 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5AF4727703E for ; Sat, 27 Sep 2025 12:25:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758975941; cv=none; b=iLa5sUVVQnX60xn+bT6TsHjONuG/Fi9SWEb7LmroRj5nILMpuuKURGt2869DtrVvjOFnLSdm23INEWE4Wa0kjjhZqmn1JievNQGhnlFC85aF1PNj3ne1fVStsIDdvtlNS9ibxMulZLsDNdy82ns/S8y+82DHYAsTC3VKxHzAcAA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758975941; c=relaxed/simple; bh=Cz0upPHZk9fGBVcjG//ILHjl/qglp8+Tm6tLew6P7q4=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=E/52Q82GN5sNmhSOXl/gMBWFwijbkD9ewZzBFwllZMaaPJMzN8xPo6jt83vwTvJM5cbjvdX6F3NFAvXgC7Drn2kjKBan398amrBJrsuXSilgfUUewq71+ojnTN3KjE8lyckBvljCUDoQYEml4IpXBIE0Yu/qHCrIyV9kMNXha3M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=to8Drjo/; arc=none smtp.client-ip=209.85.128.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="to8Drjo/" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-46e30ef74b0so21687525e9.0 for ; Sat, 27 Sep 2025 05:25:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1758975938; x=1759580738; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=LVhumFC8qskWIHg2JamV1kuMQedk4HSzKMYaXz2FDxs=; b=to8Drjo/JhFxv+tld4alYbgBdCEEm7/fkjY7h9bW15GsawpgkvDMn5lj+kutvhqqxO dCer/i9CHp6V9Kmb59WuPjeMAn9ufcZeJ0cd57Bl1e7JsefhPyMx7266kprebbY+Bg0o f0258PZ6Qi3mVOviarG4UrEY0RvX+8i0Oi/4KlEhNiTbx/0UL3Nx7OBAdUl2eWOTu2p8 JdLG8L7GylbtAMxrzPTtLioHxDDnJcEdmYGoqwzoUspFvyEiZKQ1tyjDg9bTJDX6Empf yLm+d/RC/L7JgNON7B93IRCL+k6EmlUZgmNwgPy+gvOD0XJ0A6uKbju5HdqtdlbugRVR 55lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758975938; x=1759580738; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LVhumFC8qskWIHg2JamV1kuMQedk4HSzKMYaXz2FDxs=; b=J0RpKqgpi85OItxu5N6Lkiwwr/gkPRgmLmB+azUFhOYmpbX8qe13Es5BJQkwUEl8z9 Q+mmKN8+32r/PM6O4iaRKflBhlcwZ4cfkRjZNPcwJYQsDgkRBQsWhgAVZtp8XN8DvHmu n2ok3ubI19kaK2yZJTc0LSItA7HbB6s2dQzyO6c/35XjpN5EbWVIkY3vivOvyoqxrjQd W2+yPJeBGf+077cQ5D2nPx2JqM3HLBsEUe8+T80ITMZCjTThAworgigCXilOLHF1sE1j 1oaZPniT3TqMkcvTLPxEcgl9NXoinUfhG4DSy59w/6R9U1U2T36aE9lvsXyD/H4+EDqI 0IiA== X-Forwarded-Encrypted: i=1; AJvYcCWOiTOMqTxZKdmF8uSutwTf0M+aEg4z1uJVP8GT05fzW8t3Q0jn8OB/yQ5G2uwp6BlTJAVp8Wx3A5hItRU=@vger.kernel.org X-Gm-Message-State: AOJu0YwnYQFzFqJokNcGNxzc3vBSVTBO6kFcEAsGXfTGM/Iu/Bd/r8Pr BsK1ya3Bi53NJHGmIMmuvvXYQoCCAJC+Cukdd8ZiwuOp+mpSmHBjsEuz0kMGaLiHCBI= X-Gm-Gg: ASbGncu0XPgDdImlEuZNSsPDb6xXE30bAmO8kgFC+EVFGL0cqSVCn4Y5fxcw7QVLtm3 IDR3T0MR62eCPzToR9Ont69ntdSnLdB5l5JatXL75+wmidz5ghExkMSUDU8j3MIVt/Ge7ZdZav1 0qgi3oUUiaR6zWBqPtd7gzBVYgR6B45CMgtEnCdbdmWo9c+AicNKydVRY5ESVKCdWYph6XOoRo2 i557Gxm7uTkr7XRMZBCIDO1PvsLdV5lemmA6Uphc42vkZe/Zi5u3+74V7N1sPOkw6WochfEuD4p /WRikgLrXRTY5ybRJZGUEN0izGJsCsEXDhmGERTDmxytYtCvQjwkza/wjHOnGR2aqSFZdny7IK3 MgUMXEpH8WGzCnepgXN6bhAeJc3KHVYJ4aSHD+Zo= X-Google-Smtp-Source: AGHT+IH/fs4tI3yUr2ZaBw2ReWMi5Di+AwUxDHPsiDLmiEELtqX2JAh0B0XFiB/cSRsTRtqy4tVX2A== X-Received: by 2002:a05:600c:4694:b0:45d:e5ff:e38c with SMTP id 5b1f17b1804b1-46e32a1393cmr95976155e9.32.1758975937784; Sat, 27 Sep 2025 05:25:37 -0700 (PDT) Received: from localhost ([196.207.164.177]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-40fb72fb017sm10713558f8f.3.2025.09.27.05.25.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Sep 2025 05:25:37 -0700 (PDT) Date: Sat, 27 Sep 2025 15:25:34 +0300 From: Dan Carpenter To: Eugenio =?iso-8859-1?Q?P=E9rez?= Cc: "Michael S. Tsirkin" , Jason Wang , kvm@vger.kernel.org, virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH] vhost-vdpa: Set s.num in GET_VRING_GROUP Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email haha only kidding Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The group is supposed to be copied to the user, but it wasn't assigned until after the copy_to_user(). Move the "s.num =3D group;" earlier. Fixes: ffc3634b6696 ("vduse: add vq group support") Signed-off-by: Dan Carpenter --- This goes through the kvm tree I think. drivers/vhost/vdpa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c index 6305382eacbb..25ab4d06e559 100644 --- a/drivers/vhost/vdpa.c +++ b/drivers/vhost/vdpa.c @@ -667,9 +667,9 @@ static long vhost_vdpa_vring_ioctl(struct vhost_vdpa *v= , unsigned int cmd, group =3D ops->get_vq_group(vdpa, idx); if (group >=3D vdpa->ngroups || group > U32_MAX || group < 0) return -EIO; - else if (copy_to_user(argp, &s, sizeof(s))) - return -EFAULT; s.num =3D group; + if (copy_to_user(argp, &s, sizeof(s))) + return -EFAULT; return 0; } case VHOST_VDPA_GET_VRING_DESC_GROUP: --=20 2.51.0