From patchwork Tue Aug 11 12:23:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Inki Dae X-Patchwork-Id: 6992091 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4D4BCC05AC for ; Tue, 11 Aug 2015 12:23:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8016E205C2 for ; Tue, 11 Aug 2015 12:23:57 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 2BD7C205C1 for ; Tue, 11 Aug 2015 12:23:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 534F86E6CF; Tue, 11 Aug 2015 05:23:55 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout1.samsung.com (mailout1.samsung.com [203.254.224.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 55FB06E6D6 for ; Tue, 11 Aug 2015 05:23:53 -0700 (PDT) Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NSX008CR3RRFSA0@mailout1.samsung.com> for dri-devel@lists.freedesktop.org; Tue, 11 Aug 2015 21:23:51 +0900 (KST) Received: from epcpsbgm2new.samsung.com ( [172.20.52.112]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id 69.94.24422.659E9C55; Tue, 11 Aug 2015 21:23:50 +0900 (KST) X-AuditID: cbfee68f-f793b6d000005f66-b3-55c9e9560c66 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id DD.54.07062.659E9C55; Tue, 11 Aug 2015 21:23:50 +0900 (KST) Received: from localhost.localdomain ([10.252.83.67]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NSX0079R3RQPQH0@mmp2.samsung.com>; Tue, 11 Aug 2015 21:23:50 +0900 (KST) From: Inki Dae To: dri-devel@lists.freedesktop.org Subject: [PATCH v2] drm/atomic: fix null pointer access to mode_fixup callback Date: Tue, 11 Aug 2015 21:23:49 +0900 Message-id: <1439295829-10395-1-git-send-email-inki.dae@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrFLMWRmVeSWpSXmKPExsWyRsSkQDfs5clQgykzbCx6z51kslj48C6z xZWv79ksJt2fwGLxfOEPZgdWj73fFrB47Jx1l91j+7cHrB73u48zefRtWcUYwBrFZZOSmpNZ llqkb5fAlbH+ciNzwXn2isV3OpkbGBezdTFyckgImEhMPdfGDmGLSVy4tx4ozsUhJLCCUWL1 hx52mKLec6cYIRKzGCVe3dvOBOF8Z5Q4OuUII0gVm4CqxMQV98HGiggoS/yduAosziyQIjH5 1HmwScICfhJbLzSBxVmA6nsOvAGr5xVwkVg+6wPUNjmJk8cms0LY79kk5l+KhagXkPg2+RBL FyMHUFxWYtMBZogSSYmDK26wTGAUXMDIsIpRNLUguaA4Kb3IWK84Mbe4NC9dLzk/dxMjMEhP /3vWv4Px7gHrQ4wCHIxKPLyMbSdDhVgTy4orcw8xmgJtmMgsJZqcD4yFvJJ4Q2MzIwtTE1Nj I3NLMyVx3oVSP4OFBNITS1KzU1MLUovii0pzUosPMTJxcEo1MK7w/fmxzm7C1Enxs3KiWI4b dvmEdsvUcm3mjFju8Gjau2uzW68YbwpON6xkPiFov2d2eGvE/Y291xmfGCgk8EX+Tw5KSeS1 Kv6UwjNv4e3Aiwcdd7FEcCSkN+2bKLl7BdP5AM9Z0pOOSGy/orNSc+YxVmeRDWtYD7ZM6JTw sJC49fbKDI2Dz5RYijMSDbWYi4oTAZH9SOJNAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgkeLIzCtJLcpLzFFi42I5/e+xoG7Yy5OhBmsvmFv0njvJZLHw4V1m iytf37NZTLo/gcXi+cIfzA6sHnu/LWDx2DnrLrvH9m8PWD3udx9n8ujbsooxgDWqgdEmIzUx JbVIITUvOT8lMy/dVsk7ON453tTMwFDX0NLCXEkhLzE31VbJxSdA1y0zB2i9kkJZYk4pUCgg sbhYSd8O04TQEDddC5jGCF3fkCC4HiMDNJCwhjFj/eVG5oLz7BWL73QyNzAuZuti5OSQEDCR 6D13ihHCFpO4cG89UJyLQ0hgFqPEq3vbmSCc74wSR6ccAatiE1CVmLjiPli3iICyxN+Jq8Di zAIpEpNPnWcHsYUF/CS2XmgCi7MA1fcceANWzyvgIrF81gd2iG1yEiePTWadwMi9gJFhFaNE akFyQXFSeq5RXmq5XnFibnFpXrpecn7uJkZwLDyT3sF4eJf7IUYBDkYlHl4Bz5OhQqyJZcWV uYcYJTiYlUR4OU4DhXhTEiurUovy44tKc1KLDzGaAh0wkVlKNDkfGKd5JfGGxiZmRpZG5oYW RsbmSuK8+iabQoUE0hNLUrNTUwtSi2D6mDg4pRoYpzgYPinZ6aTH39D6S/L3lHy/1UUz9B9+ Kz5ebxDE+uTpXu3jJzctL1Cb6lF4r8JQb+bfwgmpW2cas7s/rdpot2zLQ8alm99k7wqVfeq3 TF99e0O48cElS6LfLQ/J1L3+5Erz7JXH7vfOKH9/3sBuVZPJhVu5JtuuHZe8c/6JY7Q9s/b8 Q+FWYkosxRmJhlrMRcWJAF5QjwqbAgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: daniel.vetter@ffwll.ch X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch fixes null pointer access incurred when encoder driver didn't set its own mode_fixup callback. mode_fixup callback shoudn't be called if the callback of drm_encoder_helper_funcs is NULL. Changelog v2: - change it to else if Signed-off-by: Inki Dae Reviewed-by: Maarten Lankhorst --- drivers/gpu/drm/drm_atomic_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 5b59d5ad..c25bacb 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -298,7 +298,7 @@ mode_fixup(struct drm_atomic_state *state) encoder->base.id, encoder->name); return ret; } - } else { + } else if (funcs->mode_fixup) { ret = funcs->mode_fixup(encoder, &crtc_state->mode, &crtc_state->adjusted_mode); if (!ret) {