From patchwork Mon Jul 16 14:02:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Wiederhake X-Patchwork-Id: 1201101 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 8C9943FC33 for ; Mon, 16 Jul 2012 14:33:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8231A9E839 for ; Mon, 16 Jul 2012 07:33:23 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.23]) by gabe.freedesktop.org (Postfix) with SMTP id 456709E839 for ; Mon, 16 Jul 2012 07:29:35 -0700 (PDT) Received: (qmail invoked by alias); 16 Jul 2012 14:02:59 -0000 Received: from host-188-174-209-55.customer.m-online.net (EHLO localhost.localdomain) [188.174.209.55] by mail.gmx.net (mp031) with SMTP; 16 Jul 2012 16:02:59 +0200 X-Authenticated: #57610014 X-Provags-ID: V01U2FsdGVkX18HEbFuThQH7fqgaqLyYmmZls97TCkcsopS2v/TH/ qNLC09BYcCgqYR From: Tim Wiederhake To: dri-devel@lists.freedesktop.org Subject: [PATCH 5/8] Fix possible null pointer dereferences Date: Mon, 16 Jul 2012 16:02:49 +0200 Message-Id: <1342447372-21742-5-git-send-email-twied@gmx.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1342447372-21742-1-git-send-email-twied@gmx.net> References: <1342447372-21742-1-git-send-email-twied@gmx.net> X-Y-GMX-Trusted: 0 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 --- intel/intel_bufmgr_gem.c | 3 ++- intel/intel_decode.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c index 28f8887..8ca6d43 100644 --- a/intel/intel_bufmgr_gem.c +++ b/intel/intel_bufmgr_gem.c @@ -1338,13 +1338,14 @@ int drm_intel_gem_bo_map_unsynchronized(drm_intel_bo *bo) static int drm_intel_gem_bo_unmap(drm_intel_bo *bo) { - drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr; drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo; + drm_intel_bufmgr_gem *bufmgr_gem; int ret = 0; if (bo == NULL) return 0; + bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr; pthread_mutex_lock(&bufmgr_gem->lock); if (bo_gem->map_count <= 0) { diff --git a/intel/intel_decode.c b/intel/intel_decode.c index 19a8d36..e8daf6a 100644 --- a/intel/intel_decode.c +++ b/intel/intel_decode.c @@ -3893,7 +3893,7 @@ drm_intel_decode(struct drm_intel_decode *ctx) int ret; unsigned int index = 0; uint32_t devid; - int size = ctx->base_count * 4; + int size; void *temp; if (!ctx) @@ -3903,6 +3903,7 @@ drm_intel_decode(struct drm_intel_decode *ctx) * the batchbuffer. This lets us avoid a bunch of length * checking in statically sized packets. */ + size = ctx->base_count * 4; temp = malloc(size + 4096); memcpy(temp, ctx->base_data, size); memset((char *)temp + size, 0xd0, 4096);