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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 B2B8BC76195 for ; Fri, 19 Jul 2019 04:40:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 823A52084C for ; Fri, 19 Jul 2019 04:40:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563511250; bh=k+gLLS6cAeBNJKlLzA4rmJovYWHIqXeTW9b7HIGfzp4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DPLpzRYak2X5Ub8mwvd985KhTM5ETNUh8s33y0WuCmnhpzhxQXPKr0fgJTuWOInjI Nlda7heTcFTauyvd1F49EbARJoYHsL6WNFdisn2VyonfL3GSuaogWdd1TlYtQstDAg kRd8QcBUh+L44qXPXZWcfHEc+dLmAGV+A/acxDuY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727259AbfGSD5Y (ORCPT ); Thu, 18 Jul 2019 23:57:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:56654 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727244AbfGSD5Y (ORCPT ); Thu, 18 Jul 2019 23:57:24 -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 064F52082E; Fri, 19 Jul 2019 03:57:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563508643; bh=k+gLLS6cAeBNJKlLzA4rmJovYWHIqXeTW9b7HIGfzp4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mpQBqDGHtNZ/WMSyYnaKAlFXWOfXCAI8dXegR4QNkSOsdY9qxW3PoujX3uUYhaBkD +TZakwWO2YiLhj1mUE0Kish9VjMF+HhZvTXoOIqUmtF1cMkKGtxxmfSdTrZCdQfK2F zBfar2AFbS1THFlzRbPC02/f0+NF4J2HovmZbY+0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sean Paul , Jordan Crouse , Sasha Levin , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.2 016/171] drm/msm/a6xx: Check for ERR or NULL before iounmap Date: Thu, 18 Jul 2019 23:54:07 -0400 Message-Id: <20190719035643.14300-16-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190719035643.14300-1-sashal@kernel.org> References: <20190719035643.14300-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Sean Paul [ Upstream commit 5ca4a094ba7e1369363dcbcbde8baf06ddcdc2d1 ] pdcptr and seqptr aren't necessarily valid, check them before trying to unmap them. Changes in v2: - None Cc: Jordan Crouse Reviewed-by: Jordan Crouse Signed-off-by: Sean Paul Link: https://patchwork.freedesktop.org/patch/msgid/20190523171653.138678-3-sean@poorly.run Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c index 38e2cfa9cec7..418bb08bbed7 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c @@ -504,8 +504,10 @@ static void a6xx_gmu_rpmh_init(struct a6xx_gmu *gmu) wmb(); err: - devm_iounmap(gmu->dev, pdcptr); - devm_iounmap(gmu->dev, seqptr); + if (!IS_ERR_OR_NULL(pdcptr)) + devm_iounmap(gmu->dev, pdcptr); + if (!IS_ERR_OR_NULL(seqptr)) + devm_iounmap(gmu->dev, seqptr); } /* -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.2 016/171] drm/msm/a6xx: Check for ERR or NULL before iounmap Date: Thu, 18 Jul 2019 23:54:07 -0400 Message-ID: <20190719035643.14300-16-sashal@kernel.org> References: <20190719035643.14300-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190719035643.14300-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, Sean Paul , freedreno@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogU2VhbiBQYXVsIDxzZWFucGF1bEBjaHJvbWl1bS5vcmc+CgpbIFVwc3RyZWFtIGNvbW1p dCA1Y2E0YTA5NGJhN2UxMzY5MzYzZGNiY2JkZThiYWYwNmRkY2RjMmQxIF0KCnBkY3B0ciBhbmQg c2VxcHRyIGFyZW4ndCBuZWNlc3NhcmlseSB2YWxpZCwgY2hlY2sgdGhlbSBiZWZvcmUgdHJ5aW5n IHRvCnVubWFwIHRoZW0uCgpDaGFuZ2VzIGluIHYyOgotIE5vbmUKCkNjOiBKb3JkYW4gQ3JvdXNl IDxqY3JvdXNlQGNvZGVhdXJvcmEub3JnPgpSZXZpZXdlZC1ieTogSm9yZGFuIENyb3VzZSA8amNy b3VzZUBjb2RlYXVyb3JhLm9yZz4KU2lnbmVkLW9mZi1ieTogU2VhbiBQYXVsIDxzZWFucGF1bEBj aHJvbWl1bS5vcmc+Ckxpbms6IGh0dHBzOi8vcGF0Y2h3b3JrLmZyZWVkZXNrdG9wLm9yZy9wYXRj aC9tc2dpZC8yMDE5MDUyMzE3MTY1My4xMzg2NzgtMy1zZWFuQHBvb3JseS5ydW4KU2lnbmVkLW9m Zi1ieTogU2FzaGEgTGV2aW4gPHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9tc20vYWRyZW5vL2E2eHhfZ211LmMgfCA2ICsrKystLQogMSBmaWxlIGNoYW5nZWQsIDQgaW5z ZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v bXNtL2FkcmVuby9hNnh4X2dtdS5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9hZHJlbm8vYTZ4eF9n bXUuYwppbmRleCAzOGUyY2ZhOWNlYzcuLjQxOGJiMDhiYmVkNyAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL21zbS9hZHJlbm8vYTZ4eF9nbXUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbXNt L2FkcmVuby9hNnh4X2dtdS5jCkBAIC01MDQsOCArNTA0LDEwIEBAIHN0YXRpYyB2b2lkIGE2eHhf Z211X3JwbWhfaW5pdChzdHJ1Y3QgYTZ4eF9nbXUgKmdtdSkKIAl3bWIoKTsKIAogZXJyOgotCWRl dm1faW91bm1hcChnbXUtPmRldiwgcGRjcHRyKTsKLQlkZXZtX2lvdW5tYXAoZ211LT5kZXYsIHNl cXB0cik7CisJaWYgKCFJU19FUlJfT1JfTlVMTChwZGNwdHIpKQorCQlkZXZtX2lvdW5tYXAoZ211 LT5kZXYsIHBkY3B0cik7CisJaWYgKCFJU19FUlJfT1JfTlVMTChzZXFwdHIpKQorCQlkZXZtX2lv dW5tYXAoZ211LT5kZXYsIHNlcXB0cik7CiB9CiAKIC8qCi0tIAoyLjIwLjEKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxp c3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA==