diff options
| author | Pascal Hambourg <pascal@plouf.fr.eu.org> | 2011-08-17 08:37:52 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-29 00:28:06 -0500 |
| commit | befc93fe76177b3b6ee1e3351b58293866f43aa6 (patch) | |
| tree | 628719a9883321ada7fde842141a739565c51f5b | |
| parent | 9e667b29880df842085150d60e26c60f141fff44 (diff) | |
atm: br2684: Avoid alignment issues
Use memcmp() instead of cast to u16 when checking the PAD field.
Signed-off-by: Pascal Hambourg <pascal@plouf.fr.eu.org>
Signed-off-by: chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/atm/br2684.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/atm/br2684.c b/net/atm/br2684.c index ed72263d0dc..353fccf1cde 100644 --- a/net/atm/br2684.c +++ b/net/atm/br2684.c @@ -53,6 +53,7 @@ static const unsigned char ethertype_ipv4[] = { ETHERTYPE_IPV4 }; static const unsigned char ethertype_ipv6[] = { ETHERTYPE_IPV6 }; static const unsigned char llc_oui_pid_pad[] = { LLC, SNAP_BRIDGED, PID_ETHERNET, PAD_BRIDGED }; +static const unsigned char pad[] = { PAD_BRIDGED }; static const unsigned char llc_oui_ipv4[] = { LLC, SNAP_ROUTED, ETHERTYPE_IPV4 }; static const unsigned char llc_oui_ipv6[] = { LLC, SNAP_ROUTED, ETHERTYPE_IPV6 }; @@ -453,7 +454,7 @@ static void br2684_push(struct atm_vcc *atmvcc, struct sk_buff *skb) skb->pkt_type = PACKET_HOST; } else { /* p_bridged */ /* first 2 chars should be 0 */ - if (*((u16 *) (skb->data)) != 0) + if (memcmp(skb->data, pad, BR2684_PAD_LEN) != 0) goto error; skb_pull(skb, BR2684_PAD_LEN); skb->protocol = eth_type_trans(skb, net_dev); |