Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

[firefly-linux-kernel-4.4.55.git] / init / do_mounts_dm.c

diff --git a/init/do_mounts_dm.c b/init/do_mounts_dm.c
index f521bc5ae248416610da0a093313849bf226b8fa..ecda58df9a19edf16d8d25890fb57a1a12ded908 100644 (file)
--- a/init/do_mounts_dm.c
+++ b/init/do_mounts_dm.c
@@ -176,7 +176,8 @@ static void __init dm_substitute_devices(char *str, size_t str_len)
                        continue;
 
                /* Temporarily terminate with a nul */
-               candidate_end--;
+               if (*candidate_end)
+                       candidate_end--;
                old_char = *candidate_end;
                *candidate_end = '\0';