From patchwork Fri Mar 6 05:45:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Praveen Paneri X-Patchwork-Id: 5950071 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9AB269F373 for ; Fri, 6 Mar 2015 05:42:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D99C5202BE for ; Fri, 6 Mar 2015 05:42:46 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 03EC6202B4 for ; Fri, 6 Mar 2015 05:42:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 695846E844; Thu, 5 Mar 2015 21:42:45 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 8529D6E844 for ; Thu, 5 Mar 2015 21:42:44 -0800 (PST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP; 05 Mar 2015 21:37:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,351,1422950400"; d="scan'208";a="661282255" Received: from intel-desktop.iind.intel.com ([10.223.82.37]) by orsmga001.jf.intel.com with ESMTP; 05 Mar 2015 21:42:42 -0800 From: Praveen Paneri To: intel-gfx@lists.freedesktop.org Date: Fri, 6 Mar 2015 11:15:10 +0530 Message-Id: <1425620714-21703-6-git-send-email-praveen.paneri@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1425620714-21703-1-git-send-email-praveen.paneri@intel.com> References: <1425620714-21703-1-git-send-email-praveen.paneri@intel.com> Cc: deepak.s@intel.com, praveen.paneri@intel.com Subject: [Intel-gfx] [PATCH 5/9] external/drm: Validate function return value X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 Return value of drmHashCreate() and drmGetEntry() functions can be NULL. It should be validated before being used. Signed-off-by: Praveen Paneri --- xf86drm.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/xf86drm.c b/xf86drm.c index 73e0665..60663d4 100644 --- a/xf86drm.c +++ b/xf86drm.c @@ -186,18 +186,23 @@ static unsigned long drmGetKeyFromFd(int fd) drmHashEntry *drmGetEntry(int fd) { unsigned long key = drmGetKeyFromFd(fd); - void *value; + void *value = NULL; drmHashEntry *entry; if (!drmHashTable) drmHashTable = drmHashCreate(); - if (drmHashLookup(drmHashTable, key, &value)) { + if (drmHashTable && drmHashLookup(drmHashTable, key, &value)) { entry = drmMalloc(sizeof(*entry)); entry->fd = fd; entry->f = NULL; entry->tagTable = drmHashCreate(); - drmHashInsert(drmHashTable, key, entry); + if (entry->tagTable) { + drmHashInsert(drmHashTable, key, entry); + } else { + drmFree(entry); + entry = NULL; + } } else { entry = value; } @@ -1099,6 +1104,8 @@ int drmClose(int fd) { unsigned long key = drmGetKeyFromFd(fd); drmHashEntry *entry = drmGetEntry(fd); + if(!entry) + return -ENOMEM; drmHashDestroy(entry->tagTable); entry->fd = 0; @@ -2088,7 +2095,7 @@ int drmAddContextTag(int fd, drm_context_t context, void *tag) { drmHashEntry *entry = drmGetEntry(fd); - if (drmHashInsert(entry->tagTable, context, tag)) { + if (entry && drmHashInsert(entry->tagTable, context, tag)) { drmHashDelete(entry->tagTable, context); drmHashInsert(entry->tagTable, context, tag); } @@ -2099,13 +2106,18 @@ int drmDelContextTag(int fd, drm_context_t context) { drmHashEntry *entry = drmGetEntry(fd); - return drmHashDelete(entry->tagTable, context); + if (entry) + return drmHashDelete(entry->tagTable, context); + return -ENOMEM; } void *drmGetContextTag(int fd, drm_context_t context) { - drmHashEntry *entry = drmGetEntry(fd); void *value; + drmHashEntry *entry = drmGetEntry(fd); + + if (!entry) + return NULL; if (drmHashLookup(entry->tagTable, context, &value)) return NULL;