Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp3585051rwb; Tue, 16 Aug 2022 05:47:07 -0700 (PDT) X-Google-Smtp-Source: AA6agR61OvTYXvim6MKGKIl0V01hEPSUsli3eW5/7a/tzkiYdUxgFv3VMOZiS3KiQpAmtE7imj30 X-Received: by 2002:a05:6402:3689:b0:43e:43d6:6039 with SMTP id ej9-20020a056402368900b0043e43d66039mr18911643edb.341.1660654027087; Tue, 16 Aug 2022 05:47:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660654027; cv=none; d=google.com; s=arc-20160816; b=WJsQnPMuna4VEQPzG/MKs4exUAyjmptCQLykEq8kCK7NFzpMP38uo4B7VqpPv+UFjL E1aD7b/0TrYpp+rVkVYC7WTL4NLwT5QAufkdoyBAQt6GNMt3OnFSndPXwrIwoAu2nrOh 2FPjHCXp/LD0jJvpu0OmgTEYEx/BPzVqihfbVTt00DncjN9aaK5I8+cFIHZGYrKrukkM P6OZY0erQVmCrOj6yttA8iztscuaOfxSiLzKr7saoDO90FPgHtdd8yX+ZEqQRvAYFxXJ qfhRqMTEwKkmQ0o4Q4rSVO3hxh8WNsWr4IqP3dreoZt3JbGVhMTUx7KxB/lDXXbbBnAJ 9rlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:dkim-signature:from; bh=JLCOqrmDxlScPWlMM0m9RZxSSqsKrmtABPqJmneo9vE=; b=ifnz7QkAmb1zLkRvI//mMmAm+t7kfqXvfdLeD+20pV880CZAuRscJzYXeSONEzojsA VUx5+HDHaY+v1M4smenWcDHQeoTMTY5/HD49VbrnB7DYkgfSUUpde0XJwqMuGL5ssJpF hIPT+A3hF6Zw/QqXbqFJKhG+rjEpUGpRwnXXw4KzNDayvdGouZq+1J1za903cpntnOcm ns2PqaSMn8a3b3yOZwdHqYLzb6qJuqcePbkOAVYt8xVhtdI4KTAnipMHKhlPuEE6u1vc K6jj/YzLiQVCFWl1vq9oOOfzIregvHTsiLtJ9KeTSmWu72b2aGyXIod/PrhtrLhUYNfv L1EA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@swemel.ru header.s=mail header.b=lPvfMm6c; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=swemel.ru Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o11-20020a170906974b00b00730a1f55ac8si10419158ejy.821.2022.08.16.05.46.40; Tue, 16 Aug 2022 05:47:07 -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=@swemel.ru header.s=mail header.b=lPvfMm6c; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=swemel.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234698AbiHPMjM (ORCPT + 99 others); Tue, 16 Aug 2022 08:39:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234664AbiHPMjD (ORCPT ); Tue, 16 Aug 2022 08:39:03 -0400 Received: from mx.swemel.ru (mx.swemel.ru [95.143.211.150]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 60AE698D02 for ; Tue, 16 Aug 2022 05:39:00 -0700 (PDT) From: Denis Arefev DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=swemel.ru; s=mail; t=1660653538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=JLCOqrmDxlScPWlMM0m9RZxSSqsKrmtABPqJmneo9vE=; b=lPvfMm6cXnmUBjJ+mYGDCPWs8YhvsFE1jDJeZQszcdhtyBjJkdfWhb2x/VmHT0nQ4nF9Kl g7/0lqEmD2bJmvP5gcTXIp8L2cnjw2c4HYs3MQbo4hgMDv1dRmnOHjilgsZJ0zI4F9XxKO lAzoq3CSGXd7EA6mS2cU+kimz1gfdXk= To: Jani Nikula Cc: Joonas Lahtinen , Rodrigo Vivi , David Airlie , Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, ldv-project@linuxtesting.org Subject: [PATCH] i915-pmu: Add extra check engine Date: Tue, 16 Aug 2022 15:38:57 +0300 Message-Id: <20220816123858.42489-1-arefev@swemel.ru> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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 Return value of a function 'intel_engine_lookup_user' is dereferenced at i915_pmu.c:708 without checking for null, but it is usually checked for this function Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Denis Arefev --- drivers/gpu/drm/i915/i915_pmu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c index 69c0fa20eba1..33db49ffac3d 100644 --- a/drivers/gpu/drm/i915/i915_pmu.c +++ b/drivers/gpu/drm/i915/i915_pmu.c @@ -704,8 +704,10 @@ static void i915_pmu_disable(struct perf_event *event) * Decrement the reference count and clear the enabled * bitmask when the last listener on an event goes away. */ - if (--engine->pmu.enable_count[sample] == 0) - engine->pmu.enable &= ~BIT(sample); + if (engine != NULL) { + if (--engine->pmu.enable_count[sample] == 0) + engine->pmu.enable &= ~BIT(sample); + } } GEM_BUG_ON(bit >= ARRAY_SIZE(pmu->enable_count)); -- 2.25.1