char/ns16550: avoid additions to NULL pointer
PATCH 1/1 char/ns16550: avoid additions to NULL pointer
Clang UBSAN reports:
UBSAN: Undefined behaviour in drivers/char/ns16550.c:124:49
applying non-zero offset 0000000000000001 to null pointer
And
UBSAN: Undefined behaviour in drivers/char/ns16550.c:142:49
applying non-zero offset 0000000000000001 to null pointer
Move calculation of the MMIO address so it's only done if the MMIO is mapped by Xen, otherwise the address is not consumed anyway because IO port access is used instead.
Signed-off-by Roger Pau Monné <[email protected]>
--- xen/drivers/char/ns16550.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
xen/drivers/char/ns16550.c +8 -2
@@ -121,11 +121,14 @@ static void cf_check ns16550_delayed_resume(void *data);static u8 ns_read_reg (const struct ns16550 *uart,unsigned int reg) { -void __iomem *addr = uart->remapped_io_base + (reg << uart->reg_shift); +void __iomem *addr; +#ifdef CONFIG_HAS_IOPORTS if ( uart->remapped_io_base ==NULL )return inb (uart->io_base + reg);#endif + + addr = uart->remapped_io_base + (reg << uart->reg_shift);switch ( uart->reg_width ) {case 1 :
@@ -139,11 +142,14 @@ static u8 ns_read_reg(const struct ns16550 *uart, unsigned int reg)static void ns_write_reg (const struct ns16550 *uart,unsigned int reg,u8 c) { -void __iomem *addr = uart->remapped_io_base + (reg << uart->reg_shift); +void __iomem *addr; +#ifdef CONFIG_HAS_IOPORTS if ( uart->remapped_io_base ==NULL )return outb (c, uart->io_base + reg);#endif + + addr = uart->remapped_io_base + (reg << uart->reg_shift);switch ( uart->reg_width ) {case 1 :
Signature · 1 line
2.49.0
xen/drivers/char/ns16550.c static void cf_check ns16550_delayed_resume(void *data); · line 124
Quoted 8 lines · Roger Pau Monne
xen/drivers/char/ns16550.c +1
-1@@ -121,11 +121,14 @@ static void cf_check ns16550_delayed_resume(void *data);static u8 ns_read_reg (const struct ns16550 *uart,unsigned int reg) { -void __iomem *addr = uart->remapped_io_base + (reg << uart->reg_shift); +void __iomem *addr;
While making the change, would you mind adding const volatile here and ...
xen/drivers/char/ns16550.c static u8 ns_read_reg(const struct ns16550 *uart, unsigned int reg) · line 145
Quoted 6 lines
xen/drivers/char/ns16550.c +1
-1@@ -139,11 +142,14 @@ static u8 ns_read_reg(const struct ns16550 *uart, unsigned int reg)static void ns_write_reg (const struct ns16550 *uart,unsigned int reg,u8 c) { -void __iomem *addr = uart->remapped_io_base + (reg << uart->reg_shift); +void __iomem *addr;
... just volatile here? Preferably with that:
Reviewed-by Jan Beulich <[email protected]>
Jan