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 D5587C433EF for ; Tue, 12 Apr 2022 01:09:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343985AbiDLBLf (ORCPT ); Mon, 11 Apr 2022 21:11:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349188AbiDLA7g (ORCPT ); Mon, 11 Apr 2022 20:59:36 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02B9037ABE; Mon, 11 Apr 2022 17:52:52 -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 3CF2F60B2E; Tue, 12 Apr 2022 00:52:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4EE82C385A9; Tue, 12 Apr 2022 00:52:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649724771; bh=btq5PtiLLaSG5Z1o+XKlEstXkapvQO9CjumUPjapG5k=; h=From:To:Cc:Subject:Date:From; b=LHUVZdbyFo9Gh4r2JXYA6w/eaOrSq7wGDl21+h2hy8cLNK/4Z9ni/FQiXgXIFLtT7 1DdERbV6zc+33nxHPBSrsS5KltyKmnSlD27+Vig03SX4DPMYQQXb3oW0SqhqX2gJCf C7mfD0bhu+ZyPAWuCv3FOgBOXI5CcmnsoRKRy5cJ75UhB4XTsNXxIym8aLZZmOPXRS qX2GSYlStk7K5P4axUKSFZbru+CEBjstDYlyBpurYd30yt85YeJeVI9wdYvcnlsJ/0 c5LDiKj+5F0cH3TonbGrC6RUW/Wbta5E3snZ0vIdSWe583QBamRd2ah6FSSDF+e7ty UJ9jbkFhRiBow== 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.9 1/7] drm/amdkfd: Check for potential null return of kmalloc_array() Date: Mon, 11 Apr 2022 20:52:42 -0400 Message-Id: <20220412005248.351701-1-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 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 6a3470f84998..732713ff3190 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