From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752247AbcKRH6w (ORCPT ); Fri, 18 Nov 2016 02:58:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42792 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752044AbcKRH6s (ORCPT ); Fri, 18 Nov 2016 02:58:48 -0500 From: Jason Wang To: mst@redhat.com, jasowang@redhat.com Cc: kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] vhost: forbid IOTLB invalidation when not enabled Date: Fri, 18 Nov 2016 15:58:40 +0800 Message-Id: <1479455920-3285-2-git-send-email-jasowang@redhat.com> In-Reply-To: <1479455920-3285-1-git-send-email-jasowang@redhat.com> References: <1479455920-3285-1-git-send-email-jasowang@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 18 Nov 2016 07:58:48 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When IOTLB is not enabled, we should forbid IOTLB invalidation to avoid a NULL pointer dereference. Signed-off-by: Jason Wang --- drivers/vhost/vhost.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index c6f2d89..7d338d5 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -959,6 +959,10 @@ int vhost_process_iotlb_msg(struct vhost_dev *dev, vhost_iotlb_notify_vq(dev, msg); break; case VHOST_IOTLB_INVALIDATE: + if (!dev->iotlb) { + ret = -EFAULT; + break; + } vhost_del_umem_range(dev->iotlb, msg->iova, msg->iova + msg->size - 1); break; -- 2.7.4