Skip to content

Commit a3fafc9

Browse files
gscuigregkh
authored andcommitted
net: mdio: fix undefined behavior in bit shift for __mdiobus_register
[ Upstream commit 40e4eb3 ] Shifting signed 32-bit value by 31 bits is undefined, so changing significant bit to unsigned. The UBSAN warning calltrace like below: UBSAN: shift-out-of-bounds in drivers/net/phy/mdio_bus.c:586:27 left shift of 1 by 31 places cannot be represented in type 'int' Call Trace: <TASK> dump_stack_lvl+0x7d/0xa5 dump_stack+0x15/0x1b ubsan_epilogue+0xe/0x4e __ubsan_handle_shift_out_of_bounds+0x1e7/0x20c __mdiobus_register+0x49d/0x4e0 fixed_mdio_bus_init+0xd8/0x12d do_one_initcall+0x76/0x430 kernel_init_freeable+0x3b3/0x422 kernel_init+0x24/0x1e0 ret_from_fork+0x1f/0x30 </TASK> Fixes: 4fd5f81 ("phylib: allow incremental scanning of an mii bus") Signed-off-by: Gaosheng Cui <[email protected]> Reviewed-by: Andrew Lunn <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 7f7bfdd commit a3fafc9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/net/phy/mdio_bus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner)
412412
bus->reset(bus);
413413

414414
for (i = 0; i < PHY_MAX_ADDR; i++) {
415-
if ((bus->phy_mask & (1 << i)) == 0) {
415+
if ((bus->phy_mask & BIT(i)) == 0) {
416416
struct phy_device *phydev;
417417

418418
phydev = mdiobus_scan(bus, i);

0 commit comments

Comments
 (0)