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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 817C0C433DB for ; Mon, 28 Dec 2020 08:22:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4BBFE207B0 for ; Mon, 28 Dec 2020 08:22:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726548AbgL1IWW (ORCPT ); Mon, 28 Dec 2020 03:22:22 -0500 Received: from m15113.mail.126.com ([220.181.15.113]:49687 "EHLO m15113.mail.126.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726328AbgL1IWW (ORCPT ); Mon, 28 Dec 2020 03:22:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=kR7LsGQMcBZUF10Xfd CEdaJ3jGd0gRg41YQhRD78f9s=; b=peIfPa56K5rFNIkPG8ED515puQ9JYRT0rb 0Mg0SaQwN9L9l6US8MK1B+QAheN22sIjK1MGWKBNSmMdHwjJX6CxisPzsa9Tq9K8 wEpRQhIbaB/RUjvfHspEv8ApsaOMMPy9b4zutgMtD30mAdQ0ziI6tmucYfza2JNK 4/BV53MvU= Received: from localhost.localdomain (unknown [36.112.86.14]) by smtp3 (Coremail) with SMTP id DcmowACXzgUAR+lffFgTNQ--.5617S2; Mon, 28 Dec 2020 10:46:25 +0800 (CST) From: Defang Bo To: tomi.valkeinen@ti.com, airlied@linux.ie, daniel@ffwll.ch Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Defang Bo Subject: [PATCH] drm/omapdrm: don't deref error pointer in the omap_fbdev_create error path Date: Mon, 28 Dec 2020 10:46:13 +0800 Message-Id: <1609123573-227288-1-git-send-email-bodefang@126.com> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: DcmowACXzgUAR+lffFgTNQ--.5617S2 X-Coremail-Antispam: 1Uf129KBjvdXoWrKF45trWfur1UGw17Zw13Jwb_yoWkKrc_Wa 4v9wn3J3W2kF1UuFnxC3yqvr97K3Z3Zr4rJw48tan3Gry3Wa4rXFWfZrnrXrWrWF42gr95 Cwn7JrZ8J34xKjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUUq2MUUUUUU== X-Originating-IP: [36.112.86.14] X-CM-SenderInfo: pergvwxdqjqiyswou0bp/1tbiYwEJ11x5bW4KXwAAsP Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Similar to commit<789d4c300e10>("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. Drop the unnecessary checks in label fail. Signed-off-by: Defang Bo --- drivers/gpu/drm/omapdrm/omap_fbdev.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c index 3f6cfc2..7ba07c8 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, @@ -199,12 +198,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper, return 0; fail: - - if (ret) { - if (fb) - drm_framebuffer_remove(fb); - } - + drm_framebuffer_remove(fb); return ret; } -- 2.7.4 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=-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,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 003C6C433E0 for ; Mon, 28 Dec 2020 10:20:05 +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 BB8F5221F0 for ; Mon, 28 Dec 2020 10:20:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BB8F5221F0 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 86F7789B29; Mon, 28 Dec 2020 10:19:42 +0000 (UTC) Received: from m15113.mail.126.com (m15113.mail.126.com [220.181.15.113]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0CFAA8979D for ; Mon, 28 Dec 2020 02:46:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=kR7LsGQMcBZUF10Xfd CEdaJ3jGd0gRg41YQhRD78f9s=; b=peIfPa56K5rFNIkPG8ED515puQ9JYRT0rb 0Mg0SaQwN9L9l6US8MK1B+QAheN22sIjK1MGWKBNSmMdHwjJX6CxisPzsa9Tq9K8 wEpRQhIbaB/RUjvfHspEv8ApsaOMMPy9b4zutgMtD30mAdQ0ziI6tmucYfza2JNK 4/BV53MvU= Received: from localhost.localdomain (unknown [36.112.86.14]) by smtp3 (Coremail) with SMTP id DcmowACXzgUAR+lffFgTNQ--.5617S2; Mon, 28 Dec 2020 10:46:25 +0800 (CST) From: Defang Bo To: tomi.valkeinen@ti.com, airlied@linux.ie, daniel@ffwll.ch Subject: [PATCH] drm/omapdrm: don't deref error pointer in the omap_fbdev_create error path Date: Mon, 28 Dec 2020 10:46:13 +0800 Message-Id: <1609123573-227288-1-git-send-email-bodefang@126.com> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: DcmowACXzgUAR+lffFgTNQ--.5617S2 X-Coremail-Antispam: 1Uf129KBjvdXoWrKF45trWfur1UGw17Zw13Jwb_yoWkKrc_Wa 4v9wn3J3W2kF1UuFnxC3yqvr97K3Z3Zr4rJw48tan3Gry3Wa4rXFWfZrnrXrWrWF42gr95 Cwn7JrZ8J34xKjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUUq2MUUUUUU== X-Originating-IP: [36.112.86.14] X-CM-SenderInfo: pergvwxdqjqiyswou0bp/1tbiYwEJ11x5bW4KXwAAsP X-Mailman-Approved-At: Mon, 28 Dec 2020 10:19:13 +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: Defang Bo , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org 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" Similar to commit<789d4c300e10>("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. Drop the unnecessary checks in label fail. Signed-off-by: Defang Bo --- drivers/gpu/drm/omapdrm/omap_fbdev.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c index 3f6cfc2..7ba07c8 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, @@ -199,12 +198,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper, return 0; 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