tree 492e6e3164272872fee04e3d2e3b3e44303e724f
parent 323d28774862001798c2ff0395530992f7da2658
author Colin Cross <ccross@android.com> 1362625829 -0800
committer Amit Pundir <amit.pundir@linaro.org> 1477323681 +0800

of: fix CONFIG_CMDLINE_EXTEND

strlcat takes the size of the buffer, not the number of characters
to concatenate.  If the size of the device tree command line p is
larger than the CONFIG_CMDLINE string data, then strcat(data, p, l)
will hit a BUG_ON because strlen(data) > l.

Replace the second strlcat with a strncpy plus a manual null
termination.

Also rearrange the code to reduce indent depth to make it more
readable, and replace data with a char *cmdline to avoid extra
casts.

Signed-off-by: Colin Cross <ccross@android.com>