Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp794606pxb; Tue, 12 Apr 2022 13:39:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/54LKArL0pmZ0vghjCvaHmIhDLolWiD0p0YieeHcTNGlKvG+aJRXuhvF28YQR7h7HmYrq X-Received: by 2002:a17:90b:2248:b0:1cb:be19:822e with SMTP id hk8-20020a17090b224800b001cbbe19822emr6918252pjb.22.1649795972968; Tue, 12 Apr 2022 13:39:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649795972; cv=none; d=google.com; s=arc-20160816; b=oUBTBoVjVraUImMVOTw2SiZZ1QZ1V7+BLB0fej5UCJ2FinOU2yYeVCtLerOr2JE9cE YnCIlkfen06t4z9o+aqXjQ0hEwRHS+3r5dn+hYj+IkNZZ8hQfvr+0tkA9S6bAq/FmZD5 fgGujJT2ZrJwCh/5wqj84XzbdGMkzOUGFUmGq6TD8kIwtTCsU2CY6kWXKGu6OO3PpzDx 8u/5cBersXy9MNbBWg9sOzV0TvTYwXYnNMUMDkU+R5ti0VOT3LlvdAHGSWqlQb+VQ6yw c19FIza2uPA5EptTlSIjsern7A2weUUSc81nzLKBE1r18loBYurSRdg8EIF7EuDg44MD XdJQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=4DucHgDR73pc4xW2S8APAYUSJyBj6RWWjYfE81vn9HU=; b=uW2GTezAXXOoE+MCzaqslPi68n2zR6opr9gfz2ztQLvxNuEgiyMxAUnY3Nqta9XR3N rREtRYHLbfh9i56glGWVHeXO1G7qRqcIuY+g7Ovkn8ce9Ia/1LO/MKg/2RXVA7kfyCW6 dh+ChBTVCeOZsv2IEsfhuEAIdCxDNTzlAuWebB3WKN3tnwBYAHwecUpwvgzDQ1IYW/od HsMIKhsqmcCgmV9VV5yJlivOzgMEUkL1hlg6IVcF3jPOlmiR3mQjmRygGwOBOhmTT33b SFpkr5SEu7xVzxZYYvtdjeeA5mFIegOjh4eYuhh6IZfjxC9UEVHYrP3f3fRhhLGWxbp+ rNCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=roERGJdN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id ip4-20020a17090b314400b001bf207bdb67si12123532pjb.47.2022.04.12.13.39.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 13:39:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=roERGJdN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id EB60EB6D2E; Tue, 12 Apr 2022 13:12:45 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355395AbiDLIIL (ORCPT + 99 others); Tue, 12 Apr 2022 04:08:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355176AbiDLH1N (ORCPT ); Tue, 12 Apr 2022 03:27:13 -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 0B48D48883; Tue, 12 Apr 2022 00:07:16 -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 0FB49B81B4E; Tue, 12 Apr 2022 07:07:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7101EC385A1; Tue, 12 Apr 2022 07:07:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649747233; bh=YMs7DdWMitcpwA45VOAPxYqNjZD+cfm5Xmc4BAEvph4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=roERGJdNK3Hr8hVleYbV4pbMOiBICAd4t5XN6FSjh0vRaOl8Yp6WH6tZxtu0rAHdu x94xf+MH0HP6NLmjJsSWpNfcGylfu1ETFZMMP+aVc0Me1yVKVyQRXweYPh8zHlQcTX I9/0MMTZyMwxilceuJQ4kwIDImFmxUuz/13vgniY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Daniel Mack , Daniel Vetter Subject: [PATCH 5.16 251/285] drm/panel: ili9341: fix optional regulator handling Date: Tue, 12 Apr 2022 08:31:48 +0200 Message-Id: <20220412062950.904732091@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062943.670770901@linuxfoundation.org> References: <20220412062943.670770901@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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 From: Daniel Mack commit d14eb80e27795b7b20060f7b151cdfe39722a813 upstream. If the optional regulator lookup fails, reset the pointer to NULL. Other functions such as mipi_dbi_poweron_reset_conditional() only do a NULL pointer check and will otherwise dereference the error pointer. Fixes: 5a04227326b04c15 ("drm/panel: Add ilitek ili9341 panel driver") Signed-off-by: Daniel Mack Cc: stable@vger.kernel.org Signed-off-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/20220317225537.826302-1-daniel@zonque.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/panel/panel-ilitek-ili9341.c +++ b/drivers/gpu/drm/panel/panel-ilitek-ili9341.c @@ -612,8 +612,10 @@ static int ili9341_dbi_probe(struct spi_ int ret; vcc = devm_regulator_get_optional(dev, "vcc"); - if (IS_ERR(vcc)) + if (IS_ERR(vcc)) { dev_err(dev, "get optional vcc failed\n"); + vcc = NULL; + } dbidev = devm_drm_dev_alloc(dev, &ili9341_dbi_driver, struct mipi_dbi_dev, drm);