diff options
| author | Rémi Denis-Courmont <remi.denis-courmont@nokia.com> | 2008-11-27 00:26:43 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-27 00:26:43 +0100 |
| commit | 7e5ab54296a41f590c9cbc976e1c86272f3a7e00 (patch) | |
| tree | e3ccf692a222e7c797b3cdbddfc8b09ef8e69d1a /net | |
| parent | netfilter: ctnetlink: fix GFP_KERNEL allocation under spinlock (diff) | |
| download | linux-7e5ab54296a41f590c9cbc976e1c86272f3a7e00.tar.xz linux-7e5ab54296a41f590c9cbc976e1c86272f3a7e00.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/phonet/pn_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c index 53be9fc82aaa..f93ff8ef47d0 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; |