From patchwork Fri May 25 02:20:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haneen Mohammed X-Patchwork-Id: 10426501 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0755C6025B for ; Fri, 25 May 2018 07:31:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E426A29594 for ; Fri, 25 May 2018 07:31:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D902E295A2; Fri, 25 May 2018 07:31:56 +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, DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM, 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 D4DEC29594 for ; Fri, 25 May 2018 07:31:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 09CE06E8BB; Fri, 25 May 2018 07:31:45 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id C94B16E845 for ; Fri, 25 May 2018 02:20:15 +0000 (UTC) Received: by mail-wr0-x243.google.com with SMTP id a15-v6so6464670wrm.0 for ; Thu, 24 May 2018 19:20:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=NNuHteqerwY1Z13Jk6KRdeSKBZSBMggcGclM8SjezXg=; b=bgt6jfDjBuFX/Th7idrqijhvSl+/5JUI80bAEIiwvH67V9IVLvC9jxUjEvsvWjDYoZ aA0+zlOn5cWk/g+yy/xuzWjsfWC++rKTBCVHRFuNj2Wd3sESGBmYfqmawaEnuGjV+Ge6 1k3Mdk3sDyFVdzQNRNd3RJ1xzyQKlJwWM5J6eWCZUntVIvKmkq3nhAIaPGxP5mOOzUFk 7yH7TSCon+uwxhpdrSYbs7oSwhAWBYlFCr9Y0I5xWljEuygaewhrdrOt/97xonkBkFgc R43OTdKWOwsS6RA0PbBNIQnSySkm+HlXLtNxkNttwiedEuUagpHRoonyF9qOpJOizqRF MkxA== X-Gm-Message-State: ALKqPwevQMwF1LOzkdqXqoYcZV1/Zoo7hlv8T8yFb5nKLK52jUZIRK1G +H8G6pYJZDRRuzSfg1Alxtwi1qiN X-Google-Smtp-Source: AB8JxZpiIi+2g43r/yOlDNiOG8U+ENt5HMXfa0DhRjIIv8diLy2tvEYd6hxZJsfpYB+PWu8Ly8xWJQ== X-Received: by 2002:adf:e407:: with SMTP id g7-v6mr324866wrm.143.1527214814023; Thu, 24 May 2018 19:20:14 -0700 (PDT) Received: from haneen-vb ([188.50.38.73]) by smtp.gmail.com with ESMTPSA id q9-v6sm543292wmq.45.2018.05.24.19.20.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 May 2018 19:20:13 -0700 (PDT) Date: Fri, 25 May 2018 05:20:08 +0300 From: Haneen Mohammed To: dri-devel Subject: [PATCH] drm: Add checks for NULL drm_*_helper_funcs Message-ID: <20180525022008.GA29417@haneen-vb> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) X-Mailman-Approved-At: Fri, 25 May 2018 07:31:42 +0000 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: rodrigosiqueiramelo@gmail.com, David Airlie , Daniel Vetter Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch add checks for NULL drm_[connector/crtc/plane]_helper_funcs pointers before derefrencing the variable to avoid NULL pointer dereference and make the helper functions as optional as possible. Signed-off-by: Haneen Mohammed --- drivers/gpu/drm/drm_atomic_helper.c | 42 +++++++++++++++-------------- drivers/gpu/drm/drm_probe_helper.c | 11 ++++---- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index c35654591c12..52092deb741d 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -112,9 +112,9 @@ static int handle_conflicting_encoders(struct drm_atomic_state *state, if (!new_conn_state->crtc) continue; - if (funcs->atomic_best_encoder) + if (funcs && funcs->atomic_best_encoder) new_encoder = funcs->atomic_best_encoder(connector, new_conn_state); - else if (funcs->best_encoder) + else if (funcs && funcs->best_encoder) new_encoder = funcs->best_encoder(connector); else new_encoder = drm_atomic_helper_best_encoder(connector); @@ -308,10 +308,10 @@ update_connector_routing(struct drm_atomic_state *state, funcs = connector->helper_private; - if (funcs->atomic_best_encoder) + if (funcs && funcs->atomic_best_encoder) new_encoder = funcs->atomic_best_encoder(connector, new_connector_state); - else if (funcs->best_encoder) + else if (funcs && funcs->best_encoder) new_encoder = funcs->best_encoder(connector); else new_encoder = drm_atomic_helper_best_encoder(connector); @@ -438,7 +438,7 @@ mode_fixup(struct drm_atomic_state *state) continue; funcs = crtc->helper_private; - if (!funcs->mode_fixup) + if (!funcs || !funcs->mode_fixup) continue; ret = funcs->mode_fixup(crtc, &new_crtc_state->mode, @@ -639,7 +639,7 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, new_crtc_state->connectors_changed = true; } - if (funcs->atomic_check) + if (funcs && funcs->atomic_check) ret = funcs->atomic_check(connector, new_connector_state); if (ret) return ret; @@ -681,7 +681,7 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, if (connectors_mask & BIT(i)) continue; - if (funcs->atomic_check) + if (funcs && funcs->atomic_check) ret = funcs->atomic_check(connector, new_connector_state); if (ret) return ret; @@ -972,14 +972,16 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) /* Right function depends upon target state. */ - if (new_crtc_state->enable && funcs->prepare) - funcs->prepare(crtc); - else if (funcs->atomic_disable) - funcs->atomic_disable(crtc, old_crtc_state); - else if (funcs->disable) - funcs->disable(crtc); - else - funcs->dpms(crtc, DRM_MODE_DPMS_OFF); + if (funcs) { + if (new_crtc_state->enable && funcs->prepare) + funcs->prepare(crtc); + else if (funcs->atomic_disable) + funcs->atomic_disable(crtc, old_crtc_state); + else if (funcs->disable) + funcs->disable(crtc); + else + funcs->dpms(crtc, DRM_MODE_DPMS_OFF); + } if (!(dev->irq_enabled && dev->num_crtcs)) continue; @@ -1093,7 +1095,7 @@ crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *old_state) funcs = crtc->helper_private; - if (new_crtc_state->enable && funcs->mode_set_nofb) { + if (new_crtc_state->enable && funcs && funcs->mode_set_nofb) { DRM_DEBUG_ATOMIC("modeset on [CRTC:%d:%s]\n", crtc->base.id, crtc->name); @@ -1197,7 +1199,7 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, funcs = crtc->helper_private; - if (new_crtc_state->enable) { + if (funcs && new_crtc_state->enable) { DRM_DEBUG_ATOMIC("enabling [CRTC:%d:%s]\n", crtc->base.id, crtc->name); @@ -2117,7 +2119,7 @@ int drm_atomic_helper_prepare_planes(struct drm_device *dev, funcs = plane->helper_private; - if (funcs->prepare_fb) { + if (funcs && funcs->prepare_fb) { ret = funcs->prepare_fb(plane, new_plane_state); if (ret) goto fail; @@ -2135,7 +2137,7 @@ int drm_atomic_helper_prepare_planes(struct drm_device *dev, funcs = plane->helper_private; - if (funcs->cleanup_fb) + if (funcs && funcs->cleanup_fb) funcs->cleanup_fb(plane, new_plane_state); } @@ -2412,7 +2414,7 @@ void drm_atomic_helper_cleanup_planes(struct drm_device *dev, funcs = plane->helper_private; - if (funcs->cleanup_fb) + if (funcs && funcs->cleanup_fb) funcs->cleanup_fb(plane, plane_state); } } diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c index 527743394150..42507aa7f763 100644 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@ -272,9 +272,9 @@ drm_helper_probe_detect_ctx(struct drm_connector *connector, bool force) retry: ret = drm_modeset_lock(&connector->dev->mode_config.connection_mutex, &ctx); if (!ret) { - if (funcs->detect_ctx) + if (funcs && funcs->detect_ctx) ret = funcs->detect_ctx(connector, &ctx, force); - else if (connector->funcs->detect) + else if (connector->funcs && connector->funcs->detect) ret = connector->funcs->detect(connector, force); else ret = connector_status_connected; @@ -320,9 +320,9 @@ drm_helper_probe_detect(struct drm_connector *connector, if (ret) return ret; - if (funcs->detect_ctx) + if (funcs && funcs->detect_ctx) return funcs->detect_ctx(connector, ctx, force); - else if (connector->funcs->detect) + else if (connector->funcs && connector->funcs->detect) return connector->funcs->detect(connector, force); else return connector_status_connected; @@ -480,7 +480,8 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector, goto prune; } - count = (*connector_funcs->get_modes)(connector); + if (connector_funcs && connector_funcs->get_modes) + count = (*connector_funcs->get_modes)(connector); if (count == 0 && connector->status == connector_status_connected) count = drm_add_modes_noedid(connector, 1024, 768);