1 files changed, 10 insertions, 6 deletions

diff --git a/fs/udf/super.c b/fs/udf/super.c
index 8f2f56d9a1bb..e3d684ea3203 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -827,16 +827,20 @@ static int udf_load_pvoldesc(struct super_block *sb, sector_t block)
 
 
         ret = udf_dstrCS0toChar(sb, outstr, 31, pvoldesc->volIdent, 32);
-        if (ret < 0)
-                goto out_bh;
-
-        strncpy(UDF_SB(sb)->s_volume_ident, outstr, ret);
+        if (ret < 0) {
+                strcpy(UDF_SB(sb)->s_volume_ident, "InvalidName");
+                pr_warn("incorrect volume identification, setting to "
+                        "'InvalidName'\n");
+        } else {
+                strncpy(UDF_SB(sb)->s_volume_ident, outstr, ret);
+        }
         udf_debug("volIdent[] = '%s'\n", UDF_SB(sb)->s_volume_ident);
 
         ret = udf_dstrCS0toChar(sb, outstr, 127, pvoldesc->volSetIdent, 128);
-        if (ret < 0)
+        if (ret < 0) {
+                ret = 0;
                 goto out_bh;
-
+        }
         outstr[ret] = 0;
         udf_debug("volSetIdent[] = '%s'\n", outstr);