From patchwork Thu Jul 10 21:53:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oded Gabbay X-Patchwork-Id: 4528711 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 15AA99F4BC for ; Thu, 10 Jul 2014 23:34:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5870A201DE for ; Thu, 10 Jul 2014 23:34:22 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 8F86D201D5 for ; Thu, 10 Jul 2014 23:34:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0DFBF6E7C1; Thu, 10 Jul 2014 16:33:26 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-we0-f173.google.com (mail-we0-f173.google.com [74.125.82.173]) by gabe.freedesktop.org (Postfix) with ESMTP id C1F176E0B0 for ; Thu, 10 Jul 2014 14:55:33 -0700 (PDT) Received: by mail-we0-f173.google.com with SMTP id t60so208124wes.18 for ; Thu, 10 Jul 2014 14:55:33 -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:in-reply-to:references; bh=EWXBsMtiAl1dgszje0E+RWagG61v7mzXpGj5xDCHdZQ=; b=oWWIV8NHGEmtcH+nTCdO1YA6eMfFXGf7JvAg1ZzW12O28Zml95vE5OlZK+vZ4ilGQp PfXMBhUeRO/6CUI1lfCZq/x79wfRPOPT36AKhA231/a44Nd4z5TF0VWlV9M5Uojv7rMr ADJn9sc8cCSgfFoCsqvvFzIMZr1gBddg4c8YY0IvqfacvSBqZ8gsH7c+RPY+E3GBeqCh JF5x89iLpHhkSScOJXPgeimB2H+YPG0ezwEjpRvi1LacpPEuI3muliqbX4kJrvkws0un BSJCP9dyFFj0whtjWQ/ScuDTihdLr6EJOm9cNJUxNaSEOTSNx6OXNokCE52/93xFU7Tm wsHw== X-Received: by 10.180.207.48 with SMTP id lt16mr22628985wic.32.1405029332980; Thu, 10 Jul 2014 14:55:32 -0700 (PDT) Received: from localhost.localdomain ([77.127.59.49]) by mx.google.com with ESMTPSA id pq9sm831097wjc.35.2014.07.10.14.55.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Jul 2014 14:55:32 -0700 (PDT) From: Oded Gabbay X-Google-Original-From: Oded Gabbay To: David Airlie , Alex Deucher , Jerome Glisse Subject: [PATCH 43/83] hsa/radeon: NULL pointer dereference bug workaround Date: Fri, 11 Jul 2014 00:53:59 +0300 Message-Id: <1405029279-6894-15-git-send-email-oded.gabbay@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1405029279-6894-1-git-send-email-oded.gabbay@amd.com> References: <1405029279-6894-1-git-send-email-oded.gabbay@amd.com> X-Mailman-Approved-At: Thu, 10 Jul 2014 16:33:12 -0700 Cc: Andrew Lewycky , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Alexey Skidanov X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 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.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_WEB, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 From: Alexey Skidanov Signed-off-by: Alexey Skidanov Signed-off-by: Oded Gabbay --- drivers/gpu/hsa/radeon/kfd_sched_cik_static.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/hsa/radeon/kfd_sched_cik_static.c b/drivers/gpu/hsa/radeon/kfd_sched_cik_static.c index 7573d25..7ee8125 100644 --- a/drivers/gpu/hsa/radeon/kfd_sched_cik_static.c +++ b/drivers/gpu/hsa/radeon/kfd_sched_cik_static.c @@ -627,8 +627,10 @@ static void cik_static_deregister_process(struct kfd_scheduler *scheduler, struct cik_static_private *priv = kfd_scheduler_to_private(scheduler); struct cik_static_process *pp = kfd_process_to_private(scheduler_process); - release_vmid(priv, pp->vmid); - kfree(pp); + if (priv && pp) { + release_vmid(priv, pp->vmid); + kfree(pp); + } } static bool allocate_hqd(struct cik_static_private *priv, unsigned int *queue)