From: Rishabh Bhatnagar <risbhat@amazon.com>
To: <gregkh@linuxfoundation.org>, <pc@cjr.nz>
Cc: <stable@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-cifs@vger.kernel.org>, Aurelien Aptel <aaptel@suse.com>,
Steve French <stfrench@microsoft.com>,
Rishabh Bhatnagar <risbhat@amazon.com>
Subject: [PATCH 5.4 2/5] cifs: Get rid of kstrdup_const()'d paths
Date: Fri, 23 Jun 2023 21:34:03 +0000 [thread overview]
Message-ID: <20230623213406.5596-3-risbhat@amazon.com> (raw)
In-Reply-To: <20230623213406.5596-1-risbhat@amazon.com>
From: "Paulo Alcantara (SUSE)" <pc@cjr.nz>
commit 199c6bdfb04b71d88a7765e08285885fbca60df4 upstream.
The DFS cache API is mostly used with heap allocated strings.
Signed-off-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
Reviewed-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Rishabh Bhatnagar <risbhat@amazon.com>
---
fs/cifs/dfs_cache.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/cifs/dfs_cache.c b/fs/cifs/dfs_cache.c
index 4a241979c7c7..3ca65051b55c 100644
--- a/fs/cifs/dfs_cache.c
+++ b/fs/cifs/dfs_cache.c
@@ -131,7 +131,7 @@ static inline void flush_cache_ent(struct cache_entry *ce)
return;
hlist_del_init_rcu(&ce->hlist);
- kfree_const(ce->path);
+ kfree(ce->path);
free_tgts(ce);
cache_count--;
call_rcu(&ce->rcu, free_cache_entry);
@@ -420,7 +420,7 @@ static struct cache_entry *alloc_cache_entry(const char *path,
if (!ce)
return ERR_PTR(-ENOMEM);
- ce->path = kstrdup_const(path, GFP_KERNEL);
+ ce->path = kstrndup(path, strlen(path), GFP_KERNEL);
if (!ce->path) {
kmem_cache_free(cache_slab, ce);
return ERR_PTR(-ENOMEM);
@@ -430,7 +430,7 @@ static struct cache_entry *alloc_cache_entry(const char *path,
rc = copy_ref_data(refs, numrefs, ce, NULL);
if (rc) {
- kfree_const(ce->path);
+ kfree(ce->path);
kmem_cache_free(cache_slab, ce);
ce = ERR_PTR(rc);
}
--
2.40.1
next prev parent reply other threads:[~2023-06-23 21:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-23 21:34 [PATCH 5.4 0/5] CIFS DFS fixes for 5.4 Rishabh Bhatnagar
2023-06-23 21:34 ` [PATCH 5.4 1/5] cifs: Clean up DFS referral cache Rishabh Bhatnagar
2023-06-23 21:34 ` Rishabh Bhatnagar [this message]
2023-06-25 15:38 ` [PATCH 5.4 2/5] cifs: Get rid of kstrdup_const()'d paths David Laight
2023-06-25 16:58 ` Paulo Alcantara
2023-06-23 21:34 ` [PATCH 5.4 3/5] cifs: Introduce helpers for finding TCP connection Rishabh Bhatnagar
2023-06-26 6:04 ` Shyam Prasad N
2023-06-26 6:13 ` Greg KH
2023-06-26 6:30 ` Shyam Prasad N
2023-06-23 21:34 ` [PATCH 5.4 4/5] cifs: Merge is_path_valid() into get_normalized_path() Rishabh Bhatnagar
2023-06-23 21:34 ` [PATCH 5.4 5/5] cifs: Fix potential deadlock when updating vol in cifs_reconnect() Rishabh Bhatnagar
2023-06-23 22:08 ` [PATCH 5.4 0/5] CIFS DFS fixes for 5.4 Paulo Alcantara
2023-06-24 14:10 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230623213406.5596-3-risbhat@amazon.com \
--to=risbhat@amazon.com \
--cc=aaptel@suse.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pc@cjr.nz \
--cc=stable@vger.kernel.org \
--cc=stfrench@microsoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.