From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 E0A1C18873F; Fri, 15 Nov 2024 06:58:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731653902; cv=none; b=j/ZJYWJeH6nFE2TNAgOQwUPuLUQBhqecW+ZSLAKWeX4D5of/flCv9qAGlpTpcBfsiO5Cl10pETOLUrK9zzeB394S6i/KSO3NeKbfHV/FfWHrvjOdwXQ/bop+e7yTtr4v6Na2e/QLIgO51XFRlZcVVe2Cv8wFH6DOOydlDnCmUz4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731653902; c=relaxed/simple; bh=5GIbT6hagRxlGPfvdCQ9RbsT32DM1qlmwTOlEWyi+FE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XddfS23hhgWejEbw625ZD1NcGGoQ22GMGtWHUFbOWYuS4ZMpEdNZfVDs3O6DG6grmrzEKAmrhgfZeb7OYlgCtULrfrZONLxF0XfuCmHHrPlimDzM6/+6wGmwt2cBhGKpI0JnnGtYle/8/5O0zLbNM653g/V8LuKUdTmWs95Dd/g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=q66ZLVrx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="q66ZLVrx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4D3EAC4CED0; Fri, 15 Nov 2024 06:58:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1731653901; bh=5GIbT6hagRxlGPfvdCQ9RbsT32DM1qlmwTOlEWyi+FE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q66ZLVrxqXwK5Gs9fbSAUSauWsp0gmU6YVMWzNqtzE0mk+wAgKLHgacRi0GqRpupU BTaLlsUAEXHxcLRt4A2IvO2m9mJgLpEH9aSC8865CBsGWlzpStBaVcniOC/gpgNncU hoAdvpYAgso24VUgYr6B0YVR5su72AOmTqU0jfPg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pedro Falcato , syzbot+3c5d43e97993e1fa612b@syzkaller.appspotmail.com, Dominique Martinet , Sasha Levin Subject: [PATCH 5.10 70/82] 9p: Avoid creating multiple slab caches with the same name Date: Fri, 15 Nov 2024 07:38:47 +0100 Message-ID: <20241115063728.073397195@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241115063725.561151311@linuxfoundation.org> References: <20241115063725.561151311@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pedro Falcato [ Upstream commit 79efebae4afc2221fa814c3cae001bede66ab259 ] In the spirit of [1], avoid creating multiple slab caches with the same name. Instead, add the dev_name into the mix. [1]: https://lore.kernel.org/all/20240807090746.2146479-1-pedro.falcato@gmail.com/ Signed-off-by: Pedro Falcato Reported-by: syzbot+3c5d43e97993e1fa612b@syzkaller.appspotmail.com Message-ID: <20240807094725.2193423-1-pedro.falcato@gmail.com> Signed-off-by: Dominique Martinet Signed-off-by: Sasha Levin --- net/9p/client.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/net/9p/client.c b/net/9p/client.c index 0fa324e8b2451..2668a1a67c8a8 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -1006,6 +1006,7 @@ struct p9_client *p9_client_create(const char *dev_name, char *options) int err; struct p9_client *clnt; char *client_id; + char *cache_name; err = 0; clnt = kmalloc(sizeof(struct p9_client), GFP_KERNEL); @@ -1058,15 +1059,22 @@ struct p9_client *p9_client_create(const char *dev_name, char *options) if (err) goto close_trans; + cache_name = kasprintf(GFP_KERNEL, "9p-fcall-cache-%s", dev_name); + if (!cache_name) { + err = -ENOMEM; + goto close_trans; + } + /* P9_HDRSZ + 4 is the smallest packet header we can have that is * followed by data accessed from userspace by read */ clnt->fcall_cache = - kmem_cache_create_usercopy("9p-fcall-cache", clnt->msize, + kmem_cache_create_usercopy(cache_name, clnt->msize, 0, 0, P9_HDRSZ + 4, clnt->msize - (P9_HDRSZ + 4), NULL); + kfree(cache_name); return clnt; close_trans: -- 2.43.0