OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

cxd56_dmac, lcd_dev: fix null pointer dereference 

Check return values of following functions for null:
   - board_lcd_getdev
   - get_device

Signed-off-by: Mingjie Shen <shen497@purdue.edu>
This commit is contained in:
Mingjie Shen 2023-06-26 02:36:22 -04:00 committed by Petro Karashchenko
parent 5b00c31396
commit 1d6e51220d
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm/src/cxd56xx/cxd56_dmac.c
View File

@ -400,6 +400,12 @@ static void _dmac_intc_handler(int ch)
int itc;
int err;
if (dev == NULL)
{
dmaerr("Cannot get device with channel number %d.\n", ch);
return;
}
mask = (1u << (ch & 1));
if (is_dmac(2, dev))
@ -442,9 +448,16 @@ static int intr_handler_admac1(int irq, void *context, void *arg)
static int intr_handler_idmac(int irq, void *context, void *arg)
{
struct dmac_register_map *dev = get_device(2); /* XXX */
uint32_t stat = dev->intstatus & 0x1f;
uint32_t stat;
int i;
if (dev == NULL)
{
return -ENODEV;
}
stat = dev->intstatus & 0x1f;
for (i = 2; stat; i++, stat >>= 1)
{
if (stat & 1)

6
drivers/lcd/lcd_dev.c
View File

@ -315,6 +315,12 @@ int lcddev_register(int devno)
}
priv->lcd_ptr = board_lcd_getdev(devno);
if (!priv->lcd_ptr)
{
ret = -ENODEV;
goto err;
}
ret = priv->lcd_ptr->getplaneinfo(priv->lcd_ptr, 0, &priv->planeinfo);
if (ret < 0)
{