Re: [Linux-ATM-General] Subject: [PATCH 2/2] atm: br2684: Avoid alignment issues

[Philip P. <phi...@re...>]

Errr, my bad. It's the patches from Nathan from October that seem to be stalled.


On 1/2/12 6:59 PM, Philip Prindeville wrote:
> Was this acked by netdev?
> 
> I've not seen anything and it's not appeared in linux-next yet...
> 
> 
> On 11/28/11 11:40 AM, chas williams - CONTRACTOR wrote:
>>
>> From: Pascal Hambourg <pa...@pl...>
>> Date: Wed, 17 Aug 2011 08:37:52 +0200
>> Subject: [PATCH 2/2] atm: br2684: Avoid alignment issues
>>
>> Use memcmp() instead of cast to u16 when checking the PAD field.
>>
>> Signed-off-by: Pascal Hambourg <pa...@pl...>
>> Signed-off-by: chas williams - CONTRACTOR <ch...@cm...>
>> ---
>>  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 ed72263..353fccf 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);