Commit f3d11822 authored May 02, 2016 by Jeremy Compostella Committed by Badhri Jagan Sridharan May 06, 2016

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.

(Cherry-picked from https://android-review.googlesource.com/#/c/221680/

)
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
Change-Id: Ifc042e07da99fcfdfd46811d4208b39b427a6d99

parent 8ad66caf

init/do_mounts_dm.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -176,6 +176,7 @@ static void __init dm_substitute_devices(char *str, size_t str_len)
		continue;

		/* Temporarily terminate with a nul */
		if (*candidate_end)
		candidate_end--;
		old_char = *candidate_end;
		*candidate_end = '\0';