Received: by 2002:a05:6358:bb9e:b0:b9:5105:a5b4 with SMTP id df30csp2796255rwb; Mon, 5 Sep 2022 01:22:14 -0700 (PDT) X-Google-Smtp-Source: AA6agR7S+kMRC7UJKV/Inc4l1MoRcEHhxdhVuU56+BKxfenW295H7M2qjNli4npndLVvTY+oxBMK X-Received: by 2002:a05:6402:5384:b0:431:6d84:b451 with SMTP id ew4-20020a056402538400b004316d84b451mr42140954edb.46.1662366134362; Mon, 05 Sep 2022 01:22:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662366134; cv=none; d=google.com; s=arc-20160816; b=lXpA12lT3xjGQARBMfFTR1Wx0PpfuFxb5VWEKtIhvkvPSS+UY63lIWc/yvgatQiWE7 5johS7nn51jCZ3Xw/O80/mCEtLYx2U4rkQD3R+Bisg+xgT2S5MeIWJpC/AknC+yA4JlL c6sbWjNXHOqJx6xkNjiVf8FC9uj72XVTTFVA1gdZYSXv7Et1NAkFyyQ8aflCHCf5Ah0t O0Jk2qTfxN7Tbkir8GeqRNqiuU8pqa+Op5o0P9n2C5dDIcQbG930P9TgBG5Zr49zgCJG 9pIiU69w+xoixK0QMB1a7h4SHjRF0lhX9iN0h+o/rkDcKJj2eN0u4Ye8Q+2mrETR9FO5 QAhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=GxDNea9yirIqg+Jh4QlLl11Kjw4G+wMy2sp9CItjrk8=; b=Zc5Fy5o/h8LFUfogKF6mdN6H2dO2/dn/9DW96ORx1VuV+C236M71J7zgcdXpwuC5z8 mAkr1Q1mXSUWATBWHGPxL6JhOkySwjdR2nLbuURTtQML1ksd5vRT3yUdCXDE67pNYZeZ UR634Eu/IUcnNirwB1vOOgYojDACluOZlfJ5H/FXTd3ZuIfNzAwzvqEihc2fZjUevppS /ErwREF3Cvp55lRQCViUTBa2DApJBQZ8aupsCkbMYCGX842KyPReM0i6BJ94x0HB3r/i DNvLC9XwaefD5vsvd1GtYx5hsdy2HocvVhfwhb7Xd0HgqUrN5lDJWsgvqx10/IAOrIej DswA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="WDuXJgJ/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w1-20020a05640234c100b00447ceeb7a6csi6181234edc.601.2022.09.05.01.21.49; Mon, 05 Sep 2022 01:22:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="WDuXJgJ/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237150AbiIEIEX (ORCPT + 99 others); Mon, 5 Sep 2022 04:04:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236971AbiIEIET (ORCPT ); Mon, 5 Sep 2022 04:04:19 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3694B47BA6 for ; Mon, 5 Sep 2022 01:04:18 -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 dfw.source.kernel.org (Postfix) with ESMTPS id CA3476113E for ; Mon, 5 Sep 2022 08:04:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A350AC433D6; Mon, 5 Sep 2022 08:04:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1662365057; bh=ZviM3XQ2DcMV3uk7a7yxPjcP+JOLn+NSZCdFHlInwuI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=WDuXJgJ/tP3RSsm/7imHBc/Vd0Qlz/CuALQErsD1g1FZNdNo7l1LNgbYOdnREqrZs Gl6QXF+9ALdBybSasdsVT+9FKbHk2JjlOdT4kdYmAp7koRZbH7r6MuC1+fnz0rV6Yn bcSzBHv8ARR0pQ1uMZe5l0j/3FI18MI3TYPv+N1A= Date: Mon, 5 Sep 2022 10:04:14 +0200 From: Greg KH To: Zheng Hacker Cc: xmzyshypnc <1002992920@qq.com>, airlied@linux.ie, daniel@ffwll.ch, zhenyuw@linux.intel.com, zhi.a.wang@intel.com, alex000young@gmail.com, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, tvrtko.ursulin@linux.intel.com, intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, security@kernel.org Subject: Re: [PATCH] drm/i915/gvt: fix double-free bug in split_2MB_gtt_entry. Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Sep 05, 2022 at 03:46:09PM +0800, Zheng Hacker wrote: > I rewrote the letter. Hope it works. > > There is a double-free security bug in split_2MB_gtt_entry. > > Here is a calling chain : > ppgtt_populate_spt->ppgtt_populate_shadow_entry->split_2MB_gtt_entry. > If intel_gvt_dma_map_guest_page failed, it will call > ppgtt_invalidate_spt, which will finally call ppgtt_free_spt and > kfree(spt). But the caller does not notice that, and it will call > ppgtt_free_spt again in error path. > > Fix this by returning the result of ppgtt_invalidate_spt to split_2MB_gtt_entry. > > Signed-off-by: Zheng Wang > > --- > drivers/gpu/drm/i915/gvt/gtt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c > index ce0eb03709c3..9f14fded8c0c 100644 > --- a/drivers/gpu/drm/i915/gvt/gtt.c > +++ b/drivers/gpu/drm/i915/gvt/gtt.c > @@ -1215,7 +1215,7 @@ static int split_2MB_gtt_entry(struct intel_vgpu *vgpu, > ret = intel_gvt_dma_map_guest_page(vgpu, start_gfn + sub_index, > PAGE_SIZE, &dma_addr); > if (ret) { > - ppgtt_invalidate_spt(spt); > + ret = ppgtt_invalidate_spt(spt); > return ret; But now you just lost the original error, shouldn't this succeed even if intel_gvt_dma_map_guest_page() failed? And how are you causing intel_gvt_dma_map_guest_page() to fail in a real system? thanks, greg k-h