commit af54db8b15e0dc301561ad02a34192f5d996e13b
author Linux Build Service Account <lnxbuild@localhost> Mon Oct 12 04:21:07 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Oct 12 04:21:07 2015 -0700
tree 3caed49f0dbd1e000a6a0fd5eb72f1f1a9d1e5b5
parent 400399231b7539fb1f3f943c4bf8c34d2a9564dc
parent 287bb54f492400ba587a0a9686e558e7af85b7aa

Merge "app: aboot: ensure NULL termination to cmdine buffer of bootimage header"

app/aboot/aboot.c

diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index f21d9b4..44b0858 100644
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -428,6 +428,7 @@
 
 		cmdline_final = (unsigned char*) malloc((cmdline_len + 4) & (~3));
 		ASSERT(cmdline_final != NULL);
+		memset((void *)cmdline_final, 0, sizeof(*cmdline_final));
 		dst = cmdline_final;
 
 		/* Save start ptr for debug print */
@@ -1066,6 +1067,9 @@
 		page_mask = page_size - 1;
 	}
 
+	/* ensure commandline is terminated */
+	hdr->cmdline[BOOT_ARGS_SIZE-1] = 0;
+
 	kernel_actual  = ROUND_TO_PAGE(hdr->kernel_size,  page_mask);
 	ramdisk_actual = ROUND_TO_PAGE(hdr->ramdisk_size, page_mask);
 
@@ -1398,6 +1402,9 @@
 		return -1;
 	}
 
+	/* ensure commandline is terminated */
+	hdr->cmdline[BOOT_ARGS_SIZE-1] = 0;
+
 	/*
 	 * Update the kernel/ramdisk/tags address if the boot image header
 	 * has default values, these default values come from mkbootimg when