diff options
| author | Ji Luo <ji.luo@nxp.com> | 2019-02-21 17:01:43 +0800 |
|---|---|---|
| committer | Ji Luo <ji.luo@nxp.com> | 2019-02-21 19:38:15 +0800 |
| commit | 557a2e5d0ea2235b1c3547f6feaa19f032e24a7c (patch) | |
| tree | cf054514bcef97e1dcabcd89b882e64eb5e16496 /common | |
| parent | 7adbca6deaa6b41026655a6d5a12ebfccb3168a2 (diff) | |
MA-14120 Add config to guard append bootargs support
Grant user the permission to change the bootargs can be very
dangerous, so add config 'CONFIG_APPEND_BOOTARGS' to guard the
bootargs appending feature.
Test: bootargs can't be appended if "CONFIG_APPEND_BOOTARGS" is
not set.
Change-Id: I6d6879415ca251c806b56490290e5032aef24277
Signed-off-by: Ji Luo <ji.luo@nxp.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/image-android.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/common/image-android.c b/common/image-android.c index 71b93da2d5..1646e5051a 100644 --- a/common/image-android.c +++ b/common/image-android.c @@ -233,6 +233,7 @@ int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify, strncat(commandline, bootargs_trusty, sizeof(commandline) - strlen(commandline)); } +#ifdef CONFIG_APPEND_BOOTARGS /* Add 'append_bootargs' to hold some paramemters which need to be appended * to bootargs */ char *append_bootargs = env_get("append_bootargs"); @@ -245,6 +246,7 @@ int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify, strncat(commandline, append_bootargs, sizeof(commandline) - strlen(commandline)); } } +#endif debug("Kernel command line: %s\n", commandline); env_set("bootargs", commandline); |