bnep endianness bug: filtering by packet type
PATCH 1/1 bnep endianness bug: filtering by packet type
<= and => don't work well on net-endian...
Signed-off-by Al Viro <[email protected]>
--- net/bluetooth/bnep/core.c | 16 ++++++++-------- net/bluetooth/bnep/netdev.c | 11 ++++++----- 2 files changed, 14 insertions(+), 13 deletions(-)
net/bluetooth/bnep/core.c +8 -8
@@ -117,14 +117,14 @@ #ifdef CONFIG_BT_BNEP_PROTO_FILTERstatic inline void bnep_set_default_proto_filter (struct bnep_session *s) {/* (IPv4, ARP) */ - s->proto_filter[0 ].start =htons (0x0800 ); - s->proto_filter[0 ].end =htons (0x0806 ); + s->proto_filter[0 ].start =ETH_P_IP ; + s->proto_filter[0 ].end =ETH_P_ARP ;/* (RARP, AppleTalk) */ - s->proto_filter[1 ].start =htons (0x8035 ); - s->proto_filter[1 ].end =htons (0x80F3 ); + s->proto_filter[1 ].start =ETH_P_RARP ; + s->proto_filter[1 ].end =ETH_P_AARP ;/* (IPX, IPv6) */ - s->proto_filter[2 ].start =htons (0x8137 ); - s->proto_filter[2 ].end =htons (0x86DD ); + s->proto_filter[2 ].start =ETH_P_IPX ; + s->proto_filter[2 ].end =ETH_P_IPV6 ; }#endif
@@ -150,8 +150,8 @@ #ifdef CONFIG_BT_BNEP_PROTO_FILTERint i;for (i =0 ; i < n; i++) { - f[i].start =get_unaligned (data++); - f[i].end =get_unaligned (data++); + f[i].start =ntohs (get_unaligned (data++)); + f[i].end =ntohs (get_unaligned (data++));BT_DBG ("proto filter start %d end %d" , f[i].start, f[i].end);
net/bluetooth/bnep/netdev.c +6 -5
@@ -158,14 +158,15 @@ #ifdef CONFIG_BT_BNEP_PROTO_FILTERstatic inline u16 bnep_net_eth_proto (struct sk_buff *skb) {struct ethhdr *eh = (void *) skb->data; +u16 proto =ntohs (eh->h_proto); -if (ntohs (eh->h_proto) >=1536 ) -return eh->h_proto; +if (proto >=1536 ) +return proto; -if (get_unaligned ((u16 *) skb->data) ==0xFFFF ) -return htons (ETH_P_802_3 ); +if (get_unaligned ((__be16 *) skb->data) ==htons (0xFFFF )) +return ETH_P_802_3 ; -return htons (ETH_P_802_2 ); +return ETH_P_802_2 ; }static inline int bnep_net_proto_filter (struct sk_buff *skb,struct bnep_session *s)
Signature · 1 line
1.4.2.GIT
Marcel Holtmann
maintainerHi Al,
Quoted 3 lines
<= and => don't work well on net-endian...
Signed-off-by Al Viro <[email protected]>
Signed-off-by Marcel Holtmann <[email protected]>
Regards
Marcel