From patchwork Sun Mar 3 07:53:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Duoming Zhou X-Patchwork-Id: 209283 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:fa17:b0:10a:f01:a869 with SMTP id ju23csp812658dyc; Sat, 2 Mar 2024 23:54:16 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWmpcp9nSPT00MB66FEaKkohGN8MASG2WeTnvbGcradxbO0zk4+aO6T/rrssA59edi2KLMpcE95DuVdIsfCnCoadB5WtA== X-Google-Smtp-Source: AGHT+IFpFl2c231UBNHxbDGlOfmFTjxXZFrFVNrcDS+irl3/4UW3LzVHu8E+7QLf+1j3EtoW27HZ X-Received: by 2002:a05:6e02:1a8c:b0:365:21f4:701f with SMTP id k12-20020a056e021a8c00b0036521f4701fmr8953397ilv.21.1709452456752; Sat, 02 Mar 2024 23:54:16 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709452456; cv=pass; d=google.com; s=arc-20160816; b=YhZTo+1LXClskFpC0ormAI29QO/tuw5yaGqPydpyfW2j7w7sOzxgwpN4xoRyPadWJg GlU8xOXhIpUfQV/0YwEicr2r4X1g2nCdMMF+6Z4nsmeCv7TIrqLjhIbXGdHM226Nwrp6 DMU2vfYTzvNuQS8zBRj9WZqih2G6XfOFoI12NW0HYUdfs/2Pszuz5tSpKqYOC7wXfrN2 BHrPQVDQk7jUfvAwZiSnqEgpk3MGpyeP638isSHr2NEAdfHrsh7az7unsfaHm+6UI/lJ BOW/+c01JYIiFALQWXo0OFS5InmYUGYBMQGl3vD4CnmcbYjkGkQNHu5nvJb3DIEGW6To UguA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-id:precedence:message-id:date :subject:cc:to:from; bh=Ibh1dgD7WGkaqLvxMekNca1H4TIR0waYtkjGzQsuBog=; fh=mxcPW+UaDzIYjEonpgPwLPFn/6KArSanplpBHSgHOb0=; b=i0anu2bjvrz9IlMO0magtc6kEOJrYFdgQXm51+xC0xdfJX4R2vRrNHM6Ee/CRp+lEn DPsmaORTzU53uzWhng6hTeh6zDzP++DcnRKTCMQzXVVoZV8Zt2a8BTvkCflPS5z/aLdX UPJMB2neaWSUQ6FGC39b3K+gUK3dWVgjforfuuGQeTEIbuDXEOzIMRrFP811uwq7iMHN WcpXVwn+9N43Mwf0EZ8vrN/isTspege9jztE7H7cyQnloL9irRZGNUo+x7RmsmXee4PX v6Csu6ZebLH9Ee8+ozWInqySlhWQ/iPHeZJVI1PGrpFkQauoDzpTlxhQkREX2jdKkrH6 7yVQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=zju.edu.cn); spf=pass (google.com: domain of linux-kernel+bounces-89668-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-89668-ouuuleilei=gmail.com@vger.kernel.org" Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id c26-20020a634e1a000000b005e270acf8f3si6441702pgb.748.2024.03.02.23.54.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Mar 2024 23:54:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-89668-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=zju.edu.cn); spf=pass (google.com: domain of linux-kernel+bounces-89668-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-89668-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 36CBBB225E7 for ; Sun, 3 Mar 2024 07:54:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4FA18AD27; Sun, 3 Mar 2024 07:53:56 +0000 (UTC) Received: from sgoci-sdnproxy-4.icoremail.net (sgoci-sdnproxy-4.icoremail.net [129.150.39.64]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0AE6C8F5D for ; Sun, 3 Mar 2024 07:53:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=129.150.39.64 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709452434; cv=none; b=RnV/1wsvESA6txcPQF6TF6IBu2oakjM/xvu0UNAj2/HN2VUeyjkr2AE4vWPQzwRiF55WzKjEM7Mf8u2Nl23fZZTZLt0hJrzasYaSI74Nkdk2e15Jzr2hp0NXO0DlYr2Le2GzpqnBJpv4mCR0eR9McrXzDjqjykW3eSkNFI+aFss= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709452434; c=relaxed/simple; bh=aJE/J1OJ5ZDl2zz2vpXR98OO8kPY5m2SyXGulSjHoUk=; h=From:To:Cc:Subject:Date:Message-Id; b=Fsq5qlaeu0pp9LRRL+Sn/U3e+e3I6DW02EsXtV/hrnBLjIeWEDkWDADMX/HtvemOBLRUTE3veS/iezPmheK8/TcZkR/y8UdhmtfvG2MWqviBBLFuJ+0mDc5iZHia7JuxO2RzKo6G4mgh58KvyWw+lg7LCpV9yt6IORsTWukeEps= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=zju.edu.cn; spf=pass smtp.mailfrom=zju.edu.cn; arc=none smtp.client-ip=129.150.39.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=zju.edu.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=zju.edu.cn Received: from ubuntu.localdomain (unknown [218.12.16.66]) by mail-app4 (Coremail) with SMTP id cS_KCgCHgH5pLORlzhHfAQ--.40720S2; Sun, 03 Mar 2024 15:53:29 +0800 (CST) From: Duoming Zhou To: linux-kernel@vger.kernel.org Cc: nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, daniel@ffwll.ch, airlied@gmail.com, dakr@redhat.com, lyude@redhat.com, kherbst@redhat.com, Duoming Zhou Subject: [PATCH] nouveau/dmem: handle kcalloc() allocation failure Date: Sun, 3 Mar 2024 15:53:12 +0800 Message-Id: <20240303075312.56349-1-duoming@zju.edu.cn> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: cS_KCgCHgH5pLORlzhHfAQ--.40720S2 X-Coremail-Antispam: 1UD129KBjvJXoW7trW5Aw4kur1fWF4UGF13CFg_yoW8ZF48pF WxGF1jyr42yayjqry8tF1kur4ayan3JayxKa9Fy3sI9a4rXFy7Z3y7Aa45WFWYqrW7CrWa qr4Dta43ZF4Ut3JanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkG14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4U JVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gc CE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E 2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJV W8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lc7CjxVAaw2AFwI0_ Jw0_GFyl42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67 AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIY rxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14 v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8 JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r4UYxBIdaVFxhVjvjDU0xZFpf9x0JUd-B_UUU UU= X-CM-SenderInfo: qssqjiasttq6lmxovvfxof0/1tbiAwIIAWXjdVMBCAAXs2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792490819486530883 X-GMAIL-MSGID: 1792490819486530883 The kcalloc() in nouveau_dmem_evict_chunk() will return null if the physical memory has run out. As a result, if we dereference src_pfns, dst_pfns or dma_addrs, the null pointer dereference bugs will happen. This patch uses stack variables to replace the kcalloc(). Fixes: 249881232e14 ("nouveau/dmem: evict device private memory during release") Signed-off-by: Duoming Zhou --- drivers/gpu/drm/nouveau/nouveau_dmem.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c index 12feecf71e7..9a578262c6d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dmem.c +++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c @@ -374,13 +374,13 @@ static void nouveau_dmem_evict_chunk(struct nouveau_dmem_chunk *chunk) { unsigned long i, npages = range_len(&chunk->pagemap.range) >> PAGE_SHIFT; - unsigned long *src_pfns, *dst_pfns; - dma_addr_t *dma_addrs; + unsigned long src_pfns[npages], dst_pfns[npages]; + dma_addr_t dma_addrs[npages]; struct nouveau_fence *fence; - src_pfns = kcalloc(npages, sizeof(*src_pfns), GFP_KERNEL); - dst_pfns = kcalloc(npages, sizeof(*dst_pfns), GFP_KERNEL); - dma_addrs = kcalloc(npages, sizeof(*dma_addrs), GFP_KERNEL); + memset(src_pfns, 0, npages); + memset(dst_pfns, 0, npages); + memset(dma_addrs, 0, npages); migrate_device_range(src_pfns, chunk->pagemap.range.start >> PAGE_SHIFT, npages); @@ -406,11 +406,8 @@ nouveau_dmem_evict_chunk(struct nouveau_dmem_chunk *chunk) migrate_device_pages(src_pfns, dst_pfns, npages); nouveau_dmem_fence_done(&fence); migrate_device_finalize(src_pfns, dst_pfns, npages); - kfree(src_pfns); - kfree(dst_pfns); for (i = 0; i < npages; i++) dma_unmap_page(chunk->drm->dev->dev, dma_addrs[i], PAGE_SIZE, DMA_BIDIRECTIONAL); - kfree(dma_addrs); } void