Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp8329964ybl; Thu, 16 Jan 2020 14:45:35 -0800 (PST) X-Google-Smtp-Source: APXvYqxdl1lJzAjUMxLAmHngNe2YSQO933Ls/hjCuDKspcb7wDF6vguV8h+akr5uZCUOn9YjfuiF X-Received: by 2002:a54:4396:: with SMTP id u22mr1225225oiv.128.1579214735536; Thu, 16 Jan 2020 14:45:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579214735; cv=none; d=google.com; s=arc-20160816; b=WiUTs9c2FbpwraydcIG6JHOko+GG8d1DqxuTpDEB0KeKsAUPTyR9pSRs18O2ObQ+1R y33bVdOB1Qjn11s4nbjLdo2sUmcm6Ayt9dSgPkYa4aokE1U9o7qsVNyDKQjHh6craehC 1j4G1MHgucNYt7bKAx8dmNns1el0A2jCuMqOdHg/OdRZWyaE8PEwB7Ev44z6FmvgusS5 mUnSF3JV7Oc/HzaQSGHs5tfnVMDPDx6DC1IyBebDtoSTTxfGg4eLMbHjnckQepUus9xv xTyBtHLgNciUa13YFV2Tq8rlXAAcdTVXNs1lDJ0yFGCCQMNKY/CaljjhUJRAfgQlWouZ ZWWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=EZFHx27+DZ3BefAAlGzX9HYaLbfNBPfm63CYp48hnrY=; b=j3H/8FiXitZPZVTujT8RZThZxlC6xiGjK0RiWm6Q+yi8+K2w9rmZEzLtfPgkdj6luC FbWmxleNsDKuQBOnERu8/Fm+csjntHRLHScAT7WjwSdTYrvIkFw6IBkvbE85p1syCRLY C4lKDqWZdcBk8lo+WK2yL29o9jZNXf6ph6TUmP6IAsZVw3CYAc7FIzUWWSGtoLHnXNfj 1iq7foMnHw5+2eashFtOUWBNM8kZaZGU0mamZuI4m5aZZ0H697m5za76lht0Y/yLngZX Uku92MLrdrOIZ6BFtuhZnZ3ISoQ+GMFdd/TTf451bSYf/ND3loPq1LHG9suDqCt4n5yP S8sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Eg2Qe8oU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j16si12000219oii.57.2020.01.16.14.45.23; Thu, 16 Jan 2020 14:45:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Eg2Qe8oU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394971AbgAPSGz (ORCPT + 99 others); Thu, 16 Jan 2020 13:06:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:55650 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393134AbgAPRjY (ORCPT ); Thu, 16 Jan 2020 12:39:24 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A84C7246EC; Thu, 16 Jan 2020 17:39:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196363; bh=KNai5DMJR7gQmw1m1RlF7P+NuWv5Trs5E+f9qHIlmMM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Eg2Qe8oU8bIhqYQ7NJ8m2dGlkSJPsTdfLFo3X1IbQcRkFuGpem0EmNefHQEOudXn8 2tBg7yBBE9Lj/eyENBTTPfYkwe4ynChrFp7rP3VzFv5VyLvknXcHXW2aa5wkTFYYIl Mb1zfDdIm+UwYVuEwU2tErErN5jGygNXWbWhkslg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jeffrey Hugo , Bjorn Andersson , Rob Clark , Sasha Levin , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.9 153/251] drm/msm/mdp5: Fix mdp5_cfg_init error return Date: Thu, 16 Jan 2020 12:35:02 -0500 Message-Id: <20200116173641.22137-113-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116173641.22137-1-sashal@kernel.org> References: <20200116173641.22137-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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 8b4e3004f451..86b0448d2ce5 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c @@ -542,7 +542,7 @@ struct mdp5_cfg_handler *mdp5_cfg_init(struct mdp5_kms *mdp5_kms, 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