From patchwork Sat Jul 7 09:22:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devendra Naga X-Patchwork-Id: 1168561 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id DAB383FC36 for ; Sat, 7 Jul 2012 09:32:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3D6A79EC6D for ; Sat, 7 Jul 2012 02:32:55 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pb0-f49.google.com (mail-pb0-f49.google.com [209.85.160.49]) by gabe.freedesktop.org (Postfix) with ESMTP id AD0529ECEF for ; Sat, 7 Jul 2012 02:22:25 -0700 (PDT) Received: by pbbrq13 with SMTP id rq13so17878363pbb.36 for ; Sat, 07 Jul 2012 02:22:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=Q4i4DjZX3dEaQ8kXMB0jJeOFniVCosdnssvmPwpK16Q=; b=q+jER6idJMTxeHhXP8bVVqbiUNE8lvTs8aY9y/71WSG3rnyocsgsB02H8cLXIzWVxu HRCqBn6QbuNYPg7h6U7pHYX53gF6JeZqjY7mjwXpdfztuln1RIbYYtedBvzdoyWR/HM9 +YUA+kTVBWl1NKHw+TleyLkOlaHqVE1P9RECHvi0GyUsNOhVb2IumojerNFYavSQyCNi e3/mBIAjG3HXYKYQiiQHlQho+x2kdzY0Ev3dZfcJF0XmCKi+qtunSeqw4CnvMzEHiKNO In8i11t1uh/BsQr66X5CWnU8hDf4qoMtGbNdUhBmU/vLvXE3a91HcibQO/s7W2iqwzqm z5oQ== Received: by 10.68.195.167 with SMTP id if7mr43828713pbc.16.1341652945344; Sat, 07 Jul 2012 02:22:25 -0700 (PDT) Received: from localhost.localdomain ([122.172.213.131]) by mx.google.com with ESMTPS id rg10sm23569814pbc.54.2012.07.07.02.22.22 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 07 Jul 2012 02:22:24 -0700 (PDT) From: Devendra Naga To: David Airlie , Dave Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/mgag200: fix null pointer dereference Date: Sat, 7 Jul 2012 14:52:15 +0530 Message-Id: <1341652935-19188-1-git-send-email-devendra.aaru@gmail.com> X-Mailer: git-send-email 1.7.9.5 X-Mailman-Approved-At: Sat, 07 Jul 2012 02:27:06 -0700 Cc: Devendra Naga X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org we are referencing the pointer after doing alloc_apertures, as alloc_apertures kzallocs, the kzalloc may fail and we get a NULL. so we need to check for NULL before we dereference this pointer Signed-off-by: Devendra Naga --- drivers/gpu/drm/mgag200/mgag200_drv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c index 93e832d..ea1024d 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.c +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c @@ -47,6 +47,9 @@ static void mgag200_kick_out_firmware_fb(struct pci_dev *pdev) bool primary = false; ap = alloc_apertures(1); + if (!ap) + return; + ap->ranges[0].base = pci_resource_start(pdev, 0); ap->ranges[0].size = pci_resource_len(pdev, 0);