From: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Date: Wed, 26 Nov 2008 23:26:43 +0000 (-0800)
Subject: Phonet: fix oops in phonet_address_del() on non-Phonet device
X-Git-Tag: v2.6.28-rc8~73^2~5
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7e5ab54296a41f590c9cbc976e1c86272f3a7e00;p=linux-2.6-omap-h63xx.git

Phonet: fix oops in phonet_address_del() on non-Phonet device

A NULL dereference would occur when trying to delete an addres from a
network device that does not have any Phonet address.

Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c
index 53be9fc82aa..f93ff8ef47d 100644
--- a/net/phonet/pn_dev.c
+++ b/net/phonet/pn_dev.c
@@ -115,7 +115,7 @@ int phonet_address_del(struct net_device *dev, u8 addr)
 	pnd = __phonet_get(dev);
 	if (!pnd || !test_and_clear_bit(addr >> 2, pnd->addrs))
 		err = -EADDRNOTAVAIL;
-	if (bitmap_empty(pnd->addrs, 64))
+	else if (bitmap_empty(pnd->addrs, 64))
 		__phonet_device_free(pnd);
 	spin_unlock_bh(&pndevs.lock);
 	return err;