Received: by 2002:a05:6512:3d0e:0:0:0:0 with SMTP id d14csp41019lfv; Tue, 12 Apr 2022 16:26:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw8o5A+7srg6/siQVtA+BYuybdnOQWbIKvC4qm1+Bk+BYuNhw4iPripoPsvBrrsD/IN4qp4 X-Received: by 2002:a63:555a:0:b0:39d:7d11:d0f1 with SMTP id f26-20020a63555a000000b0039d7d11d0f1mr7055343pgm.405.1649805999734; Tue, 12 Apr 2022 16:26:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649805999; cv=none; d=google.com; s=arc-20160816; b=H1KfgUAZ7XugObpvFm5nkyORubdzOg7W8JY1FeU8lkB44ipXBW8HMQqyewHGu5VE1d a/GV4ZB0afqvwaeG+iE3YxgbZptn14pAd/2uof2uYObNH1gttBmweTKR3qwBfH7s9iiA /LmkZezJF5UXBjm2ecAsrpmMT3W6+AKG+CG4e4H8/5N+oRIrnLs/LdP4mhic+1JNlikc vQFFSbgGFfuYMYJmNJfEKlUQlVoP+lEsVLlePNEZ1xnCX6uMXwOSpfE4i/LKaGUAxVsR 4O5Q/8Izr5vKgYmy7i0fyQ3xEuKbGQrJKslb83Y2AepA2N1enEXa2pEGZ+KRlkpxaC1O TsKA== 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=ZIIt1gCsX5LIH2iDoQ2eL1ayJGewkA6/gLMzf1Z46/z58CyaWSGK6Am8Fbq0WQ4RQk YkYwAAb0+w6o4XDrnP6H6vcCl9168aPE36t4MBszcifkWHAlWoi5XWCxEk8HRS/7ddJs QD/o20qAcq67lwnxFC+9wlgTuM+kiLSObULFzIKRSby71lY3UYtdq6yvCYo2mSRmYt2U ve9lV1jSPnT6/PW63G5RPR8WfLNqZoYLxSiSYBTKVwHmVz+PII8/dkZLaGP4IuLT03gn Yqw79qUnpT5I3sDAmxcdCIw7AJcF31lnEzOj+yCENyAbp+AkOS1An+9ngXf9zCRrPGqD jzQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Dxno26LC; 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 y17-20020a631811000000b00398ecc4479dsi4251032pgl.139.2022.04.12.16.26.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 16:26:39 -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=Dxno26LC; 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 out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A29931AA042; Tue, 12 Apr 2022 14:19:01 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1385930AbiDLIxg (ORCPT + 99 others); Tue, 12 Apr 2022 04:53:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1359251AbiDLHmw (ORCPT ); Tue, 12 Apr 2022 03:42:52 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92AE229C9B; Tue, 12 Apr 2022 00:21:00 -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 509F9B81B62; Tue, 12 Apr 2022 07:20:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0E6CC385A1; Tue, 12 Apr 2022 07:20:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649748058; bh=YMs7DdWMitcpwA45VOAPxYqNjZD+cfm5Xmc4BAEvph4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dxno26LCdcq90ndP0UOJiHUfV/GE4eCuGLulWNCSDhk/JgfgN6r3Mv2TXyXnHWSxo p53xGa0/cb935SrL1qhExy8S/I3BMQ1GzdRdHv5T9yzkGHt8yEPcuumRPAMyAVtS7H Qk0wZaEc9VEtCSn+PefRGwuZGr6u3bZ0KOtGUGUc= 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.17 304/343] drm/panel: ili9341: fix optional regulator handling Date: Tue, 12 Apr 2022 08:32:02 +0200 Message-Id: <20220412063000.099144337@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062951.095765152@linuxfoundation.org> References: <20220412062951.095765152@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);