Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3c084e6 authored by Tong Zhang's avatar Tong Zhang Committed by Greg Kroah-Hartman
Browse files

atm: uPD98402: fix incorrect allocation 



[ Upstream commit 3153724fc084d8ef640c611f269ddfb576d1dcb1 ]

dev->dev_data is set in zatm.c, calling zatm_start() will overwrite this
dev->dev_data in uPD98402_start() and a subsequent PRIV(dev)->lock
(i.e dev->phy_data->lock) will result in a null-ptr-dereference.

I believe this is a typo and what it actually want to do is to allocate
phy_data instead of dev_data.

Signed-off-by: default avatarTong Zhang <ztong0001@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 04dca3c9

drivers/atm/uPD98402.c

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static void uPD98402_int(struct atm_dev *dev) 
static int uPD98402_start(struct atm_dev *dev)

{

	DPRINTK("phy_start\n");

	if (!(dev->dev_data = kmalloc(sizeof(struct uPD98402_priv),GFP_KERNEL)))

	if (!(dev->phy_data = kmalloc(sizeof(struct uPD98402_priv),GFP_KERNEL)))

		return -ENOMEM;

	spin_lock_init(&PRIV(dev)->lock);

	memset(&PRIV(dev)->sonet_stats,0,sizeof(struct k_sonet_stats));