[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20241023143235.2982363-1-sashal@kernel.org>
Date: Wed, 23 Oct 2024 10:32:22 -0400
From: Sasha Levin <sashal@...nel.org>
To: linux-kernel@...r.kernel.org,
stable@...r.kernel.org
Cc: Pedro Falcato <pedro.falcato@...il.com>,
syzbot+3c5d43e97993e1fa612b@...kaller.appspotmail.com,
Dominique Martinet <asmadeus@...ewreck.org>,
Sasha Levin <sashal@...nel.org>,
ericvh@...nel.org,
lucho@...kov.net,
v9fs@...ts.linux.dev
Subject: [PATCH AUTOSEL 5.15 01/10] 9p: Avoid creating multiple slab caches with the same name
From: Pedro Falcato <pedro.falcato@...il.com>
[ 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 <pedro.falcato@...il.com>
Reported-by: syzbot+3c5d43e97993e1fa612b@...kaller.appspotmail.com
Message-ID: <20240807094725.2193423-1-pedro.falcato@...il.com>
Signed-off-by: Dominique Martinet <asmadeus@...ewreck.org>
Signed-off-by: Sasha Levin <sashal@...nel.org>
---
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 bf29462c919bb..03fb36d938c70 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -1005,6 +1005,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(*clnt), GFP_KERNEL);
@@ -1057,15 +1058,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
Powered by blists - more mailing lists