shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

amvecm: add addr protect for register program [1/1]

Browse Source 
PD#SWPL-14333

Problem:
invalid address is allowed for register program
which cause kernel panic

Solution:
add protection, programming on invalid addr will
be terminated

Verify:
tl1

Change-Id: I44bedec256ee5c386b53188fb2d8e40ae8c3f553
Signed-off-by: Xihai Zhu <xihai.zhu@amlogic.com>
This commit is contained in:
Xihai Zhu
2019-09-18 22:04:02 -04:00
committed by Luan Yuan
parent 1c3838c28e
commit 7870212b5b
2 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/amlogic/iomap/iomap.c
View File

@@ -38,10 +38,14 @@ static const struct of_device_id iomap_dt_match[] = {
};
static void __iomem *meson_reg_map[IO_BUS_MAX] = { NULL };
static uint meson_reg_max[IO_BUS_MAX] = { 0 };
inline int aml_reg_read(u32 bus_type, unsigned int reg, unsigned int *val)
{
if (bus_type < IO_BUS_MAX && (meson_reg_map[bus_type] != NULL)) {
if (
bus_type < IO_BUS_MAX &&
(meson_reg_map[bus_type]) &&
(meson_reg_max[bus_type] >= reg)) {
*val = readl((meson_reg_map[bus_type]+reg));
return 0;
} else
@@ -51,7 +55,10 @@ EXPORT_SYMBOL(aml_reg_read);
inline int aml_reg_write(u32 bus_type, unsigned int reg, unsigned int val)
{
if (bus_type < IO_BUS_MAX && (meson_reg_map[bus_type] != NULL)) {
if (
bus_type < IO_BUS_MAX &&
(meson_reg_map[bus_type]) &&
(meson_reg_max[bus_type] >= reg)) {
writel(val, (meson_reg_map[bus_type]+reg));
return 0;
} else
@@ -281,6 +288,7 @@ static int iomap_probe(struct platform_device *pdev)
if (of_address_to_resource(child, 0, &res))
return -1;
meson_reg_map[i] = ioremap(res.start, resource_size(&res));
meson_reg_max[i] = res.end - res.start;
i++;
}
pr_info("amlogic iomap probe done\n");

20
drivers/amlogic/media/common/arch/registers/register_map.c
View File

@@ -50,12 +50,18 @@ enum {
};
static void __iomem *codecio_reg_map[CODECIO_BUS_MAX];
static u32 codecio_reg_max[CODECIO_BUS_MAX];
static inline int codecio_reg_read(u32 bus_type, u32 reg, u32 *val)
{
if (bus_type < CODECIO_BUS_MAX) {
if (codecio_reg_map[bus_type] == NULL) {
pr_err("No support bus type %d to read.\n", bus_type);
if (
(!codecio_reg_map[bus_type]) ||
(codecio_reg_max[bus_type] < reg)) {
pr_err(
"Not supported bus type %d or addr %x to read.\n",
bus_type,
reg);
return -1;
}
@@ -68,8 +74,13 @@ static inline int codecio_reg_read(u32 bus_type, u32 reg, u32 *val)
static inline int codecio_reg_write(u32 bus_type, u32 reg, u32 val)
{
if (bus_type < CODECIO_BUS_MAX) {
if (codecio_reg_map[bus_type] == NULL) {
pr_err("No support bus type %d to write.\n", bus_type);
if (
(!codecio_reg_map[bus_type]) ||
(codecio_reg_max[bus_type] < reg)) {
pr_err(
"Not supported bus type %d or addr %x to write.\n",
bus_type,
reg);
return -1;
}
@@ -380,6 +391,7 @@ static int codec_io_probe(struct platform_device *pdev)
pr_debug("ignore io source start %p,size=%d\n",
(void *)res.start, (int)resource_size(&res));
}
codecio_reg_max[i] = res.end - res.start;
i++;
}
/*pr_info("amlogic codec_io probe done\n"); */