| Message ID | 20240623024555.78697-1-minwoo.im.dev@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw/ufs: Fix potential bugs in MMIO read|write | expand |
On 6/23/2024 11:45 AM, Minwoo Im wrote: > 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. > > [1] https://lore.kernel.org/qemu-devel/CAFEAcA82L-WZnHMW0X+Dr40bHM-EVq2ZH4DG4pdqop4xxDP2Og@mail.gmail.com/ > > Cc: Jeuk Kim <jeuk20.kim@gmail.com> > Reported-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Minwoo Im <minwoo.im.dev@gmail.com> Thank you for the patch. Reviewed-by: Jeuk Kim <jeuk20.kim@samsung.com>
On Sun, 23 Jun 2024 at 03:46, Minwoo Im <minwoo.im.dev@gmail.com> wrote: > > 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. > > [1] https://lore.kernel.org/qemu-devel/CAFEAcA82L-WZnHMW0X+Dr40bHM-EVq2ZH4DG4pdqop4xxDP2Og@mail.gmail.com/ > > Cc: Jeuk Kim <jeuk20.kim@gmail.com> > Reported-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Minwoo Im <minwoo.im.dev@gmail.com> > --- > hw/ufs/ufs.c | 31 ++++++++++++++++--------------- > 1 file changed, 16 insertions(+), 15 deletions(-) > > diff --git a/hw/ufs/ufs.c b/hw/ufs/ufs.c > index 71a88d221ced..bf2ff02ac6e5 100644 > --- a/hw/ufs/ufs.c > +++ b/hw/ufs/ufs.c > @@ -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)); Stray extra space after "addr". Otherwise Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
On 6/24/2024 7:27 PM, Peter Maydell wrote: > On Sun, 23 Jun 2024 at 03:46, Minwoo Im <minwoo.im.dev@gmail.com> wrote: >> 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. >> >> [1] https://lore.kernel.org/qemu-devel/CAFEAcA82L-WZnHMW0X+Dr40bHM-EVq2ZH4DG4pdqop4xxDP2Og@mail.gmail.com/ >> >> Cc: Jeuk Kim <jeuk20.kim@gmail.com> >> Reported-by: Peter Maydell <peter.maydell@linaro.org> >> Signed-off-by: Minwoo Im <minwoo.im.dev@gmail.com> >> --- >> hw/ufs/ufs.c | 31 ++++++++++++++++--------------- >> 1 file changed, 16 insertions(+), 15 deletions(-) >> >> diff --git a/hw/ufs/ufs.c b/hw/ufs/ufs.c >> index 71a88d221ced..bf2ff02ac6e5 100644 >> --- a/hw/ufs/ufs.c >> +++ b/hw/ufs/ufs.c >> @@ -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)); > Stray extra space after "addr". Thank you for your comment. I'll fix it when I send the pull request. > > Otherwise > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > > thanks > -- PMM
diff --git a/hw/ufs/ufs.c b/hw/ufs/ufs.c index 71a88d221ced..bf2ff02ac6e5 100644 --- a/hw/ufs/ufs.c +++ b/hw/ufs/ufs.c @@ -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);
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. [1] https://lore.kernel.org/qemu-devel/CAFEAcA82L-WZnHMW0X+Dr40bHM-EVq2ZH4DG4pdqop4xxDP2Og@mail.gmail.com/ Cc: Jeuk Kim <jeuk20.kim@gmail.com> Reported-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Minwoo Im <minwoo.im.dev@gmail.com> --- hw/ufs/ufs.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-)