hw/ufs: Fix potential bugs in MMIO read|write
PATCH 1/1 hw/ufs: Fix potential bugs in MMIO read|write
This patch fixes two points reported in coverity scan report [1]. Check the MMIO access address with (addr + size), not just with the start offset addr to make sure that the requested memory access not to exceed the actual register region. We also updated (uint8_t *) to (uint32_t *) to represent we are accessing the MMIO registers by dword-sized only.
--- hw/ufs/ufs.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-)
hw/ufs/ufs.c +16 -15
@@ -55,17 +55,18 @@ static inline uint64_t ufs_reg_size(UfsHc *u)return ufs_mcq_op_reg_addr (u,0 ) +sizeof (u->mcq_op_reg); } -static inline bool ufs_is_mcq_reg (UfsHc *u,uint64_t addr) +static inline bool ufs_is_mcq_reg (UfsHc *u,uint64_t addr,unsigned size) {uint64_t mcq_reg_addr =ufs_mcq_reg_addr (u,0 ); -return addr >= mcq_reg_addr && addr < mcq_reg_addr +sizeof (u->mcq_reg); +return (addr >= mcq_reg_addr && + addr + size <= mcq_reg_addr +sizeof (u->mcq_reg)); } -static inline bool ufs_is_mcq_op_reg (UfsHc *u,uint64_t addr) +static inline bool ufs_is_mcq_op_reg (UfsHc *u,uint64_t addr,unsigned size) {uint64_t mcq_op_reg_addr =ufs_mcq_op_reg_addr (u,0 );return (addr >= mcq_op_reg_addr && - addr < mcq_op_reg_addr +sizeof (u->mcq_op_reg)); + addr + size <= mcq_op_reg_addr +sizeof (u->mcq_op_reg)); }static MemTxResult ufs_addr_read (UfsHc *u,hwaddr addr,void *buf,int size)
@@ -774,25 +775,25 @@ static void ufs_write_mcq_op_reg(UfsHc *u, hwaddr offset, uint32_t data,static uint64_t ufs_mmio_read (void *opaque,hwaddr addr,unsigned size) {UfsHc *u = (UfsHc *)opaque; -uint8_t *ptr; +uint32_t *ptr;uint64_t value;uint64_t offset; -if (addr <sizeof (u->reg)) { +if (addr + size <=sizeof (u->reg)) { offset = addr; - ptr = (uint8_t *)&u->reg; - }else if (ufs_is_mcq_reg (u, addr)) { + ptr = (uint32_t *)&u->reg; + }else if (ufs_is_mcq_reg (u, addr, size)) { offset = addr -ufs_mcq_reg_addr (u,0 ); - ptr = (uint8_t *)&u->mcq_reg; - }else if (ufs_is_mcq_op_reg (u, addr)) { + ptr = (uint32_t *)&u->mcq_reg; + }else if (ufs_is_mcq_op_reg (u, addr, size)) { offset = addr -ufs_mcq_op_reg_addr (u,0 ); - ptr = (uint8_t *)&u->mcq_op_reg; + ptr = (uint32_t *)&u->mcq_op_reg; }else {trace_ufs_err_invalid_register_offset (addr);return 0 ; } - value = *(uint32_t *)(ptr + offset); + value = ptr[offset >>2 ];trace_ufs_mmio_read (addr, value, size);return value; }
@@ -804,11 +805,11 @@ static void ufs_mmio_write(void *opaque, hwaddr addr, uint64_t data,trace_ufs_mmio_write (addr, data, size); -if (addr <sizeof (u->reg)) { +if (addr + size <=sizeof (u->reg)) {ufs_write_reg (u, addr, data, size); - }else if (ufs_is_mcq_reg (u, addr)) { + }else if (ufs_is_mcq_reg (u, addr, size)) {ufs_write_mcq_reg (u, addr -ufs_mcq_reg_addr (u,0 ), data, size); - }else if (ufs_is_mcq_op_reg (u, addr)) { + }else if (ufs_is_mcq_op_reg (u, addr, size)) {ufs_write_mcq_op_reg (u, addr -ufs_mcq_op_reg_addr (u,0 ), data, size); }else {trace_ufs_err_invalid_register_offset (addr);
Signature · 1 line
2.34.1
Quoted 11 lines · Minwoo Im
This patch fixes two points reported in coverity scan report [1]. Check the MMIO access address with (addr + size), not just with the start offset addr to make sure that the requested memory access not to exceed the actual register region. We also updated (
uint8_t*) to (uint32_t*) to represent we are accessing the MMIO registers by dword-sized only.Cc Jeuk Kim <[email protected]>Reported-by Peter Maydell <[email protected]>Signed-off-by Minwoo Im <[email protected]>
Thank you for the patch.
Quoted 30 lines · Minwoo Im
This patch fixes two points reported in coverity scan report [1]. Check the MMIO access address with (addr + size), not just with the start offset addr to make sure that the requested memory access not to exceed the actual register region. We also updated (
uint8_t*) to (uint32_t*) to represent we are accessing the MMIO registers by dword-sized only.Cc Jeuk Kim <[email protected]>Reported-by Peter Maydell <[email protected]>Signed-off-by Minwoo Im <[email protected]>--- hw/ufs/ufs.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-)hw/ufs/ufs.c +2
-2@@ -55,17 +55,18 @@ static inline uint64_t ufs_reg_size(UfsHc *u)return ufs_mcq_op_reg_addr (u,0 ) +sizeof (u->mcq_op_reg); } -static inline bool ufs_is_mcq_reg (UfsHc *u,uint64_t addr) +static inline bool ufs_is_mcq_reg (UfsHc *u,uint64_t addr,unsigned size) {uint64_t mcq_reg_addr =ufs_mcq_reg_addr (u,0 ); -return addr >= mcq_reg_addr && addr < mcq_reg_addr +sizeof (u->mcq_reg); + return (addr >= mcq_reg_addr &&
hw/ufs/ufs.c static inline uint64_t ufs_reg_size(UfsHc *u) · line 69
Quoted 10 lines
hw/ufs/ufs.c +3
-2+ addr + size <= mcq_reg_addr + sizeof(u->mcq_reg)); } -static inline bool ufs_is_mcq_op_reg (UfsHc *u,uint64_t addr) +static inline bool ufs_is_mcq_op_reg (UfsHc *u,uint64_t addr,unsigned size) {uint64_t mcq_op_reg_addr =ufs_mcq_op_reg_addr (u,0 );return (addr >= mcq_op_reg_addr && - addr < mcq_op_reg_addr +sizeof (u->mcq_op_reg)); + addr + size <= mcq_op_reg_addr +sizeof (u->mcq_op_reg));
Stray extra space after "addr".
Otherwise
thanks
-- PMM
Quoted 33 lines · Peter Maydell
Quoted 32 lines · Minwoo Im
This patch fixes two points reported in coverity scan report [1]. Check the MMIO access address with (addr + size), not just with the start offset addr to make sure that the requested memory access not to exceed the actual register region. We also updated (
uint8_t*) to (uint32_t*) to represent we are accessing the MMIO registers by dword-sized only.Cc Jeuk Kim <[email protected]>Reported-by Peter Maydell <[email protected]>Signed-off-by Minwoo Im <[email protected]>--- hw/ufs/ufs.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-)hw/ufs/ufs.c +3
-2@@ -55,17 +55,18 @@ static inline uint64_t ufs_reg_size(UfsHc *u)return ufs_mcq_op_reg_addr (u,0 ) +sizeof (u->mcq_op_reg); } -static inline bool ufs_is_mcq_reg (UfsHc *u,uint64_t addr) +static inline bool ufs_is_mcq_reg (UfsHc *u,uint64_t addr,unsigned size) {uint64_t mcq_reg_addr =ufs_mcq_reg_addr (u,0 ); -return addr >= mcq_reg_addr && addr < mcq_reg_addr +sizeof (u->mcq_reg); +return (addr >= mcq_reg_addr && + addr + size <= mcq_reg_addr +sizeof (u->mcq_reg)); }
Quoted 8 lines
hw/ufs/ufs.c static inline uint64_t ufs_reg_size(UfsHc *u) · line 69
Quoted 7 lines
hw/ufs/ufs.c +2
-2-static inline bool ufs_is_mcq_op_reg (UfsHc *u,uint64_t addr) +static inline bool ufs_is_mcq_op_reg (UfsHc *u,uint64_t addr,unsigned size) {uint64_t mcq_op_reg_addr =ufs_mcq_op_reg_addr (u,0 );return (addr >= mcq_op_reg_addr && - addr < mcq_op_reg_addr +sizeof (u->mcq_op_reg)); + addr + size <= mcq_op_reg_addr +sizeof (u->mcq_op_reg));Stray extra space after "addr".
Thank you for your comment.
I'll fix it when I send the pull request.
Quoted 6 lines
Otherwise
Reviewed-by Peter Maydell <[email protected]>thanks
-- PMM