Skip to contentSkip to conversation

udf: improve udf_get_filename() error management

PATCH Superseded Fabian Frederick 2 participants 2 messages Mar 16, 2015 – Mar 17, 2015 UDF filesystem

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 udf: improve udf_get_filename() error management

Let udf_get_filename() return errors instead of 0.

udf_pc_to_char() now returns error accordingly. udf_readdir() and udf_find_entry() process is done on positive result.

Note that error propagation has still to be done in the later functions.

---
This is untested.

 fs/udf/dir.c     |  2 +-
 fs/udf/namei.c   |  3 ++-
 fs/udf/symlink.c |  3 +++
 fs/udf/unicode.c | 12 +++++++-----
 4 files changed, 13 insertions(+), 7 deletions(-)
fs/udf/dir.c +1 -1
index 05e90ed..98bcc27 100644
@@ -169,7 +169,7 @@ static int udf_readdir(struct file *file, struct dir_context *ctx)
 		}
 
 		flen = udf_get_filename(sb, nameptr, lfi, fname, UDF_NAME_LEN);
-		if (!flen)
+		if (flen <= 0)
 			continue;
 
 		tloc = lelb_to_cpu(cfi.icb.extLocation);
fs/udf/namei.c +2 -1
index 33b246b..bab34d1 100644
@@ -235,7 +235,8 @@ static struct fileIdentDesc *udf_find_entry(struct inode *dir,
 			continue;
 
 		flen = udf_get_filename(sb, nameptr, lfi, fname, UDF_NAME_LEN);
-		if (flen && udf_match(flen, fname, child->len, child->name))
+		if ((flen > 0) && udf_match(flen, fname, child->len,
+					    child->name))
 			goto out_ok;
 	}
 
fs/udf/symlink.c +3 -0
index ac10ca9..a9f41fa 100644
@@ -83,6 +83,9 @@ static int udf_pc_to_char(struct super_block *sb, unsigned char *from,
 			comp_len = udf_get_filename(sb, pc->componentIdent,
 						    pc->lengthComponentIdent,
 						    p, tolen);
+			if (comp_len < 0)
+				return comp_len;
+
 			p += comp_len;
 			tolen -= comp_len;
 			if (tolen == 0)
fs/udf/unicode.c +7 -5
index b84fee3..4911c1d 100644
@@ -338,15 +338,17 @@ int udf_get_filename(struct super_block *sb, uint8_t *sname, int slen,
 		     uint8_t *dname, int dlen)
 {
 	struct ustr *filename, *unifilename;
-	int len = 0;
+	int ret = 0;
 
 	filename = kmalloc(sizeof(struct ustr), GFP_NOFS);
 	if (!filename)
-		return 0;
+		return -ENOMEM;
 
 	unifilename = kmalloc(sizeof(struct ustr), GFP_NOFS);
-	if (!unifilename)
+	if (!unifilename) {
+		ret = -ENOMEM;
 		goto out1;
+	}
 
 	if (udf_build_ustr_exact(unifilename, sname, slen))
 		goto out2;
@@ -367,14 +369,14 @@ int udf_get_filename(struct super_block *sb, uint8_t *sname, int slen,
 	} else
 		goto out2;
 
-	len = udf_translate_to_linux(dname, dlen,
+	ret = udf_translate_to_linux(dname, dlen,
 				     filename->u_name, filename->u_len,
 				     unifilename->u_name, unifilename->u_len);
 out2:
 	kfree(unifilename);
 out1:
 	kfree(filename);
-	return len;
+	return ret;
 }
 
 int udf_put_filename(struct super_block *sb, const uint8_t *sname,
Signature · 1 line
2.1.0
#1 lore raw
Quoted 11 lines · Fabian Frederick

Let udf_get_filename() return errors instead of 0.

udf_pc_to_char() now returns error accordingly. udf_readdir() and udf_find_entry() process is done on positive result.

Note that error propagation has still to be done in the later functions.

...

Quoted 30 lines
fs/udf/unicode.c +5 -4
index b84fee3..4911c1d 100644
@@ -338,15 +338,17 @@ int udf_get_filename(struct super_block *sb, uint8_t *sname, int slen,
 		     uint8_t *dname, int dlen)
 {
 	struct ustr *filename, *unifilename;
-	int len = 0;
+	int ret = 0;
 
 	filename = kmalloc(sizeof(struct ustr), GFP_NOFS);
 	if (!filename)
-		return 0;
+		return -ENOMEM;
 
 	unifilename = kmalloc(sizeof(struct ustr), GFP_NOFS);
-	if (!unifilename)
+	if (!unifilename) {
+		ret = -ENOMEM;
 		goto out1;
+	}
 
 	if (udf_build_ustr_exact(unifilename, sname, slen))
 		goto out2;
@@ -367,14 +369,14 @@ int udf_get_filename(struct super_block *sb, uint8_t *sname, int slen,
 	} else
 		goto out2;
 
-	len = udf_translate_to_linux(dname, dlen,

fs/udf/unicode.c int udf_get_filename(struct super_block *sb, uint8_t *sname, int slen, · line 380

Quoted 10 lines
fs/udf/unicode.c +2 -1
+	ret = udf_translate_to_linux(dname, dlen,
 				     filename->u_name, filename->u_len,
 				     unifilename->u_name, unifilename->u_len);
 out2:
 	kfree(unifilename);
 out1:
 	kfree(filename);
-	return len;
+	return ret;
 }

I think you need to do more work around udf_get_filename() if you want
error handling to function correctly. The test in udf_build_ustr_exact() which can make it fail is just bogus - remove it. udf_CS0toUTF8() and udf_CS0toNLS() may fail as well - make them return error (-EINVAL?) and propagate that up. The else branch in udf_get_filename() should be a BUG()
- mount code makes sure one of UDF_FLAG_NLS_MAP and UDF_FLAG_UTF8 is set. That should deal with all the error paths so we really return value < 0 if we fail and positive value if we succeed.

Honza

Signature · 2 lines
Jan Kara <[email protected]>
SUSE Labs, CR