From: "Paulo Alcantara (SUSE)" <pc@cjr.nz>
To: smfrench@gmail.com
Cc: linux-cifs@vger.kernel.org, "Paulo Alcantara (SUSE)" <pc@cjr.nz>
Subject: [PATCH v3 07/11] cifs: Merge is_path_valid() into get_normalized_path()
Date: Tue, 26 Nov 2019 21:36:30 -0300 [thread overview]
Message-ID: <20191127003634.14072-8-pc@cjr.nz> (raw)
In-Reply-To: <20191127003634.14072-1-pc@cjr.nz>
Just do the trivial path validation in get_normalized_path().
Signed-off-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
---
fs/cifs/dfs_cache.c | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/fs/cifs/dfs_cache.c b/fs/cifs/dfs_cache.c
index e889608e5e13..1d1f7c03931b 100644
--- a/fs/cifs/dfs_cache.c
+++ b/fs/cifs/dfs_cache.c
@@ -75,13 +75,11 @@ static void refresh_cache_worker(struct work_struct *work);
static DECLARE_DELAYED_WORK(refresh_task, refresh_cache_worker);
-static inline bool is_path_valid(const char *path)
+static int get_normalized_path(const char *path, char **npath)
{
- return path && (strchr(path + 1, '\\') || strchr(path + 1, '/'));
-}
+ if (!path || strlen(path) < 3 || (*path != '\\' && *path != '/'))
+ return -EINVAL;
-static inline int get_normalized_path(const char *path, char **npath)
-{
if (*path == '\\') {
*npath = (char *)path;
} else {
@@ -828,9 +826,6 @@ int dfs_cache_find(const unsigned int xid, struct cifs_ses *ses,
char *npath;
struct cache_entry *ce;
- if (unlikely(!is_path_valid(path)))
- return -EINVAL;
-
rc = get_normalized_path(path, &npath);
if (rc)
return rc;
@@ -875,9 +870,6 @@ int dfs_cache_noreq_find(const char *path, struct dfs_info3_param *ref,
char *npath;
struct cache_entry *ce;
- if (unlikely(!is_path_valid(path)))
- return -EINVAL;
-
rc = get_normalized_path(path, &npath);
if (rc)
return rc;
@@ -929,9 +921,6 @@ int dfs_cache_update_tgthint(const unsigned int xid, struct cifs_ses *ses,
struct cache_entry *ce;
struct cache_dfs_tgt *t;
- if (unlikely(!is_path_valid(path)))
- return -EINVAL;
-
rc = get_normalized_path(path, &npath);
if (rc)
return rc;
@@ -989,7 +978,7 @@ int dfs_cache_noreq_update_tgthint(const char *path,
struct cache_entry *ce;
struct cache_dfs_tgt *t;
- if (unlikely(!is_path_valid(path)) || !it)
+ if (!it)
return -EINVAL;
rc = get_normalized_path(path, &npath);
@@ -1049,8 +1038,6 @@ int dfs_cache_get_tgt_referral(const char *path,
if (!it || !ref)
return -EINVAL;
- if (unlikely(!is_path_valid(path)))
- return -EINVAL;
rc = get_normalized_path(path, &npath);
if (rc)
--
2.24.0
next prev parent reply other threads:[~2019-11-27 0:37 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-27 0:36 [PATCH v3 00/11] DFS fixes Paulo Alcantara (SUSE)
2019-11-27 0:36 ` [PATCH v3 01/11] cifs: Fix use-after-free bug in cifs_reconnect() Paulo Alcantara (SUSE)
2019-11-27 0:36 ` [PATCH v3 02/11] cifs: Fix lookup of root ses in DFS referral cache Paulo Alcantara (SUSE)
2019-11-27 0:36 ` [PATCH v3 03/11] cifs: Fix potential softlockups while refreshing DFS cache Paulo Alcantara (SUSE)
2019-11-27 0:36 ` [PATCH v3 04/11] cifs: Clean up DFS referral cache Paulo Alcantara (SUSE)
2019-11-27 11:32 ` Aurélien Aptel
2019-11-27 0:36 ` [PATCH v3 05/11] cifs: Get rid of kstrdup_const()'d paths Paulo Alcantara (SUSE)
2019-11-27 11:33 ` Aurélien Aptel
2019-11-27 0:36 ` [PATCH v3 06/11] cifs: Introduce helpers for finding TCP connection Paulo Alcantara (SUSE)
2019-11-27 11:33 ` Aurélien Aptel
2019-11-27 0:36 ` Paulo Alcantara (SUSE) [this message]
2019-11-27 11:34 ` [PATCH v3 07/11] cifs: Merge is_path_valid() into get_normalized_path() Aurélien Aptel
2019-11-27 0:36 ` [PATCH v3 08/11] cifs: Fix potential deadlock when updating vol in cifs_reconnect() Paulo Alcantara (SUSE)
2019-11-27 12:09 ` Aurélien Aptel
2019-11-27 0:36 ` [PATCH v3 09/11] cifs: Avoid doing network I/O while holding cache lock Paulo Alcantara (SUSE)
2019-11-27 13:32 ` Aurélien Aptel
2019-11-27 0:36 ` [PATCH v3 10/11] cifs: Fix retrieval of DFS referrals in cifs_mount() Paulo Alcantara (SUSE)
2019-11-27 13:33 ` Aurélien Aptel
2019-11-27 0:36 ` [PATCH v3 11/11] cifs: Always update signing key of first channel Paulo Alcantara (SUSE)
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=20191127003634.14072-8-pc@cjr.nz \
--to=pc@cjr.nz \
--cc=linux-cifs@vger.kernel.org \
--cc=smfrench@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).