From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8FB60C4332F for ; Sun, 23 Jan 2022 00:12:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235442AbiAWAMt (ORCPT ); Sat, 22 Jan 2022 19:12:49 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]:36462 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235219AbiAWAMJ (ORCPT ); Sat, 22 Jan 2022 19:12:09 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id F3CD560F9D; Sun, 23 Jan 2022 00:12:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4F911C340E5; Sun, 23 Jan 2022 00:12:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642896728; bh=1SobhZzR22+/GG1/sdRMJWQ0gBIBcx7Dh8/mbwYVxas=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TrIwIb8X9KNjodYkEEOkjTCAeEAaktzYFE0Fw2ci8bth6jbvznJeotDoYYajVXRlr pglC4dUEoOGUXk2l2y08kjHtYqV2GnESphyZlkeud6GA5atJoccz1GlJeVAujzZHRi cSUXDTZb5L1vARyy/3rBbEVxN9e/4JGd9p2L/4w+VIM5d44CwjDCMDbW/9J0xu1W3L e9RBawU0xYi7f+K0LgkD735yF34l2+Dg6MboZGPGe3Z1BmejPbcFn7Vcth8ilhZORy ElVA+NZg0jDmjEfrVW5mQjEXxbOCIRdYtg5F9Hvo7V9imLf9A35hCGh+ZUJ1lBe01y PC1k2iklQRDpg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Laura Abbott , Luo Likang , "Michael S . Tsirkin" , Sasha Levin , jasowang@redhat.com, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.16 16/19] vdpa: clean up get_config_size ret value handling Date: Sat, 22 Jan 2022 19:11:09 -0500 Message-Id: <20220123001113.2460140-16-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220123001113.2460140-1-sashal@kernel.org> References: <20220123001113.2460140-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Laura Abbott [ Upstream commit 870aaff92e959e29d40f9cfdb5ed06ba2fc2dae0 ] The return type of get_config_size is size_t so it makes sense to change the type of the variable holding its result. That said, this already got taken care of (differently, and arguably not as well) by commit 3ed21c1451a1 ("vdpa: check that offsets are within bounds"). The added 'c->off > size' test in that commit will be done as an unsigned comparison on 32-bit (safe due to not being signed). On a 64-bit platform, it will be done as a signed comparison, but in that case the comparison will be done in 64-bit, and 'c->off' being an u32 it will be valid thanks to the extended range (ie both values will be positive in 64 bits). So this was a real bug, but it was already addressed and marked for stable. Signed-off-by: Laura Abbott Reported-by: Luo Likang Signed-off-by: Michael S. Tsirkin Signed-off-by: Sasha Levin --- drivers/vhost/vdpa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c index e3c4f059b21a2..c31737a1da6aa 100644 --- a/drivers/vhost/vdpa.c +++ b/drivers/vhost/vdpa.c @@ -195,7 +195,7 @@ static int vhost_vdpa_config_validate(struct vhost_vdpa *v, struct vhost_vdpa_config *c) { struct vdpa_device *vdpa = v->vdpa; - long size = vdpa->config->get_config_size(vdpa); + size_t size = vdpa->config->get_config_size(vdpa); if (c->len == 0 || c->off > size) return -EINVAL; -- 2.34.1