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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E35FC433E7 for ; Mon, 12 Oct 2020 13:56:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4E1062076E for ; Mon, 12 Oct 2020 13:56:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602511002; bh=Fa6FnFa3HrelSlnB3LcAJ4KyMe/vRiHDm00EPpOrUlU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=F79cbVTeE/H4KikBZ4ojWcWoOibO1MSkzOT3xyLBh0StpoAvxQTtr3iiJOGWdxC/l ITOsanp8DevpQiecIGzAMUPwu9Mu0XpCxTqjZ8WFapsssLxXxgcXsrUngQlJ4eN/F7 XUoWsu83HJt8MQmAJBzUvHOqdYgdqsDTKItOsYFs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390550AbgJLN4l (ORCPT ); Mon, 12 Oct 2020 09:56:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:48428 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389496AbgJLNo3 (ORCPT ); Mon, 12 Oct 2020 09:44:29 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 60A4B22244; Mon, 12 Oct 2020 13:43:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602510238; bh=Fa6FnFa3HrelSlnB3LcAJ4KyMe/vRiHDm00EPpOrUlU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wnmfd0lC0uRTFagtYC1HB9Ba9bYnrWQFoXd99CkQ4JKdxLpLmWLHuD0MeZ02U0zB3 C418rDB7jUNBxdlj5QuKIVIMOVhoUwFqcIcux7foEkDApYuWyWuhpMW7a9UGWy8mEh IYxLulPVVYXr5bdTU08WhRFI66ZZNrRcue0lDxk8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Greg Kurz , "Michael S. Tsirkin" Subject: [PATCH 5.8 014/124] vhost: Use vhost_get_used_size() in vhost_vring_set_addr() Date: Mon, 12 Oct 2020 15:30:18 +0200 Message-Id: <20201012133147.543928578@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201012133146.834528783@linuxfoundation.org> References: <20201012133146.834528783@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kurz commit 71878fa46c7e3b40fa7b3f1b6e4ba3f92f1ac359 upstream. The open-coded computation of the used size doesn't take the event into account when the VIRTIO_RING_F_EVENT_IDX feature is present. Fix that by using vhost_get_used_size(). Fixes: 8ea8cf89e19a ("vhost: support event index") Cc: stable@vger.kernel.org Signed-off-by: Greg Kurz Link: https://lore.kernel.org/r/160171932300.284610.11846106312938909461.stgit@bahia.lan Signed-off-by: Michael S. Tsirkin Signed-off-by: Greg Kroah-Hartman --- drivers/vhost/vhost.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -1512,8 +1512,7 @@ static long vhost_vring_set_addr(struct /* Also validate log access for used ring if enabled. */ if ((a.flags & (0x1 << VHOST_VRING_F_LOG)) && !log_access_ok(vq->log_base, a.log_guest_addr, - sizeof *vq->used + - vq->num * sizeof *vq->used->ring)) + vhost_get_used_size(vq, vq->num))) return -EINVAL; }