Bluetooth: 6LoWPAN: Fix lladdr length
Subsystems (7)
v4 cover Bluetooth: 6LoWPAN: Fix lladdr length
From: Luiz Augusto von Dentz <[email protected]>
These patches fixes lladdr length to be 6 bytes long and not 8 which cause neighbor advertisement to be sent with wrong lladdr including FF:FE filler bytes for eui64/iid.
Note: This does not fix some of the existing crashes which I hope to address in a different set.
v2: Make all code paths that generate a link-local from lladdr use the same code.
v3: Use lowpan_iphc_uncompress_eui48_lladdr to generate the remote ip address.
v4: Handle comments from Stefan Schmidt.
Alexander Aring (2):
6lowpan: iphc: override l2 packet information
ipv6: addrconf: fix 48 bit 6lowpan autoconfiguration
Luiz Augusto von Dentz (1):
6lowpan: Use netdev addr_len to determine lladdr len
Patrik Flykt (2):
bluetooth: Set 6 byte device addresses
6lowpan: Set MAC address lenght according to LOWPAN_LLTYPE
include/net/6lowpan.h | 19 +++++++++++++++++ net/6lowpan/core.c | 11 +++++++++- net/6lowpan/iphc.c | 57 ++++++++++++++++++++++++++++++++++++++----------- net/bluetooth/6lowpan.c | 52 +++++++++++--------------------------------- net/ipv6/addrconf.c | 17 ++++++++++----- 5 files changed, 99 insertions(+), 57 deletions(-)
Signature · 1 line
2.9.3
Luiz Augusto von Dentz
maintainerPATCH v4 1/5 bluetooth: Set 6 byte device addresses
From: Patrik Flykt <[email protected]>
Set BTLE MAC addresses that are 6 bytes long and not 8 bytes that are used in other places with 6lowpan.
--- net/bluetooth/6lowpan.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
net/bluetooth/6lowpan.c +8 -11
@@ -80,6 +80,8 @@ struct lowpan_btle_dev {struct delayed_work notify_peers; }; +static void set_addr (u8 *eui,u8 *addr,u8 addr_type); +static inline struct lowpan_btle_dev *lowpan_btle_dev (const struct net_device *netdev) {
@@ -272,9 +274,10 @@ static int give_skb_to_upper(struct sk_buff *skb, struct net_device *dev)static int iphc_decompress (struct sk_buff *skb,struct net_device *netdev,struct l2cap_chan *chan) { -const u8 *saddr, *daddr; +const u8 *saddr;struct lowpan_btle_dev *dev;struct lowpan_peer *peer; +unsigned char eui64_daddr[EUI64_ADDR_LEN ]; dev =lowpan_btle_dev (netdev);
@@ -285,9 +288,9 @@ static int iphc_decompress(struct sk_buff *skb, struct net_device *netdev,return -EINVAL ; saddr = peer->eui64_addr; - daddr = dev->netdev->dev_addr; +set_addr (&eui64_daddr[0 ], chan->src.b, chan->src_type); -return lowpan_header_decompress (skb, netdev, daddr, saddr); +return lowpan_header_decompress (skb, netdev, &eui64_daddr, saddr); } static int recv_pkt(struct sk_buff *skb, struct net_device *dev,
@@ -681,13 +684,6 @@ static void set_addr(u8 *eui, u8 *addr, u8 addr_type)BT_DBG ("type %d addr %*phC" , addr_type,8 , eui); } -static void set_dev_addr (struct net_device *netdev,bdaddr_t *addr, -u8 addr_type) -{ - netdev->addr_assign_type =NET_ADDR_PERM ; -set_addr (netdev->dev_addr, addr->b, addr_type); -} -static void ifup (struct net_device *netdev) {int err;
@@ -803,7 +799,8 @@ static int setup_netdev(struct l2cap_chan *chan, struct lowpan_btle_dev **dev)if (!netdev)return -ENOMEM ; -set_dev_addr (netdev, &chan->src, chan->src_type); + netdev->addr_assign_type =NET_ADDR_PERM ; +baswap ((void *)netdev->dev_addr, &chan->src); netdev->netdev_ops = &netdev_ops;SET_NETDEV_DEV (netdev, &chan->conn->hcon->hdev->dev);
Signature · 1 line
2.9.3
A message that is not in the archive (sent off-list or not yet received): 20170221103811.1506-1-luiz.dentz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
PATCH v3 2/5 6lowpan: Set MAC address lenght according to LOWPAN_LLTYPE
From: Patrik Flykt <[email protected]>
Set MAC address length according to the 6LoWPAN link layer in use. Bluetooth Low Energy uses 48 bit addressing while IEEE802.15.4 uses 64 bits.
--- net/6lowpan/core.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
net/6lowpan/core.c +10 -1
@@ -23,7 +23,16 @@ int lowpan_register_netdevice(struct net_device *dev, {int i, ret; - dev->addr_len =EUI64_ADDR_LEN ; +switch (lltype) { +case LOWPAN_LLTYPE_IEEE802154 : + dev->addr_len =EUI64_ADDR_LEN ; +break ; + +case LOWPAN_LLTYPE_BTLE : + dev->addr_len =ETH_ALEN ; +break ; + } + dev->type =ARPHRD_6LOWPAN ; dev->mtu =IPV6_MIN_MTU ; dev->priv_flags |=IFF_NO_QUEUE ;
Signature · 1 line
2.9.3
PATCH v4 3/5 6lowpan: iphc: override l2 packet information
In reply to a message not in the archiveFrom: Alexander Aring <[email protected]>
The skb->pkt_type need to be set by L2, but on 6LoWPAN there exists L2 e.g. BTLE which doesn't has multicast addressing. If it's a multicast or not is detected by IPHC headers multicast bit. The IPv6 layer will evaluate this pkt_type, so we force set this type while uncompressing. Should be okay for 802.15.4 as well.
--- net/6lowpan/iphc.c | 8 ++++++++ 1 file changed, 8 insertions(+)
net/6lowpan/iphc.c +8 -0
@@ -666,6 +666,8 @@ int lowpan_header_decompress(struct sk_buff *skb, const struct net_device *dev,switch (iphc1 & (LOWPAN_IPHC_M |LOWPAN_IPHC_DAC )) {case LOWPAN_IPHC_M |LOWPAN_IPHC_DAC : + skb->pkt_type =PACKET_BROADCAST ; +spin_lock_bh (&lowpan_dev (dev)->ctx.lock); ci =lowpan_iphc_ctx_get_by_id (dev,LOWPAN_IPHC_CID_DCI (cid));if (!ci) {
@@ -681,11 +683,15 @@ int lowpan_header_decompress(struct sk_buff *skb, const struct net_device *dev,spin_unlock_bh (&lowpan_dev (dev)->ctx.lock);break ;case LOWPAN_IPHC_M : + skb->pkt_type =PACKET_BROADCAST ; +/* multicast */ err =lowpan_uncompress_multicast_daddr (skb, &hdr.daddr, iphc1 &LOWPAN_IPHC_DAM_MASK );break ;case LOWPAN_IPHC_DAC : + skb->pkt_type =PACKET_HOST ; +spin_lock_bh (&lowpan_dev (dev)->ctx.lock); ci =lowpan_iphc_ctx_get_by_id (dev,LOWPAN_IPHC_CID_DCI (cid));if (!ci) {
@@ -701,6 +707,8 @@ int lowpan_header_decompress(struct sk_buff *skb, const struct net_device *dev,spin_unlock_bh (&lowpan_dev (dev)->ctx.lock);break ;default : + skb->pkt_type =PACKET_HOST ; + err =lowpan_iphc_uncompress_addr (skb, dev, &hdr.daddr, iphc1 &LOWPAN_IPHC_DAM_MASK , daddr);
Signature · 1 line
2.9.3
PATCH v4 4/5 ipv6: addrconf: fix 48 bit 6lowpan autoconfiguration
In reply to a message not in the archiveFrom: Alexander Aring <[email protected]>
This patch adds support for 48 bit 6LoWPAN address length autoconfiguration which is the case for BTLE 6LoWPAN.
--- net/ipv6/addrconf.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
net/ipv6/addrconf.c +12 -5
@@ -2052,12 +2052,19 @@ static void addrconf_leave_anycast(struct inet6_ifaddr *ifp)__ipv6_dev_ac_dec (ifp->idev, &addr); } -static int addrconf_ifid_eui64 (u8 *eui,struct net_device *dev) +static int addrconf_ifid_6lowpan (u8 *eui,struct net_device *dev) { -if (dev->addr_len !=EUI64_ADDR_LEN ) +switch (dev->addr_len) { +case ETH_ALEN : +return addrconf_ifid_eui48 (eui, dev); +case EUI64_ADDR_LEN : +memcpy (eui, dev->dev_addr,EUI64_ADDR_LEN ); + eui[0 ] ^=2 ; +break ; +default :return -1 ; -memcpy (eui, dev->dev_addr,EUI64_ADDR_LEN ); - eui[0 ] ^=2 ; + } +return 0 ; }
@@ -2149,7 +2156,7 @@ static int ipv6_generate_eui64(u8 *eui, struct net_device *dev)case ARPHRD_TUNNEL :return addrconf_ifid_gre (eui, dev);case ARPHRD_6LOWPAN : -return addrconf_ifid_eui64 (eui, dev); +return addrconf_ifid_6lowpan (eui, dev);case ARPHRD_IEEE1394 :return addrconf_ifid_ieee1394 (eui, dev);case ARPHRD_TUNNEL6 :
Signature · 1 line
2.9.3
Re: [PATCH v4 4/5] ipv6: addrconf: fix 48 bit 6lowpan autoconfiguration
From: Luiz Augusto von Dentz <[email protected]>
Date: Tue, 21 Feb 2017 12:38:10 +0200
Quoted 8 lines
From: Alexander Aring <[email protected]>
This patch adds support for 48 bit 6LoWPAN address length autoconfiguration which is the case for BTLE 6LoWPAN.
Signed-off-by Alexander Aring <[email protected]>Signed-off-by Luiz Augusto von Dentz <[email protected]>Reviewed-by Stefan Schmidt <[email protected]>
This is fine and I have no problem with it going via the bluetooth tree, thanks.
PATCH v4 5/5 6lowpan: Use netdev addr_len to determine lladdr len
In reply to a message not in the archiveFrom: Luiz Augusto von Dentz <[email protected]>
This allow technologies such as Bluetooth to use its native lladdr which is eui48 instead of eui64 which was expected by functions like lowpan_header_decompress and lowpan_header_compress.
--- include/net/6lowpan.h | 19 +++++++++++++++++++ net/6lowpan/iphc.c | 49 ++++++++++++++++++++++++++++++++++++++----------- net/bluetooth/6lowpan.c | 42 ++++++------------------------------------ 3 files changed, 63 insertions(+), 47 deletions(-)
include/net/6lowpan.h +19 -0
@@ -198,6 +198,25 @@ static inline void lowpan_iphc_uncompress_eui64_lladdr(struct in6_addr *ipaddr, ipaddr->s6_addr[8 ] ^=0x02 ; } +static inline void lowpan_iphc_uncompress_eui48_lladdr (struct in6_addr *ipaddr, +const void *lladdr) +{ +/* fe:80::XXXX:XXff:feXX:XXXX +* \_________________/ +* hwaddr +*/ + ipaddr->s6_addr[0 ] =0xFE ; + ipaddr->s6_addr[1 ] =0x80 ; +memcpy (&ipaddr->s6_addr[8 ], lladdr,3 ); + ipaddr->s6_addr[11 ] =0xFF ; + ipaddr->s6_addr[12 ] =0xFE ; +memcpy (&ipaddr->s6_addr[13 ], lladdr +3 ,3 ); +/* second bit-flip (Universe/Local) +* is done according RFC2464 +*/ + ipaddr->s6_addr[8 ] ^=0x02 ; +} +#ifdef DEBUG /* print data in line */ static inline void raw_dump_inline(const char *caller, char *msg,
net/6lowpan/iphc.c +38 -11
88 lines not on this page · raw message
net/bluetooth/6lowpan.c +6 -36
86 lines not on this page · raw message
Signature · 1 line
2.9.3
Luiz Augusto von Dentz
maintainerPATCH v4 2/5 6lowpan: Set MAC address length according to LOWPAN_LLTYPE
In reply to Luiz Augusto von DentzFrom: Patrik Flykt <[email protected]>
Set MAC address length according to the 6LoWPAN link layer in use. Bluetooth Low Energy uses 48 bit addressing while IEEE802.15.4 uses 64 bits.
--- net/6lowpan/core.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
net/6lowpan/core.c +10 -1
@@ -23,7 +23,16 @@ int lowpan_register_netdevice(struct net_device *dev, {int i, ret; - dev->addr_len =EUI64_ADDR_LEN ; +switch (lltype) { +case LOWPAN_LLTYPE_IEEE802154 : + dev->addr_len =EUI64_ADDR_LEN ; +break ; + +case LOWPAN_LLTYPE_BTLE : + dev->addr_len =ETH_ALEN ; +break ; + } + dev->type =ARPHRD_6LOWPAN ; dev->mtu =IPV6_MIN_MTU ; dev->priv_flags |=IFF_NO_QUEUE ;
Signature · 1 line
2.9.3