On Mon, Mar 14, 2011 at 11:25:32AM -0400, chenliu@xxxxxxxxxxxxxxxxxx wrote:
> Thanks Heiko. This patch hasn't been tested yet. I've modifed
> the Signed=off-by to make it identical to From. Here is the
> patch:
Yes, obviously untested (see below).
> Signed-off-by: Chen Liu <chenliu@xxxxxxxxxxxxxxxxxx>
> ---
> arch/s390/kernel/early.c | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
> --- a/arch/s390/kernel/early.c
> +++ b/arch/s390/kernel/early.c
> @@ -94,6 +94,7 @@ static noinline __init void create_kerne
> unsigned int sinitrd_pfn, einitrd_pfn;
> #endif
> int response;
> + int hlen;
> size_t len;
> char *savesys_ptr;
> char defsys_cmd[DEFSYS_CMD_SIZE];
> @@ -124,22 +125,27 @@ static noinline __init void create_kerne
> end_pfn = PFN_UP(__pa(&_end));
> min_size = end_pfn << 2;
>
> - sprintf(defsys_cmd, "DEFSYS %s 00000-%.5X EW %.5X-%.5X SR %.5X-%.5X",
> + snprintf(defsys_cmd, sizeof(defsys_cmd),
> + "DEFSYS %s 00000-%.5X EW %.5X-%.5X SR %.5X-%.5X",
> kernel_nss_name, stext_pfn - 1, stext_pfn, eshared_pfn - 1,
> eshared_pfn, end_pfn);
> + defsys_cmd[DEFSYS_CMD_SIZE - 1] = '\0';
>
> #ifdef CONFIG_BLK_DEV_INITRD
> if (INITRD_START && INITRD_SIZE) {
> sinitrd_pfn = PFN_DOWN(__pa(INITRD_START));
> einitrd_pfn = PFN_UP(__pa(INITRD_START + INITRD_SIZE));
> min_size = einitrd_pfn << 2;
> - sprintf(defsys_cmd, "%s EW %.5X-%.5X", defsys_cmd,
> - sinitrd_pfn, einitrd_pfn);
> + hlen += snprintf(defsys_cmd, DEFSYS_CMD_SIZE - hlen,
hlen is unitialized here, since you forgot to save the size in the
snprintf statement above.
> + " EW %.5X-%.5X", defsys_cmd,
defsys_cmd is still in the input parameter list. The whole point was to
remove it. ;)
Anyway, I fixed it and applied your patch. Thanks!
--
To unsubscribe from this list: send the line "unsubscribe linux-s390" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
