From patchwork Fri May 12 10:33:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Natalia Petrova X-Patchwork-Id: 93126 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp5000154vqo; Fri, 12 May 2023 03:45:22 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4dtuuGEuio0AGEdmS3YPsQ8bBN9u5D20/uewnWcwB7Qog8FlT+G/N61GZlicl3qT00VQUa X-Received: by 2002:a17:90b:797:b0:23f:9445:318e with SMTP id l23-20020a17090b079700b0023f9445318emr28768425pjz.3.1683888321563; Fri, 12 May 2023 03:45:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683888321; cv=none; d=google.com; s=arc-20160816; b=rC+TACJ7g72vUgk+cOmFw+sz5gpD9jRLp4HbgoIZ3dUFb/Duly3hjjFfarpX2W3xwD I5d26heJqOpzBdc8YMQgczZWIF5RqixJfpVkDc/UkuXkKf1/JjwApf1Qr4uyZ6jksaYN ED8qWFh6uEjJn3IciOGzsuLGU8Wr0zQTxyEmsguba8A2cVhQKcTK55wkVj4nsW1cUYU/ Rs+DJ8vrXqgB00iy7hkBu8gOP5UyjrqONDh9mI36046doz1LJB5dY/so630rQPqlapGg PMQE/GZJpm5OitH6EVu1fiYZthRh/kPKhd4s6nnxyNc7wcy6JnKUe56jWbEddETurw/X 51KA== 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:from; bh=u4+NrGrBWcxQk9YZPtAXUarmmkMQVkEOUnIC6lzQpyI=; b=xqX2RqufD6xihrfKu4Rq0epiAvWLqbbXAcNlR8qUn6OGsusSjW+zTasekYybvFOmRF B8gM8RWsXhI9lFxlGE73S/MzxyurF1JmZbVM9TPk7WVOtuJRfJIqb3j42ifUZClBDu4Q 7xgZVAajTucvONErsXfaAUm+UlYFk8JnRBnGe3q5u+KXLljUY04iXLW5nu1+XosZnA1B 5F9RVOlEAl/r9gFFcHgXClym4XMVfNzbyk1HO1ls9UzN7lDzBKV5hdP/xAYB1v7j96Wf Vk057YWwT7nvI0mELX/O2Ei4ps4oYasWtcoOE1TnN2Fff0XAs4NtrbAD6MvPBobgcwuu x2JQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jf9-20020a170903268900b001a6547bfdadsi8548189plb.156.2023.05.12.03.45.09; Fri, 12 May 2023 03:45:21 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240545AbjELKeO (ORCPT + 99 others); Fri, 12 May 2023 06:34:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240523AbjELKeH (ORCPT ); Fri, 12 May 2023 06:34:07 -0400 Received: from exchange.fintech.ru (e10edge.fintech.ru [195.54.195.159]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F1972D72 for ; Fri, 12 May 2023 03:33:25 -0700 (PDT) Received: from Ex16-01.fintech.ru (10.0.10.18) by exchange.fintech.ru (195.54.195.169) with Microsoft SMTP Server (TLS) id 14.3.498.0; Fri, 12 May 2023 13:33:22 +0300 Received: from KANASHIN1.fintech.ru (10.0.253.125) by Ex16-01.fintech.ru (10.0.10.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Fri, 12 May 2023 13:33:22 +0300 From: Natalia Petrova To: Ben Skeggs CC: Natalia Petrova , Karol Herbst , Lyude Paul , David Airlie , Daniel Vetter , , , , Subject: [PATCH] nouveau_connector: add nv_encoder pointer check for NULL Date: Fri, 12 May 2023 13:33:20 +0300 Message-ID: <20230512103320.82234-1-n.petrova@fintech.ru> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.0.253.125] X-ClientProxiedBy: Ex16-02.fintech.ru (10.0.10.19) To Ex16-01.fintech.ru (10.0.10.18) X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765684881083114787?= X-GMAIL-MSGID: =?utf-8?q?1765684881083114787?= Pointer nv_encoder could be dereferenced at nouveau_connector.c in case it's equal to NULL by jumping to goto label. This patch adds a NULL-check to avoid it. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 3195c5f9784a ("drm/nouveau: set encoder for lvds") Signed-off-by: Natalia Petrova Reviewed-by: Lyude Paul --- drivers/gpu/drm/nouveau/nouveau_connector.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index 43a9d1e1cf71..90ba6d0a9c80 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -729,7 +729,8 @@ nouveau_connector_detect_lvds(struct drm_connector *connector, bool force) #endif nouveau_connector_set_edid(nv_connector, edid); - nouveau_connector_set_encoder(connector, nv_encoder); + if (nv_encoder) + nouveau_connector_set_encoder(connector, nv_encoder); return status; }