From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB784C2D0DB for ; Tue, 28 Jan 2020 14:43:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B56D624683 for ; Tue, 28 Jan 2020 14:43:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580222617; bh=Ekt26GqXBR+jWRpdcUNz9K5xx5ZngRbrZi1OmJsPBTI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZI+0rtg/zkRyt3KahnQdlrvNT1Zk7xII40ajMB0X/B4wsYk9xoWwfCoCWgw19zhWr 9IObCo+PnYMLfiO95OlbMWQRD7Uy3Lw1V08K9t+Pu9P6ln5mRwOuftwbeZwSEQFUFV 09N6j3KtKWtAZb0sZDoz8eg3skZ5AaELl/ixvKhg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729325AbgA1OLX (ORCPT ); Tue, 28 Jan 2020 09:11:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:60456 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727629AbgA1OLU (ORCPT ); Tue, 28 Jan 2020 09:11:20 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 15A872468F; Tue, 28 Jan 2020 14:11:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220679; bh=Ekt26GqXBR+jWRpdcUNz9K5xx5ZngRbrZi1OmJsPBTI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZVunoVvHOxpG7f22Do60HvEu6s9DZCD2MTn7MOb4DGmbJprsZQkPgWSsTifurrJQH PThb4QhPrKtPo934GJYJyDdZc39R5fXNeZZgG8SDOEbqF+pxQuOQLazEzJwEI0LCE7 AgG+0jcMnuxSb924v0DYt10bhtCs7jx092EKdAcI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jeffrey Hugo , Bjorn Andersson , Rob Clark , Sasha Levin Subject: [PATCH 4.4 102/183] drm/msm/mdp5: Fix mdp5_cfg_init error return Date: Tue, 28 Jan 2020 15:05:21 +0100 Message-Id: <20200128135840.202089390@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135829.486060649@linuxfoundation.org> References: <20200128135829.486060649@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jeffrey Hugo [ Upstream commit fc19cbb785d7bbd1a1af26229b5240a3ab332744 ] If mdp5_cfg_init fails because of an unknown major version, a null pointer dereference occurs. This is because the caller of init expects error pointers, but init returns NULL on error. Fix this by returning the expected values on error. Fixes: 2e362e1772b8 (drm/msm/mdp5: introduce mdp5_cfg module) Signed-off-by: Jeffrey Hugo Reviewed-by: Bjorn Andersson Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c index bb1225aa2f75b..89305ad3cde29 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c @@ -547,7 +547,7 @@ fail: if (cfg_handler) mdp5_cfg_destroy(cfg_handler); - return NULL; + return ERR_PTR(ret); } static struct mdp5_cfg_platform *mdp5_get_config(struct platform_device *dev) -- 2.20.1