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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0F60C433EF for ; Wed, 6 Oct 2021 11:23:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8BB296109F for ; Wed, 6 Oct 2021 11:23:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238451AbhJFLZi (ORCPT ); Wed, 6 Oct 2021 07:25:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:60380 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238598AbhJFLZZ (ORCPT ); Wed, 6 Oct 2021 07:25:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633519413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nkO/A9ZUQ8MQ4JoxbSB4fLiKZCpws9VtkHaFKddArB8=; b=L+TApTFO2raTf+nMHJ0XawvQKKPKhbiD5uMIsdLCIUAvdq5I0cCBEpdZ9n6Qay9AYlX0In 4U8cZ+mxRRxmXbieh9ucSPdrWABut2yS/zywJdwQrb54WJIbW3XkwlRba6QG8ZCWuJHs8e aL3xGnpcHGyGYKOVKPuvw67yT2LpwLQ= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-98-IikMbyhiNcKMpK25moYjyg-1; Wed, 06 Oct 2021 07:23:32 -0400 X-MC-Unique: IikMbyhiNcKMpK25moYjyg-1 Received: by mail-ed1-f70.google.com with SMTP id z13-20020aa7c64d000000b003db3a3c396dso1219463edr.9 for ; Wed, 06 Oct 2021 04:23:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=nkO/A9ZUQ8MQ4JoxbSB4fLiKZCpws9VtkHaFKddArB8=; b=EXLrAorYMVRdf/5nom6dnw6G7OV0xE35Sjf+F70KcGblTbRGETaRNlfgdbJhzaMQVP jAkLoxJQGIaxPV2Bbrdu2jHdFfznXzgG7ti1+6dUky+G6tN2VWyt5BtseIapq8tUNP3b oKcB+xvlWdfqJisZmVxcISgUVrS1pk6G14CYgik/Hfqd0X9q0p1g/H+/F7cdf5iO/pag Idfz83C0j4xAxvjsWrjA+cUELOPWzaamHAkHuhB4WRGmp8HJVPqnuuapwv5SLDgnMVqX Lrvpz7YCqPLoC6IlM7q2mtQ4SxGoStEhjzMzbaTleyakeOKUMGNomFyJ/idIHXagrQGP lHyg== X-Gm-Message-State: AOAM530xAKsKzeZM5UrdSAM7R70enTjfaRmCU1BNFLx9Q2qRtNKjkZYk o4LC2GzOfbo0TgPSGVg1CxuiyWd/kGzDZZutJB+ISqlO94IGWaApagyagDMmI9pDYB8q0tpAFP4 Ks45nrQWKRWLnGavehtP34raR X-Received: by 2002:a17:906:1945:: with SMTP id b5mr31716369eje.347.1633519410751; Wed, 06 Oct 2021 04:23:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy7tHmOaUmNn1CVb3pmZD4PKvuD0rO5Yb3oEqPmXefppLA2OvReFmzRcEzevrfTf5l68OwiQg== X-Received: by 2002:a17:906:1945:: with SMTP id b5mr31716349eje.347.1633519410534; Wed, 06 Oct 2021 04:23:30 -0700 (PDT) Received: from ?IPV6:2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e? ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id s21sm7037429eji.3.2021.10.06.04.23.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 06 Oct 2021 04:23:30 -0700 (PDT) Message-ID: <4b7e8fde-83fd-0431-cadd-71f484508096@redhat.com> Date: Wed, 6 Oct 2021 13:23:28 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.1.0 Subject: Re: [PATCH MANUALSEL 5.4 1/4] KVM: x86: Handle SRCU initialization failure during page track init Content-Language: en-US To: Sasha Levin , linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Haimin Zhang , TCS Robot , tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, kvm@vger.kernel.org References: <20211006111250.264294-1-sashal@kernel.org> From: Paolo Bonzini In-Reply-To: <20211006111250.264294-1-sashal@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 06/10/21 13:12, Sasha Levin wrote: > From: Haimin Zhang > > [ Upstream commit eb7511bf9182292ef1df1082d23039e856d1ddfb ] > > Check the return of init_srcu_struct(), which can fail due to OOM, when > initializing the page track mechanism. Lack of checking leads to a NULL > pointer deref found by a modified syzkaller. > > Reported-by: TCS Robot > Signed-off-by: Haimin Zhang > Message-Id: <1630636626-12262-1-git-send-email-tcs_kernel@tencent.com> > [Move the call towards the beginning of kvm_arch_init_vm. - Paolo] > Signed-off-by: Paolo Bonzini > Signed-off-by: Sasha Levin > --- > arch/x86/include/asm/kvm_page_track.h | 2 +- > arch/x86/kvm/page_track.c | 4 ++-- > arch/x86/kvm/x86.c | 7 ++++++- > 3 files changed, 9 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/include/asm/kvm_page_track.h b/arch/x86/include/asm/kvm_page_track.h > index 172f9749dbb2..5986bd4aacd6 100644 > --- a/arch/x86/include/asm/kvm_page_track.h > +++ b/arch/x86/include/asm/kvm_page_track.h > @@ -46,7 +46,7 @@ struct kvm_page_track_notifier_node { > struct kvm_page_track_notifier_node *node); > }; > > -void kvm_page_track_init(struct kvm *kvm); > +int kvm_page_track_init(struct kvm *kvm); > void kvm_page_track_cleanup(struct kvm *kvm); > > void kvm_page_track_free_memslot(struct kvm_memory_slot *free, > diff --git a/arch/x86/kvm/page_track.c b/arch/x86/kvm/page_track.c > index 3521e2d176f2..ef89a3ede425 100644 > --- a/arch/x86/kvm/page_track.c > +++ b/arch/x86/kvm/page_track.c > @@ -167,13 +167,13 @@ void kvm_page_track_cleanup(struct kvm *kvm) > cleanup_srcu_struct(&head->track_srcu); > } > > -void kvm_page_track_init(struct kvm *kvm) > +int kvm_page_track_init(struct kvm *kvm) > { > struct kvm_page_track_notifier_head *head; > > head = &kvm->arch.track_notifier_head; > - init_srcu_struct(&head->track_srcu); > INIT_HLIST_HEAD(&head->track_notifier_list); > + return init_srcu_struct(&head->track_srcu); > } > > /* > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index f1a0eebdcf64..69e286edb2c9 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -9585,9 +9585,15 @@ void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) > > int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) > { > + int ret; > + > if (type) > return -EINVAL; > > + ret = kvm_page_track_init(kvm); > + if (ret) > + return ret; > + > INIT_HLIST_HEAD(&kvm->arch.mask_notifier_list); > INIT_LIST_HEAD(&kvm->arch.active_mmu_pages); > INIT_LIST_HEAD(&kvm->arch.zapped_obsolete_pages); > @@ -9614,7 +9620,6 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) > INIT_DELAYED_WORK(&kvm->arch.kvmclock_sync_work, kvmclock_sync_fn); > > kvm_hv_init_vm(kvm); > - kvm_page_track_init(kvm); > kvm_mmu_init_vm(kvm); > > return kvm_x86_ops->vm_init(kvm); > Acked-by: Paolo Bonzini