ieee802154_mlme_ops oops removal and cleanup
Subsystems (4)
cover ieee802154_mlme_ops oops removal and cleanup
This fixes a kernel oops we get when some linux-zigbee user space tools try to invoke unimplemented operations.
The second of the two patches checks whether the respective functions are present and returne EOPNOTSUPP if they aren't. It also updates the documentation.
The first one removes the unused get_bsn function, which was a small obstacle for the other patch.
- Werner
Werner Almesberger (2):
IEEE 802.15.4: remove get_bsn from "struct ieee802154_mlme_ops" ieee802154/nl-mac.c: make some MLME operations optional
Documentation/networking/ieee802154.txt | 5 +++-- drivers/net/ieee802154/fakehard.c | 21 --------------------- include/net/ieee802154_netdev.h | 5 ++++- net/ieee802154/nl-mac.c | 25 ++++++++++++++++++++----- 4 files changed, 27 insertions(+), 29 deletions(-)
Signature · 1 line
1.7.10.4
PATCH 1/2 IEEE 802.15.4: remove get_bsn from "struct ieee802154_mlme_ops"
It served no purpose: we never call it from anywhere in the stack and the only driver that did implement it (fakehard) merely provided a dummy value.
There is also considerable doubt whether it would make sense to even attempt beacon processing at this level in the Linux kernel.
--- drivers/net/ieee802154/fakehard.c | 21 --------------------- include/net/ieee802154_netdev.h | 1 - 2 files changed, 22 deletions(-)
drivers/net/ieee802154/fakehard.c +0 -21
@@ -106,26 +106,6 @@ static u8 fake_get_dsn(const struct net_device *dev) }/** -* fake_get_bsn - Retrieve the BSN of the device. -* @dev: The network device to retrieve the BSN for. -* -* Returns the IEEE 802.15.4 BSN for the network device. -* The BSN is the sequence number which will be added to each -* beacon frame sent by the MAC. -* -* BSN means 'Beacon Sequence Number'. -* -* Note: This is in section 7.2.1.2 of the IEEE 802.15.4-2006 -* document. -*/ -static u8 fake_get_bsn (const struct net_device *dev) -{ -BUG_ON (dev->type !=ARPHRD_IEEE802154 ); - -return 0x00 ;/* BSN are implemented in HW, so return just 0 */ -} - -/** * fake_assoc_req - Make an association request to the HW. * @dev: The network device which we are associating to a network. * @addr: The coordinator with which we wish to associate.
@@ -264,7 +244,6 @@ static struct ieee802154_mlme_ops fake_mlme = { .get_pan_id = fake_get_pan_id, .get_short_addr = fake_get_short_addr, .get_dsn = fake_get_dsn, - .get_bsn = fake_get_bsn, };static int ieee802154_fake_open (struct net_device *dev)
include/net/ieee802154_netdev.h +0 -1
@@ -110,7 +110,6 @@ struct ieee802154_mlme_ops {u16 (*get_pan_id)(const struct net_device *dev);u16 (*get_short_addr)(const struct net_device *dev);u8 (*get_dsn)(const struct net_device *dev); -u8 (*get_bsn)(const struct net_device *dev); };/* The IEEE 802.15.4 standard defines 2 type of the devices:
Signature · 1 line
1.7.10.4
PATCH 2/2 ieee802154/nl-mac.c: make some MLME operations optional
In reply to Werner AlmesbergerCheck for NULL before calling the following operations from "struct ieee802154_mlme_ops": assoc_req, assoc_resp, disassoc_req, start_req, and scan_req.
This fixes a current oops where those functions are called but not implemented. It also updates the documentation to clarify that they are now optional by design. If a call to an unimplemented function is attempted, the kernel returns EOPNOTSUPP via netlink.
The following operations are still required: get_phy, get_pan_id, get_short_addr, and get_dsn.
Note that the places where this patch changes the initialization of "ret" should not affect the rest of the code since "ret" was always set (again) before returning its value.
--- Documentation/networking/ieee802154.txt | 5 +++-- include/net/ieee802154_netdev.h | 4 ++++ net/ieee802154/nl-mac.c | 25 ++++++++++++++++++++----- 3 files changed, 27 insertions(+), 7 deletions(-)
Documentation/networking/ieee802154.txt +3 -2
@@ -71,8 +71,9 @@ submits skb to qdisc), so if you need something from that cb later, you should store info in the skb->data on your own. To hook the MLME interface you have to populate the ml_priv field of your -net_device with a pointer to struct ieee802154_mlme_ops instance. All fields are -required. +net_device with a pointer to struct ieee802154_mlme_ops instance. The fields +assoc_req, assoc_resp, disassoc_req, start_req, and scan_req are optional. +All other fields are required. We provide an example of simple HardMAC driver at drivers/ieee802154/fakehard.c
include/net/ieee802154_netdev.h +4 -0
@@ -85,6 +85,8 @@ struct wpan_phy;* Use wpan_wpy_put to put that reference. */ struct ieee802154_mlme_ops { +/* The following fields are optional (can be NULL). */ +int (*assoc_req)(struct net_device *dev,struct ieee802154_addr *addr,u8 channel,u8 page,u8 cap);
@@ -101,6 +103,8 @@ struct ieee802154_mlme_ops {int (*scan_req)(struct net_device *dev,u8 type,u32 channels,u8 page,u8 duration); +/* The fields below are required. */ +struct wpan_phy *(*get_phy)(const struct net_device *dev);/*
net/ieee802154/nl-mac.c +20 -5
@@ -315,7 +315,7 @@ static int ieee802154_associate_req(struct sk_buff *skb,struct net_device *dev;struct ieee802154_addr addr;u8 page; -int ret = -EINVAL ; +int ret = -EOPNOTSUPP ; if (!info->attrs[IEEE802154_ATTR_CHANNEL] || !info->attrs[IEEE802154_ATTR_COORD_PAN_ID] ||
@@ -327,6 +327,8 @@ static int ieee802154_associate_req(struct sk_buff *skb, dev =ieee802154_nl_get_dev (info);if (!dev)return -ENODEV ; +if (!ieee802154_mlme_ops (dev)->assoc_req) + goto out;if (info->attrs[IEEE802154_ATTR_COORD_HW_ADDR ]) { addr.addr_type =IEEE802154_ADDR_LONG ;
@@ -350,6 +352,7 @@ static int ieee802154_associate_req(struct sk_buff *skb, page, nla_get_u8(info->attrs[IEEE802154_ATTR_CAPABILITY])); +out:dev_put (dev);return ret; }
@@ -359,7 +362,7 @@ static int ieee802154_associate_resp(struct sk_buff *skb, {struct net_device *dev;struct ieee802154_addr addr; -int ret = -EINVAL ; +int ret = -EOPNOTSUPP ; if (!info->attrs[IEEE802154_ATTR_STATUS] || !info->attrs[IEEE802154_ATTR_DEST_HW_ADDR] ||
@@ -369,6 +372,8 @@ static int ieee802154_associate_resp(struct sk_buff *skb, dev =ieee802154_nl_get_dev (info);if (!dev)return -ENODEV ; +if (!ieee802154_mlme_ops (dev)->assoc_resp) + goto out; addr.addr_type =IEEE802154_ADDR_LONG ; nla_memcpy(addr.hwaddr, info->attrs[IEEE802154_ATTR_DEST_HW_ADDR],
@@ -380,6 +385,7 @@ static int ieee802154_associate_resp(struct sk_buff *skb,nla_get_u16 (info->attrs[IEEE802154_ATTR_DEST_SHORT_ADDR ]), nla_get_u8(info->attrs[IEEE802154_ATTR_STATUS])); +out:dev_put (dev);return ret; }
@@ -389,7 +395,7 @@ static int ieee802154_disassociate_req(struct sk_buff *skb, {struct net_device *dev;struct ieee802154_addr addr; -int ret = -EINVAL ; +int ret = -EOPNOTSUPP ; if ((!info->attrs[IEEE802154_ATTR_DEST_HW_ADDR] && !info->attrs[IEEE802154_ATTR_DEST_SHORT_ADDR]) ||
@@ -399,6 +405,8 @@ static int ieee802154_disassociate_req(struct sk_buff *skb, dev =ieee802154_nl_get_dev (info);if (!dev)return -ENODEV ; +if (!ieee802154_mlme_ops (dev)->disassoc_req) + goto out;if (info->attrs[IEEE802154_ATTR_DEST_HW_ADDR ]) { addr.addr_type =IEEE802154_ADDR_LONG ;
@@ -415,6 +423,7 @@ static int ieee802154_disassociate_req(struct sk_buff *skb, ret =ieee802154_mlme_ops (dev)->disassoc_req (dev, &addr,nla_get_u8 (info->attrs[IEEE802154_ATTR_REASON ])); +out:dev_put (dev);return ret; }
@@ -432,7 +441,7 @@ static int ieee802154_start_req(struct sk_buff *skb, struct genl_info *info)u8 channel, bcn_ord, sf_ord;u8 page;int pan_coord, blx, coord_realign; -int ret; +int ret = -EOPNOTSUPP ; if (!info->attrs[IEEE802154_ATTR_COORD_PAN_ID] || !info->attrs[IEEE802154_ATTR_COORD_SHORT_ADDR] ||
@@ -448,6 +457,8 @@ static int ieee802154_start_req(struct sk_buff *skb, struct genl_info *info) dev =ieee802154_nl_get_dev (info);if (!dev)return -ENODEV ; +if (!ieee802154_mlme_ops (dev)->start_req) + goto out; addr.addr_type =IEEE802154_ADDR_SHORT ; addr.short_addr = nla_get_u16(
@@ -476,6 +487,7 @@ static int ieee802154_start_req(struct sk_buff *skb, struct genl_info *info) ret =ieee802154_mlme_ops (dev)->start_req (dev, &addr, channel, page, bcn_ord, sf_ord, pan_coord, blx, coord_realign); +out:dev_put (dev);return ret; }
@@ -483,7 +495,7 @@ static int ieee802154_start_req(struct sk_buff *skb, struct genl_info *info)static int ieee802154_scan_req (struct sk_buff *skb,struct genl_info *info) {struct net_device *dev; -int ret; +int ret = -EOPNOTSUPP ;u8 type;u32 channels;u8 duration;
@@ -497,6 +509,8 @@ static int ieee802154_scan_req(struct sk_buff *skb, struct genl_info *info) dev =ieee802154_nl_get_dev (info);if (!dev)return -ENODEV ; +if (!ieee802154_mlme_ops (dev)->scan_req) + goto out; type =nla_get_u8 (info->attrs[IEEE802154_ATTR_SCAN_TYPE ]); channels =nla_get_u32 (info->attrs[IEEE802154_ATTR_CHANNELS ]);
@@ -511,6 +525,7 @@ static int ieee802154_scan_req(struct sk_buff *skb, struct genl_info *info) ret =ieee802154_mlme_ops (dev)->scan_req (dev, type, channels, page, duration); +out:dev_put (dev);return ret; }
Signature · 1 line
1.7.10.4
David Miller
maintainerFrom: Werner Almesberger <[email protected]>
Date: Thu, 4 Apr 2013 13:31:46 -0300
Quoted 9 lines
This fixes a kernel oops we get when some linux-zigbee user space tools try to invoke unimplemented operations.
The second of the two patches checks whether the respective functions are present and returne EOPNOTSUPP if they aren't. It also updates the documentation.
The first one removes the unused
get_bsnfunction, which was a small obstacle for the other patch.
Both applied, thanks.