openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ieee802154: Fix possible NULL pointer dereference in wpan_phy_alloc 

Check for NULL pointer after kzalloc

Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis Kirjanov 2010-05-23 05:45:45 +00:00 committed by David S. Miller
parent 418c437d8b
commit a6c0f8217c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/ieee802154/wpan-class.c
View File

@ -147,13 +147,15 @@ struct wpan_phy *wpan_phy_alloc(size_t priv_size)
struct wpan_phy *phy = kzalloc(sizeof(*phy) + priv_size, struct wpan_phy *phy = kzalloc(sizeof(*phy) + priv_size,
GFP_KERNEL); GFP_KERNEL);
if (!phy)
goto out;
mutex_lock(&wpan_phy_mutex); mutex_lock(&wpan_phy_mutex);
phy->idx = wpan_phy_idx++; phy->idx = wpan_phy_idx++;
if (unlikely(!wpan_phy_idx_valid(phy->idx))) { if (unlikely(!wpan_phy_idx_valid(phy->idx))) {
wpan_phy_idx--; wpan_phy_idx--;
mutex_unlock(&wpan_phy_mutex); mutex_unlock(&wpan_phy_mutex);
kfree(phy); kfree(phy);
return NULL; goto out;
} }
mutex_unlock(&wpan_phy_mutex); mutex_unlock(&wpan_phy_mutex);
@ -168,6 +170,9 @@ struct wpan_phy *wpan_phy_alloc(size_t priv_size)
phy->current_page = 0; /* for compatibility */ phy->current_page = 0; /* for compatibility */
return phy; return phy;
out:
return NULL;
} }
EXPORT_SYMBOL(wpan_phy_alloc); EXPORT_SYMBOL(wpan_phy_alloc);