4 files changed, 12 insertions, 7 deletions

diff --git a/fs/udf/dir.c b/fs/udf/dir.c
index 541a12b5792d..fcf227eb2c51 100644
--- a/fs/udf/dir.c
+++ b/fs/udf/dir.c
@@ -168,7 +168,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);
diff --git a/fs/udf/namei.c b/fs/udf/namei.c
index 5c03f0dfb98b..51b1c31b55c8 100644
--- a/fs/udf/namei.c
+++ b/fs/udf/namei.c
@@ -234,7 +234,7 @@ 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;
         }
 
diff --git a/fs/udf/symlink.c b/fs/udf/symlink.c
index 8dfbc4025e2f..862535b3ba58 100644
--- a/fs/udf/symlink.c
+++ b/fs/udf/symlink.c
@@ -82,6 +82,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)
diff --git a/fs/udf/unicode.c b/fs/udf/unicode.c
index b84fee372734..4911c1d84882 100644
--- a/fs/udf/unicode.c
+++ b/fs/udf/unicode.c
@@ -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,