mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-26 06:30:39 +00:00
3517de6d26
U-Boot typically interprets unprefixed numbers as base 16, and DFU RAM
entity parsing has historically done so. Reverse the change to default
to base 10, so that values in previously working command-lines aren't
mis-parsed, causing RAM corruption, crashes, hangs, etc.
Fixes: 6aeb877afef0 ("drivers: dfu: ram: fix a crash with dfu ram with invalid dfu_alt_info env")
Cc: Mugunthan V N <mugunthanvnm@ti.com>
Cc: Tom Rini <trini@konsulko.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Mugunthan V N <mugunthanvnm@ti.com>
Tested-by: Mugunthan V N <mugunthanvnm@ti.com>
[Test HW: AM335x BBB]
85 lines
1.9 KiB
C
85 lines
1.9 KiB
C
/*
|
|
* (C) Copyright 2013
|
|
* Afzal Mohammed <afzal.mohd.ma@gmail.com>
|
|
*
|
|
* Reference: dfu_mmc.c
|
|
* Copyright (C) 2012 Samsung Electronics
|
|
* author: Lukasz Majewski <l.majewski@samsung.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <malloc.h>
|
|
#include <errno.h>
|
|
#include <dfu.h>
|
|
|
|
static int dfu_transfer_medium_ram(enum dfu_op op, struct dfu_entity *dfu,
|
|
u64 offset, void *buf, long *len)
|
|
{
|
|
if (dfu->layout != DFU_RAM_ADDR) {
|
|
error("unsupported layout: %s\n", dfu_get_layout(dfu->layout));
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (offset > dfu->data.ram.size) {
|
|
error("request exceeds allowed area\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (op == DFU_OP_WRITE)
|
|
memcpy(dfu->data.ram.start + offset, buf, *len);
|
|
else
|
|
memcpy(buf, dfu->data.ram.start + offset, *len);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int dfu_write_medium_ram(struct dfu_entity *dfu, u64 offset,
|
|
void *buf, long *len)
|
|
{
|
|
return dfu_transfer_medium_ram(DFU_OP_WRITE, dfu, offset, buf, len);
|
|
}
|
|
|
|
long dfu_get_medium_size_ram(struct dfu_entity *dfu)
|
|
{
|
|
return dfu->data.ram.size;
|
|
}
|
|
|
|
static int dfu_read_medium_ram(struct dfu_entity *dfu, u64 offset,
|
|
void *buf, long *len)
|
|
{
|
|
return dfu_transfer_medium_ram(DFU_OP_READ, dfu, offset, buf, len);
|
|
}
|
|
|
|
int dfu_fill_entity_ram(struct dfu_entity *dfu, char *devstr, char *s)
|
|
{
|
|
const char *argv[3];
|
|
const char **parg = argv;
|
|
|
|
for (; parg < argv + sizeof(argv) / sizeof(*argv); ++parg) {
|
|
*parg = strsep(&s, " ");
|
|
if (*parg == NULL) {
|
|
error("Invalid number of arguments.\n");
|
|
return -ENODEV;
|
|
}
|
|
}
|
|
|
|
dfu->dev_type = DFU_DEV_RAM;
|
|
if (strcmp(argv[0], "ram")) {
|
|
error("unsupported device: %s\n", argv[0]);
|
|
return -ENODEV;
|
|
}
|
|
|
|
dfu->layout = DFU_RAM_ADDR;
|
|
dfu->data.ram.start = (void *)simple_strtoul(argv[1], NULL, 16);
|
|
dfu->data.ram.size = simple_strtoul(argv[2], NULL, 16);
|
|
|
|
dfu->write_medium = dfu_write_medium_ram;
|
|
dfu->get_medium_size = dfu_get_medium_size_ram;
|
|
dfu->read_medium = dfu_read_medium_ram;
|
|
|
|
dfu->inited = 0;
|
|
|
|
return 0;
|
|
}
|