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=-13.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 C6000C433E0 for ; Fri, 25 Dec 2020 09:43:48 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8DFDE230FF for ; Fri, 25 Dec 2020 09:43:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8DFDE230FF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=126.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DA00F89C97; Fri, 25 Dec 2020 09:42:17 +0000 (UTC) X-Greylist: delayed 1908 seconds by postgrey-1.36 at gabe; Fri, 25 Dec 2020 03:37:32 UTC Received: from mail-m965.mail.126.com (mail-m965.mail.126.com [123.126.96.5]) by gabe.freedesktop.org (Postfix) with ESMTPS id 53B5B895C1 for ; Fri, 25 Dec 2020 03:37:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=Nw5xV856oasZ0yZ8Qa S2cPa7Iztpyngt2ba/DsSD//k=; b=RJFY6CovY0aG9kNSIQeMmC7oNLS50HdIG2 dnoqh/uAf4JJ20fCc0Lpuc2s8VQIqrckSK5ZunOXAdWkU3xoC/uc7JKHns8qYXsM NNsDeG5gha7yF0lKjloL0P63GjvDHcwU8Dh8BTVcQTHWux8I5R2G0E3ozgDhmAYB 7Fc7xWMYg= Received: from localhost.localdomain (unknown [36.112.86.14]) by smtp10 (Coremail) with SMTP id NuRpCgD3_iIAV+VfaArNiQ--.28060S2; Fri, 25 Dec 2020 11:05:37 +0800 (CST) From: Defang Bo To: 603571786@qq.com, tomi.valkeinen@ti.com, airlied@linux.ie, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/omapdrm: don't deref error pointer in the omap_fbdev_create error path Date: Fri, 25 Dec 2020 11:05:29 +0800 Message-Id: <1608865530-2166206-1-git-send-email-bodefang@126.com> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: NuRpCgD3_iIAV+VfaArNiQ--.28060S2 X-Coremail-Antispam: 1Uf129KBjvdXoWrtryUKw18tr13GryktFW8WFg_yoWkZFX_W3 4kurn3J3W2kF17Cr13AayqvrWIk3W3Zr4rJw48Kan3Gry3u3WrXFW3Zr9rXrWrXF4UWr95 Cwn7JrZ8J34xGjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUb2Q6JUUUUU== X-Originating-IP: [36.112.86.14] X-CM-SenderInfo: pergvwxdqjqiyswou0bp/1tbikgEG11pECE0KAwAAsQ X-Mailman-Approved-At: Fri, 25 Dec 2020 09:42:09 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: bodefang MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: bodefang Similar to commit <789d4c300>("drm/msm: don't deref error pointer in the msm_fbdev_create error path") the error pointer returned by omap_framebuffer_init gets passed to drm_framebuffer_remove. The latter handles only Null pointers,thus a nasty crash will occur. Signed-off-by: bodefang --- drivers/gpu/drm/omapdrm/omap_fbdev.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c index 3f6cfc2..372afd4 100644 --- a/drivers/gpu/drm/omapdrm/omap_fbdev.c +++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c @@ -141,8 +141,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper, * to unref the bo: */ drm_gem_object_put(fbdev->bo); - ret = PTR_ERR(fb); - goto fail; + return PTR_ERR(fb); } /* note: this keeps the bo pinned.. which is perhaps not ideal, @@ -200,10 +199,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper, fail: - if (ret) { - if (fb) - drm_framebuffer_remove(fb); - } + drm_framebuffer_remove(fb); return ret; } -- 2.7.4 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel