From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D27EC366075; Wed, 20 May 2026 17:17:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779297469; cv=none; b=oTmlhxkOZMldGvz8mNRU+5kNCHOwRL6WuftuFfDz3fuhwq9ijdSJTf5GvFAh9b3EzmdfEaUbib+NN2dCVidkGLAmZR7cxb78jUSxKuOe99AbTMapG4TauG5lGhuaPk3XHfzkh9bGInQXWk/EklcTUq9ezw+HBi3GJvUW/PxoqFU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779297469; c=relaxed/simple; bh=TZf5bVz9MBsFyfhoQewSOk8zs6Nxgoz0rUYzczHkGig=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TN+dPa7rwOYdN9mFMmp9wlsORJb9xp/FfGMzvcjmqEJqYdSJlSuXKn4r0o2Z9oIAlM7S3XwNan3KeuTX/TU5IT0aVuapLgsAzxMVKVkqH+gxxMoeZcpA6wGbjULssy3z5gdItk2TgMKUSVS1aZxIhOoQZQWMVtNFm0WwwPg+C08= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dQlK6SL1; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="dQlK6SL1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 42DCB1F000E9; Wed, 20 May 2026 17:17:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779297467; bh=Xg9sSSWa+3enJq6O+W5IilsZ8SU04pFja3AVLpRHr0k=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dQlK6SL1aXKdiKZVVTbBdZOewRmXUQRT5WVv7tTZE3jWrnyJs15YXe8BaSaMtfDFQ t1mu2tShFOlu1OreU+C1a4biPUKzlwRdaxLw3jQK4WL1kReoNQpxMoNj7ke8Oz2wXA aqOUJGKzHDZwe/KxZ0zvS9yvir2mK8Vsg61gEDA8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Cole Leavitt , Kees Cook , Sasha Levin Subject: [PATCH 6.18 009/957] pstore/ram: fix resource leak when ioremap() fails Date: Wed, 20 May 2026 18:08:12 +0200 Message-ID: <20260520162134.764327286@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162134.554764788@linuxfoundation.org> References: <20260520162134.554764788@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Cole Leavitt [ Upstream commit 2ddb69f686ef7a621645e97fc7329c50edf5d0e5 ] In persistent_ram_iomap(), ioremap() or ioremap_wc() may return NULL on failure. Currently, if this happens, the function returns NULL without releasing the memory region acquired by request_mem_region(). This leads to a resource leak where the memory region remains reserved but unusable. Additionally, the caller persistent_ram_buffer_map() handles NULL correctly by returning -ENOMEM, but without this check, a NULL return combined with request_mem_region() succeeding leaves resources in an inconsistent state. This is the ioremap() counterpart to commit 05363abc7625 ("pstore: ram_core: fix incorrect success return when vmap() fails") which fixed a similar issue in the vmap() path. Fixes: 404a6043385d ("staging: android: persistent_ram: handle reserving and mapping memory") Signed-off-by: Cole Leavitt Link: https://patch.msgid.link/20260225235406.11790-1-cole@unwrap.rs Signed-off-by: Kees Cook Signed-off-by: Sasha Levin --- fs/pstore/ram_core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/pstore/ram_core.c b/fs/pstore/ram_core.c index 7b6d6378a3b87..95675d4bab141 100644 --- a/fs/pstore/ram_core.c +++ b/fs/pstore/ram_core.c @@ -489,6 +489,10 @@ static void *persistent_ram_iomap(phys_addr_t start, size_t size, else va = ioremap_wc(start, size); + /* We must release the mem region if ioremap fails. */ + if (!va) + release_mem_region(start, size); + /* * Since request_mem_region() and ioremap() are byte-granularity * there is no need handle anything special like we do when the -- 2.53.0