Skip to content

Commit e19c10d

Browse files
sunnanyonggregkh
authored andcommitted
net: encx24j600: check error in devm_regmap_init_encx24j600
commit f03dca0 upstream. devm_regmap_init may return error which caused by like out of memory, this will results in null pointer dereference later when reading or writing register: general protection fault in encx24j600_spi_probe KASAN: null-ptr-deref in range [0x0000000000000090-0x0000000000000097] CPU: 0 PID: 286 Comm: spi-encx24j600- Not tainted 5.15.0-rc2-00142-g9978db750e31-dirty #11 9c53a778c1306b1b02359f3c2bbedc0222cba652 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-1ubuntu1.1 04/01/2014 RIP: 0010:regcache_cache_bypass drivers/base/regmap/regcache.c:540 Code: 54 41 89 f4 55 53 48 89 fb 48 83 ec 08 e8 26 94 a8 fe 48 8d bb a0 00 00 00 48 b8 00 00 00 00 00 fc ff df 48 89 fa 48 c1 ea 03 <80> 3c 02 00 0f 85 4a 03 00 00 4c 8d ab b0 00 00 00 48 8b ab a0 00 RSP: 0018:ffffc900010476b8 EFLAGS: 00010207 RAX: dffffc0000000000 RBX: fffffffffffffff4 RCX: 0000000000000000 RDX: 0000000000000012 RSI: ffff888002de0000 RDI: 0000000000000094 RBP: ffff888013c9a000 R08: 0000000000000000 R09: fffffbfff3f9cc6a R10: ffffc900010476e8 R11: fffffbfff3f9cc69 R12: 0000000000000001 R13: 000000000000000a R14: ffff888013c9af54 R15: ffff888013c9ad08 FS: 00007ffa984ab580(0000) GS:ffff88801fe00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000055a6384136c8 CR3: 000000003bbe6003 CR4: 0000000000770ef0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 PKRU: 55555554 Call Trace: encx24j600_spi_probe drivers/net/ethernet/microchip/encx24j600.c:459 spi_probe drivers/spi/spi.c:397 really_probe drivers/base/dd.c:517 __driver_probe_device drivers/base/dd.c:751 driver_probe_device drivers/base/dd.c:782 __device_attach_driver drivers/base/dd.c:899 bus_for_each_drv drivers/base/bus.c:427 __device_attach drivers/base/dd.c:971 bus_probe_device drivers/base/bus.c:487 device_add drivers/base/core.c:3364 __spi_add_device drivers/spi/spi.c:599 spi_add_device drivers/spi/spi.c:641 spi_new_device drivers/spi/spi.c:717 new_device_store+0x18c/0x1f1 [spi_stub 4e02719357f1ff33f5a43d00630982840568e85e] dev_attr_store drivers/base/core.c:2074 sysfs_kf_write fs/sysfs/file.c:139 kernfs_fop_write_iter fs/kernfs/file.c:300 new_sync_write fs/read_write.c:508 (discriminator 4) vfs_write fs/read_write.c:594 ksys_write fs/read_write.c:648 do_syscall_64 arch/x86/entry/common.c:50 entry_SYSCALL_64_after_hwframe arch/x86/entry/entry_64.S:113 Add error check in devm_regmap_init_encx24j600 to avoid this situation. Fixes: 04fbfce ("net: Microchip encx24j600 driver") Reported-by: Hulk Robot <[email protected]> Signed-off-by: Nanyong Sun <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent f2e1de0 commit e19c10d

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

drivers/net/ethernet/microchip/encx24j600-regmap.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -497,13 +497,19 @@ static struct regmap_bus phymap_encx24j600 = {
497497
.reg_read = regmap_encx24j600_phy_reg_read,
498498
};
499499

500-
void devm_regmap_init_encx24j600(struct device *dev,
501-
struct encx24j600_context *ctx)
500+
int devm_regmap_init_encx24j600(struct device *dev,
501+
struct encx24j600_context *ctx)
502502
{
503503
mutex_init(&ctx->mutex);
504504
regcfg.lock_arg = ctx;
505505
ctx->regmap = devm_regmap_init(dev, &regmap_encx24j600, ctx, &regcfg);
506+
if (IS_ERR(ctx->regmap))
507+
return PTR_ERR(ctx->regmap);
506508
ctx->phymap = devm_regmap_init(dev, &phymap_encx24j600, ctx, &phycfg);
509+
if (IS_ERR(ctx->phymap))
510+
return PTR_ERR(ctx->phymap);
511+
512+
return 0;
507513
}
508514
EXPORT_SYMBOL_GPL(devm_regmap_init_encx24j600);
509515

drivers/net/ethernet/microchip/encx24j600.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1024,10 +1024,13 @@ static int encx24j600_spi_probe(struct spi_device *spi)
10241024
priv->speed = SPEED_100;
10251025

10261026
priv->ctx.spi = spi;
1027-
devm_regmap_init_encx24j600(&spi->dev, &priv->ctx);
10281027
ndev->irq = spi->irq;
10291028
ndev->netdev_ops = &encx24j600_netdev_ops;
10301029

1030+
ret = devm_regmap_init_encx24j600(&spi->dev, &priv->ctx);
1031+
if (ret)
1032+
goto out_free;
1033+
10311034
mutex_init(&priv->lock);
10321035

10331036
/* Reset device and check if it is connected */

drivers/net/ethernet/microchip/encx24j600_hw.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ struct encx24j600_context {
1515
int bank;
1616
};
1717

18-
void devm_regmap_init_encx24j600(struct device *dev,
19-
struct encx24j600_context *ctx);
18+
int devm_regmap_init_encx24j600(struct device *dev,
19+
struct encx24j600_context *ctx);
2020

2121
/* Single-byte instructions */
2222
#define BANK_SELECT(bank) (0xC0 | ((bank & (BANK_MASK >> BANK_SHIFT)) << 1))

0 commit comments

Comments
 (0)