ext4: Fix coverity warning on error path of filename setup
diff mbox series

Message ID 85r27dlay3.fsf@collabora.com
State Accepted
Headers show
Series
  • ext4: Fix coverity warning on error path of filename setup
Related show

Commit Message

Gabriel Krisman Bertazi June 28, 2019, 8:19 p.m. UTC
Dan Carpenter <dan.carpenter@oracle.com> writes:

> Hello Gabriel Krisman Bertazi,
>
> The patch 3ae72562ad91: "ext4: optimize case-insensitive lookups"
> from Jun 19, 2019, leads to the following static checker warning:

Hi,

The patch below should fix this issue.

-- >8 --
Subject: [PATCH] ext4: Fix coverity warning on error path of filename setup

Fix the following coverity warning reported by Dan Carpenter:

fs/ext4/namei.c:1311 ext4_fname_setup_ci_filename()
	  warn: 'cf_name->len' unsigned <= 0

Fixes: 3ae72562ad91 ("ext4: optimize case-insensitive lookups")
Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 fs/ext4/namei.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

Comments

Theodore Y. Ts'o July 2, 2019, 9:57 p.m. UTC | #1
On Fri, Jun 28, 2019 at 04:19:32PM -0400, Gabriel Krisman Bertazi wrote:
> Dan Carpenter <dan.carpenter@oracle.com> writes:
> 
> > Hello Gabriel Krisman Bertazi,
> >
> > The patch 3ae72562ad91: "ext4: optimize case-insensitive lookups"
> > from Jun 19, 2019, leads to the following static checker warning:
> 
> Hi,
> 
> The patch below should fix this issue.
> 
> -- >8 --
> Subject: [PATCH] ext4: Fix coverity warning on error path of filename setup
> 
> Fix the following coverity warning reported by Dan Carpenter:
> 
> fs/ext4/namei.c:1311 ext4_fname_setup_ci_filename()
> 	  warn: 'cf_name->len' unsigned <= 0
> 
> Fixes: 3ae72562ad91 ("ext4: optimize case-insensitive lookups")
> Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>

Applied, thanks.

					- Ted

Patch
diff mbox series

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 4909ced4e672..898295286676 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -1296,6 +1296,8 @@  int ext4_ci_compare(const struct inode *parent, const struct qstr *name,
 void ext4_fname_setup_ci_filename(struct inode *dir, const struct qstr *iname,
 				  struct fscrypt_str *cf_name)
 {
+	int len;
+
 	if (!IS_CASEFOLDED(dir)) {
 		cf_name->name = NULL;
 		return;
@@ -1305,13 +1307,16 @@  void ext4_fname_setup_ci_filename(struct inode *dir, const struct qstr *iname,
 	if (!cf_name->name)
 		return;
 
-	cf_name->len = utf8_casefold(EXT4_SB(dir->i_sb)->s_encoding,
-				     iname, cf_name->name,
-				     EXT4_NAME_LEN);
-	if (cf_name->len <= 0) {
+	len = utf8_casefold(EXT4_SB(dir->i_sb)->s_encoding,
+			    iname, cf_name->name,
+			    EXT4_NAME_LEN);
+	if (len <= 0) {
 		kfree(cf_name->name);
 		cf_name->name = NULL;
+		return;
 	}
+	cf_name->len = (unsigned) len;
+
 }
 #endif