lkml.org 
[lkml]   [2006]   [Oct]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 4/4] 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>
    ---
    net/bluetooth/bnep/bnep.h | 4 ++--
    net/bluetooth/bnep/core.c | 16 ++++++++--------
    net/bluetooth/bnep/netdev.c | 15 ++++++++-------
    3 files changed, 18 insertions(+), 17 deletions(-)

    diff --git a/net/bluetooth/bnep/bnep.h b/net/bluetooth/bnep/bnep.h
    index 9ffaf1d..0b6cd0e 100644
    --- a/net/bluetooth/bnep/bnep.h
    +++ b/net/bluetooth/bnep/bnep.h
    @@ -143,8 +143,8 @@ struct bnep_connlist_req {
    };

    struct bnep_proto_filter {
    - __be16 start;
    - __be16 end;
    + __u16 start;
    + __u16 end;
    };

    int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock);
    diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
    index f0fbee3..3d8d97a 100644
    --- a/net/bluetooth/bnep/core.c
    +++ b/net/bluetooth/bnep/core.c
    @@ -117,14 +117,14 @@ #ifdef CONFIG_BT_BNEP_PROTO_FILTER
    static 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_FILTER
    int 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);
    diff --git a/net/bluetooth/bnep/netdev.c b/net/bluetooth/bnep/netdev.c
    index 916172d..4e321e3 100644
    --- a/net/bluetooth/bnep/netdev.c
    +++ b/net/bluetooth/bnep/netdev.c
    @@ -155,22 +155,23 @@ #endif

    #ifdef CONFIG_BT_BNEP_PROTO_FILTER
    /* Determine ether protocol. Based on eth_type_trans. */
    -static inline __be16 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;
    + 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)
    {
    - __be16 proto = bnep_net_eth_proto(skb);
    + __u16 proto = bnep_net_eth_proto(skb);
    struct bnep_proto_filter *f = s->proto_filter;
    int i;

    --
    1.4.2.GIT
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-10-15 23:33    [W:0.034 / U:0.388 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site