GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-04-01 03:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

misc: imx: scu: avoid write null pointer

Browse source 
When boot_dev is true, fill boot device. However the original logic is when
boot_dev is false, fill boot device, this will trigger data abort.

Also fix sc_misc_get_control when using pointer val.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
This commit is contained in:
Peng Fan 2018-12-15 12:19:49 +00:00 • committed by Stefano Babic
parent 224f745247
commit ecab65e4cd
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/misc/imx8/scu_api.c
View file

@ -169,7 +169,7 @@ int sc_misc_get_control(sc_ipc_t ipc, sc_rsrc_t resource, sc_ctrl_t ctrl,
printf("%s: ctrl:%d resource:%d: res:%d\n", printf("%s: ctrl:%d resource:%d: res:%d\n",
__func__, ctrl, resource, RPC_R8(&msg)); __func__, ctrl, resource, RPC_R8(&msg));
if (!val) if (val)
*val = RPC_U32(&msg, 0U); *val = RPC_U32(&msg, 0U);
return ret; return ret;
@ -194,7 +194,7 @@ void sc_misc_get_boot_dev(sc_ipc_t ipc, sc_rsrc_t *boot_dev)
if (ret) if (ret)
printf("%s: res:%d\n", __func__, RPC_R8(&msg)); printf("%s: res:%d\n", __func__, RPC_R8(&msg));
if (!boot_dev) if (boot_dev)
*boot_dev = RPC_U16(&msg, 0U); *boot_dev = RPC_U16(&msg, 0U);
} }