From patchwork Mon Mar 25 21:05:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kangjie Lu X-Patchwork-Id: 10870623 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1CFA41575 for ; Tue, 26 Mar 2019 08:06:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0D60928FC9 for ; Tue, 26 Mar 2019 08:06:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 01FF829087; Tue, 26 Mar 2019 08:06:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7D95428FC9 for ; Tue, 26 Mar 2019 08:06:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9D0296E7BD; Tue, 26 Mar 2019 08:05:26 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mta-p7.oit.umn.edu (mta-p7.oit.umn.edu [134.84.196.207]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8FF376E760 for ; Mon, 25 Mar 2019 21:06:20 +0000 (UTC) Received: from localhost (unknown [127.0.0.1]) by mta-p7.oit.umn.edu (Postfix) with ESMTP id 0FFB8924 for ; Mon, 25 Mar 2019 21:06:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p7.oit.umn.edu ([127.0.0.1]) by localhost (mta-p7.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id L-VOBCaEKfD6 for ; Mon, 25 Mar 2019 16:06:19 -0500 (CDT) Received: from mail-io1-f70.google.com (mail-io1-f70.google.com [209.85.166.70]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p7.oit.umn.edu (Postfix) with ESMTPS id D9298923 for ; Mon, 25 Mar 2019 16:06:18 -0500 (CDT) Received: by mail-io1-f70.google.com with SMTP id b199so8736686iof.14 for ; Mon, 25 Mar 2019 14:06:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iELtKhPzIshZDbvaluvxOSSlfieDKoYqR5/gISsqtL4=; b=G+6v884mXXj9dIgykjwePj8tToT/+wc4ME6S79nXPLidm4fRhWvD4v8iK6vgHxlsCN sXsF65OYzBiveRCFRr0yh45H8pyQ/angqGMRiEEkNOT4bIef3pAnwu8qeRn9tMHzZYiL xTeDhMheWxQFNdDt6cwxKi40Zkdl+xfJ9AdGFXBKhvLpphuvQprduTBbnfApSCVB88/T mJ9br/x3wL/eMwS9yc0CMPmq4AbjfeFBwD7gAlrsHHckDQp0mPDC3AaDhtG+CIPpV3EA cffT8YNutmgZLCC/s0/kfzc6KGgmVj3BY6ALcKJVVbE2EjpuxZfnz5cqLRww8qsbvSeK VDsg== X-Gm-Message-State: APjAAAXGurNLNfAa9RSqiiTiX5z//47uDfLj/lBHu34coONxKP23OVEm SZDw4LHsOu23AsD/++JCzFbkoHLRjz+o2L6CSuxS/QPc2nQzk4+TtVcishE/2GheyvXG3NKvOhc bPALLMCZ+qZTy6I5sohoQN74FXBM6D9tI X-Received: by 2002:a6b:8f4f:: with SMTP id r76mr20156356iod.161.1553547978623; Mon, 25 Mar 2019 14:06:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqxa51MJEwH2NRG/AJhC3SjhLoIINKCIt7AHZdr94gaiVEYmz7ty6GdPuXwiVdzvHjrNPc3HOQ== X-Received: by 2002:a6b:8f4f:: with SMTP id r76mr20156268iod.161.1553547977484; Mon, 25 Mar 2019 14:06:17 -0700 (PDT) Received: from bee.dtc.umn.edu (cs-bee-u.cs.umn.edu. [128.101.106.63]) by smtp.gmail.com with ESMTPSA id a80sm6326396ita.0.2019.03.25.14.06.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Mar 2019 14:06:16 -0700 (PDT) From: Kangjie Lu To: kjlu@umn.edu Subject: [PATCH v2] gpu: radeon: fix a potential NULL-pointer dereference Date: Mon, 25 Mar 2019 16:05:52 -0500 Message-Id: <20190325210552.12797-1-kjlu@umn.edu> X-Mailer: git-send-email 2.17.1 In-Reply-To: <0fc81efe-186b-3207-e0d0-b0bb95626069@daenzer.net> References: <0fc81efe-186b-3207-e0d0-b0bb95626069@daenzer.net> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 26 Mar 2019 08:05:22 +0000 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iELtKhPzIshZDbvaluvxOSSlfieDKoYqR5/gISsqtL4=; b=m0RspacWboH26LXyLuz33+dSBEjUKG0ypxjT4LqXg+U4WL3PS9ejPqRXerKU7OGpYt P03Tk4b7N4qVE3FVwCISOwdiV3y46lWFbzZOJauQhzX1kMhz0PXltXs1yKUnrEaaPxkJ +nea06u7Q48zgb9V02xp+gXChOsQbRn2nn7DnH7Q8hVfepdDKfejiDNY56sa9C64jjxP TLuVQW03ujx5z2MFYEx0tslqYVOQs1gnW872LEayQsU08Ljw7S9BkFF6w8UoSGoWi7qI MI2cD5xPG0npV9KT8KRp/PR2jo3grxomjlFLjNw9l5Iw5tUEp1j7JoLpMPuPpgk8yXwI tyBg== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, pakki001@umn.edu, Alex Deucher , =?utf-8?q?Chris?= =?utf-8?q?tian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP In case alloc_workqueue fails, the fix frees memory and returns -ENOMEM to avoid potential NULL pointer dereference. Signed-off-by: Kangjie Lu --- v2: use radeon_crtc_destroy to properly clean up resources as suggested by Michel Dänzer --- drivers/gpu/drm/radeon/radeon_display.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index aa898c699101..3c6d3289316b 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c @@ -663,7 +663,7 @@ static const struct drm_crtc_funcs radeon_crtc_funcs = { .page_flip_target = radeon_crtc_page_flip_target, }; -static void radeon_crtc_init(struct drm_device *dev, int index) +static int radeon_crtc_init(struct drm_device *dev, int index) { struct radeon_device *rdev = dev->dev_private; struct radeon_crtc *radeon_crtc; @@ -671,13 +671,18 @@ static void radeon_crtc_init(struct drm_device *dev, int index) radeon_crtc = kzalloc(sizeof(struct radeon_crtc) + (RADEONFB_CONN_LIMIT * sizeof(struct drm_connector *)), GFP_KERNEL); if (radeon_crtc == NULL) - return; + return -ENOMEM; drm_crtc_init(dev, &radeon_crtc->base, &radeon_crtc_funcs); drm_mode_crtc_set_gamma_size(&radeon_crtc->base, 256); radeon_crtc->crtc_id = index; radeon_crtc->flip_queue = alloc_workqueue("radeon-crtc", WQ_HIGHPRI, 0); + if (!radeon_crtc->flip_queue) { + DRM_ERROR("failed to allocate the flip queue\n"); + radeon_crtc_destroy(&radeon_crtc->base); + return -ENOMEM; + } rdev->mode_info.crtcs[index] = radeon_crtc; if (rdev->family >= CHIP_BONAIRE) { @@ -706,6 +711,8 @@ static void radeon_crtc_init(struct drm_device *dev, int index) radeon_atombios_init_crtc(dev, radeon_crtc); else radeon_legacy_init_crtc(dev, radeon_crtc); + + return 0; } static const char *encoder_names[38] = { @@ -1612,7 +1619,9 @@ int radeon_modeset_init(struct radeon_device *rdev) /* allocate crtcs */ for (i = 0; i < rdev->num_crtc; i++) { - radeon_crtc_init(rdev->ddev, i); + ret = radeon_crtc_init(rdev->ddev, i); + if (ret) + return ret; } /* okay we should have all the bios connectors */