Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp976711ybt; Wed, 17 Jun 2020 19:41:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwu3c7vDLL9a9HvcJbWZjcTYbFj6vwmW9cafD7WywxtHCPxL6Yc30KE9wGnoQM/jpJHA8kp X-Received: by 2002:aa7:c68b:: with SMTP id n11mr2019860edq.278.1592448078351; Wed, 17 Jun 2020 19:41:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592448078; cv=none; d=google.com; s=arc-20160816; b=SAdwOVgL9wirrXxB5+zNKMeSqzfA0jvtEw7txdL1cIttmUU5LFMPGFSf8IrjZVUp9a F5wuAxXJ2/T0y4B0B+cNIY+sWvbx+ShANVlgvPffutPfmTFxXKp5c3Iwt7jTSzSfILnq xsPOInM66T+YtWqrKscMCoQYlVhMR1a+XD9Dy8j8ZDP0YDTljYbE2KvNm2f6xrgYi4mP U80W46y7zYXyST7a56ZBfOLmq/P91VNEQVf7jQr8QlGX6KacFuCTPMyKFsUrxyjG3yay 7j0BMbE75b/YAyy6/dCwA3NNYRqld7S79ii8azl2tSfZU/gY8LuvVDnYe1VOqHBYjdT0 k0hg== 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=wgwtIYUEQM89RAjtbmMUR4uyiV/8gJ5bPVjM45OmaRc=; b=zQPAJMqOYrWnhpGq3B/Fq8++INpzOATRhqSBvkt6skQVmAAsvqwYrzuR4GDs2ljhjc v+VEBKilXFWTqoAXj530uWDNhoHSKMWNzbI2XavuAxypqHaBhWOsMOZvSRJ14svyxq9D f2uUA+HmhDhZSrbwle8Ummcq6k6c0pYMId9/jTKGTVCzEufas890lsY09bVOOeX6fJwF RaLyfyb3J3H8bPF+srRLL4IqmR8EsKIpgyQws4tYdbAWzgXfvOfYxYX7K4sGzzmA5eRy TQnv+TnplcLsM+PvafA9DBBX8LF7v8thjv/e1rNIMhuzBHfXr8G+qcFQ4+uukq61XxL5 P9Lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1WQ90H61; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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. [23.128.96.18]) by mx.google.com with ESMTP id cx27si1028440edb.158.2020.06.17.19.40.56; Wed, 17 Jun 2020 19:41:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1WQ90H61; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S1729117AbgFRCjR (ORCPT + 99 others); Wed, 17 Jun 2020 22:39:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:42102 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729047AbgFRBNI (ORCPT ); Wed, 17 Jun 2020 21:13:08 -0400 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 C1DD2214DB; Thu, 18 Jun 2020 01:13:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442787; bh=tgmLfevUX9lI0PeC7Z40erGfpQqe3mE/JRPlDRFsIrY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1WQ90H61O20dVOwtNT9TICp1+7r5j8WLvzyKy3fdpRlCO1MqKU5ycFcHlpCAWq0Zv AhONtsJBGg3WWwvCwoD4QKEwCm+K4Ft8ixNJ/kf8OT9WEYFWpXOLP+XCmzUctik9dj UgRZqoxm9oaRcJlhsIPx2no5MiIU0mYocRXXIPsw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Roy Spliet , Abhinav Kumar , Rob Clark , Sasha Levin , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.7 231/388] drm/msm/mdp5: Fix mdp5_init error path for failed mdp5_kms allocation Date: Wed, 17 Jun 2020 21:05:28 -0400 Message-Id: <20200618010805.600873-231-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-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: Roy Spliet [ Upstream commit e4337877c5d578722c0716f131fb774522013cf5 ] When allocation for mdp5_kms fails, calling mdp5_destroy() leads to undefined behaviour, likely a nullptr exception or use-after-free troubles. Signed-off-by: Roy Spliet Reviewed-by: Abhinav Kumar Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c index 47b989834af1..c23a2fa13fb9 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c @@ -943,7 +943,8 @@ static int mdp5_init(struct platform_device *pdev, struct drm_device *dev) return 0; fail: - mdp5_destroy(pdev); + if (mdp5_kms) + mdp5_destroy(pdev); return ret; } -- 2.25.1