summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorJeremy Compostella <jeremy.compostella@intel.com>2016-05-02 17:29:28 +0200
committerAmit Pundir <amit.pundir@linaro.org>2016-08-18 18:56:03 +0530
commitb8681ffa6859d3f267d625d4770987df5832a42b (patch)
tree097cbb130117a6b2e28061e377fd585113fa8c9c /init
parente33d750b4ebc99a7804d096a28c29beccd77ee85 (diff)
ANDROID: dm: fix dm_substitute_devices()
When candidate is the last parameter, candidate_end points to the '\0' character and not the DM_FIELD_SEP character. In such a situation, we should not move the candidate_end pointer one character backward. Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
Diffstat (limited to 'init')
-rw-r--r--init/do_mounts_dm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/init/do_mounts_dm.c b/init/do_mounts_dm.c
index f521bc5ae248..ecda58df9a19 100644
--- 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';