mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 08:26:59 +00:00
[BLUETOOTH] bnep endianness bug: filtering by packet type
<= and => don't work well on net-endian... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
ae08e1f092
commit
e41d216973
2 changed files with 14 additions and 13 deletions
|
@ -117,14 +117,14 @@ static int bnep_send_rsp(struct bnep_session *s, u8 ctrl, u16 resp)
|
||||||
static inline void bnep_set_default_proto_filter(struct bnep_session *s)
|
static inline void bnep_set_default_proto_filter(struct bnep_session *s)
|
||||||
{
|
{
|
||||||
/* (IPv4, ARP) */
|
/* (IPv4, ARP) */
|
||||||
s->proto_filter[0].start = htons(0x0800);
|
s->proto_filter[0].start = ETH_P_IP;
|
||||||
s->proto_filter[0].end = htons(0x0806);
|
s->proto_filter[0].end = ETH_P_ARP;
|
||||||
/* (RARP, AppleTalk) */
|
/* (RARP, AppleTalk) */
|
||||||
s->proto_filter[1].start = htons(0x8035);
|
s->proto_filter[1].start = ETH_P_RARP;
|
||||||
s->proto_filter[1].end = htons(0x80F3);
|
s->proto_filter[1].end = ETH_P_AARP;
|
||||||
/* (IPX, IPv6) */
|
/* (IPX, IPv6) */
|
||||||
s->proto_filter[2].start = htons(0x8137);
|
s->proto_filter[2].start = ETH_P_IPX;
|
||||||
s->proto_filter[2].end = htons(0x86DD);
|
s->proto_filter[2].end = ETH_P_IPV6;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -150,8 +150,8 @@ static int bnep_ctrl_set_netfilter(struct bnep_session *s, u16 *data, int len)
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < n; i++) {
|
for (i = 0; i < n; i++) {
|
||||||
f[i].start = get_unaligned(data++);
|
f[i].start = ntohs(get_unaligned(data++));
|
||||||
f[i].end = get_unaligned(data++);
|
f[i].end = ntohs(get_unaligned(data++));
|
||||||
|
|
||||||
BT_DBG("proto filter start %d end %d",
|
BT_DBG("proto filter start %d end %d",
|
||||||
f[i].start, f[i].end);
|
f[i].start, f[i].end);
|
||||||
|
|
|
@ -158,14 +158,15 @@ static inline int bnep_net_mc_filter(struct sk_buff *skb, struct bnep_session *s
|
||||||
static inline u16 bnep_net_eth_proto(struct sk_buff *skb)
|
static inline u16 bnep_net_eth_proto(struct sk_buff *skb)
|
||||||
{
|
{
|
||||||
struct ethhdr *eh = (void *) skb->data;
|
struct ethhdr *eh = (void *) skb->data;
|
||||||
|
u16 proto = ntohs(eh->h_proto);
|
||||||
|
|
||||||
if (ntohs(eh->h_proto) >= 1536)
|
if (proto >= 1536)
|
||||||
return eh->h_proto;
|
return proto;
|
||||||
|
|
||||||
if (get_unaligned((u16 *) skb->data) == 0xFFFF)
|
if (get_unaligned((__be16 *) skb->data) == htons(0xFFFF))
|
||||||
return htons(ETH_P_802_3);
|
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)
|
static inline int bnep_net_proto_filter(struct sk_buff *skb, struct bnep_session *s)
|
||||||
|
|
Loading…
Reference in a new issue