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 6093DCCA47B for ; Tue, 14 Jun 2022 02:32:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355345AbiFNCch (ORCPT ); Mon, 13 Jun 2022 22:32:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355589AbiFNC3F (ORCPT ); Mon, 13 Jun 2022 22:29:05 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8935C42A33; Mon, 13 Jun 2022 19:11:41 -0700 (PDT) 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 ams.source.kernel.org (Postfix) with ESMTPS id 225FBB80D19; Tue, 14 Jun 2022 02:11:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2D010C341C5; Tue, 14 Jun 2022 02:11:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1655172689; bh=eS/oAiJlIecuifDuva/cks+TuXmdf7lAN0W+eoAq7xA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M3/jQCrPkETS8N7PpwzK9d7aniOgKEg8nTGcljcDhp76omxOjD8+KXympzzfBKdxU aoitbv42030ASpU0I361eZaCgOWvSd4BAewRIzKl8VHo7RKG5FY/C5RVMGkAEvY2q1 ZK13Mb+KNConI7TUa1UigsYPKoiNbYWLhsjCwOj/N02IGS6hqfBHYSpZHrEedi90da TxTv22t+h+AAVEULJVKwCM7v1YoaoxD2qFK5sLO1jn9BsWxQ2jwkEhoJexeND2vnLr CVuboYAyYlc9c+naGCf/KBhdapdyBuS7GOiE4sfttWvUsyL0VS20AXuz0VMTelbUyX mYsAz1cVD7tng== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alexey Kardashevskiy , Paolo Bonzini , Sasha Levin , kvm@vger.kernel.org Subject: [PATCH MANUALSEL 5.18 6/6] KVM: Don't null dereference ops->destroy Date: Mon, 13 Jun 2022 22:11:15 -0400 Message-Id: <20220614021116.1101331-6-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220614021116.1101331-1-sashal@kernel.org> References: <20220614021116.1101331-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: stable@vger.kernel.org From: Alexey Kardashevskiy [ Upstream commit e8bc2427018826e02add7b0ed0fc625a60390ae5 ] A KVM device cleanup happens in either of two callbacks: 1) destroy() which is called when the VM is being destroyed; 2) release() which is called when a device fd is closed. Most KVM devices use 1) but Book3s's interrupt controller KVM devices (XICS, XIVE, XIVE-native) use 2) as they need to close and reopen during the machine execution. The error handling in kvm_ioctl_create_device() assumes destroy() is always defined which leads to NULL dereference as discovered by Syzkaller. This adds a checks for destroy!=NULL and adds a missing release(). This is not changing kvm_destroy_devices() as devices with defined release() should have been removed from the KVM devices list by then. Suggested-by: Paolo Bonzini Signed-off-by: Alexey Kardashevskiy Signed-off-by: Paolo Bonzini Signed-off-by: Sasha Levin --- virt/kvm/kvm_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 5ab12214e18d..24cb37d19c63 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -4299,8 +4299,11 @@ static int kvm_ioctl_create_device(struct kvm *kvm, kvm_put_kvm_no_destroy(kvm); mutex_lock(&kvm->lock); list_del(&dev->vm_node); + if (ops->release) + ops->release(dev); mutex_unlock(&kvm->lock); - ops->destroy(dev); + if (ops->destroy) + ops->destroy(dev); return ret; } -- 2.35.1