diff options
| author | vegard.nossum@oracle.com <vegard.nossum@oracle.com> | 2016-07-20 10:43:11 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@osg.samsung.com> | 2016-11-30 12:33:07 +0100 |
| commit | 5b3211dcd43582c48291e7fc22b2e6d5c7faded5 (patch) | |
| tree | d52a2580b9b4cecdea672f017ef3014d5e88344f /net/ieee802154 | |
| parent | Bluetooth: hci_qca: Use setup_timer Kernel API instead of init_timer (diff) | |
| download | linux-5b3211dcd43582c48291e7fc22b2e6d5c7faded5.tar.xz linux-5b3211dcd43582c48291e7fc22b2e6d5c7faded5.zip | |
ieee802154: check device type
I've observed a NULL pointer dereference in ieee802154_del_iface() during
netlink fuzzing. It's the ->wpan_phy dereference here:
phy = dev->ieee802154_ptr->wpan_phy;
My bet is that we're not checking that this is an IEEE802154 interface,
so let's do what ieee802154_nl_get_dev() is doing. (Maybe we should even
be calling this directly?)
Cc: Lennert Buytenhek <buytenh@wantstofly.org>
Cc: Alexander Aring <alex.aring@gmail.com>
Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: Sergey Lapin <slapin@ossfans.org>
Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
Acked-by: Alexander Aring <aar@pengutronix.de>
Signed-off-by: Stefan Schmidt <stefan@osg.samsung.com>
Diffstat (limited to 'net/ieee802154')
| -rw-r--r-- | net/ieee802154/nl-phy.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/ieee802154/nl-phy.c b/net/ieee802154/nl-phy.c index 77d73014bde3..dc2960be51e0 100644 --- a/net/ieee802154/nl-phy.c +++ b/net/ieee802154/nl-phy.c @@ -286,9 +286,12 @@ int ieee802154_del_iface(struct sk_buff *skb, struct genl_info *info) if (name[nla_len(info->attrs[IEEE802154_ATTR_DEV_NAME]) - 1] != '\0') return -EINVAL; /* name should be null-terminated */ + rc = -ENODEV; dev = dev_get_by_name(genl_info_net(info), name); if (!dev) - return -ENODEV; + return rc; + if (dev->type != ARPHRD_IEEE802154) + goto out; phy = dev->ieee802154_ptr->wpan_phy; BUG_ON(!phy); @@ -342,6 +345,7 @@ nla_put_failure: nlmsg_free(msg); out_dev: wpan_phy_put(phy); +out: if (dev) dev_put(dev); |