Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit befc93fe authored by Pascal Hambourg's avatar Pascal Hambourg Committed by David S. Miller
Browse files

atm: br2684: Avoid alignment issues 



Use memcmp() instead of cast to u16 when checking the PAD field.

Signed-off-by: default avatarPascal Hambourg <pascal@plouf.fr.eu.org>
Signed-off-by: default avatarchas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9e667b29

net/atm/br2684.c

+2 −1
Original line number Diff line number Diff line
@@ -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);