From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E520BC433F5 for ; Tue, 12 Apr 2022 01:10:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233200AbiDLBMT (ORCPT ); Mon, 11 Apr 2022 21:12:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47476 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348294AbiDLA7S (ORCPT ); Mon, 11 Apr 2022 20:59:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5CDA34B8B; Mon, 11 Apr 2022 17:52:33 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5741960B2B; Tue, 12 Apr 2022 00:52:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9F833C385AA; Tue, 12 Apr 2022 00:52:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649724746; bh=locvj7Sw4TaJkfgrTFOol/+10RC6ZU07zfP39idlbHQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qukbT9l03oLxFHgZLytHWhTiaojaj38PYHJUauGpFV3xe50Nf1qrs827qGGlEU/p+ C/zjC8Y2FGBlP4wyKgGGmBdYpD0Z+fvIuXs79ptQnCPMbpEw17o/4iQCfdl1rPY8Wf P3fnM2NvoFqUobACsQlKhq3x/4WixF9ILmcesYCyFmDVR/RaP6pN6yqafZdFZvHai6 vOB97ZeLyBj83zpzdSTv7KkjbK1dXIjP67LKNOZMHpa3PgzmIeb24GSCMlYZ88uuhX DQNS+08GvaLn3QA+L13OWRPGddAeZlnJ49J9OKBiKNSyel5E/TuxoDBh0Ta+9abvU6 NrL/f3xHxXSRA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: QintaoShen , Alex Deucher , Sasha Levin , Felix.Kuehling@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@linux.ie, daniel@ffwll.ch, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.14 02/11] drm/amdkfd: Check for potential null return of kmalloc_array() Date: Mon, 11 Apr 2022 20:52:11 -0400 Message-Id: <20220412005222.351554-2-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412005222.351554-1-sashal@kernel.org> References: <20220412005222.351554-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: QintaoShen [ Upstream commit ebbb7bb9e80305820dc2328a371c1b35679f2667 ] As the kmalloc_array() may return null, the 'event_waiters[i].wait' would lead to null-pointer dereference. Therefore, it is better to check the return value of kmalloc_array() to avoid this confusion. Signed-off-by: QintaoShen Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdkfd/kfd_events.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_events.c b/drivers/gpu/drm/amd/amdkfd/kfd_events.c index 944abfad39c1..1d8dd81dfc70 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_events.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_events.c @@ -607,6 +607,8 @@ static struct kfd_event_waiter *alloc_event_waiters(uint32_t num_events) event_waiters = kmalloc_array(num_events, sizeof(struct kfd_event_waiter), GFP_KERNEL); + if (!event_waiters) + return NULL; for (i = 0; (event_waiters) && (i < num_events) ; i++) { INIT_LIST_HEAD(&event_waiters[i].waiters); -- 2.35.1