Skip to contentSkip to conversation

ieee802154: Fix possible NULL pointer dereference in wpan_phy_alloc

PATCH Applied Denis Kirjanov 2 participants 2 messages May 23, 2010 – May 24, 2010

Subsystems (3)
Networking Network drivers IEEE 802.15.4
lore
Share & tools
lore

Denis Kirjanov

author
#0 lore raw

PATCH 1/1 ieee802154: Fix possible NULL pointer dereference in wpan_phy_alloc

Check for NULL pointer after kzalloc

Signed-off-by Denis Kirjanov <[email protected]>

---
net/ieee802154/wpan-class.c | 7 ++++++-

 1 files changed, 6 insertions(+), 1 deletions(-)
net/ieee802154/wpan-class.c +6 -1
index 3d803a1..1627ef2 100644
@@ -147,13 +147,15 @@ struct wpan_phy *wpan_phy_alloc(size_t priv_size)
 	struct wpan_phy *phy = kzalloc(sizeof(*phy) + priv_size,
 			GFP_KERNEL);
 
+	if (!phy)
+		goto out;
 	mutex_lock(&wpan_phy_mutex);
 	phy->idx = wpan_phy_idx++;
 	if (unlikely(!wpan_phy_idx_valid(phy->idx))) {
 		wpan_phy_idx--;
 		mutex_unlock(&wpan_phy_mutex);
 		kfree(phy);
-		return NULL;
+		goto out;
 	}
 	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 */
 
 	return phy;
+
+out:
+	return NULL;
 }
 EXPORT_SYMBOL(wpan_phy_alloc);