leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

skbuff: align sk_buff::cb to 64 bit and close some potential holes

Browse Source 
The alignment requirement for 64-bit load/store instructions on ARM is
implementation defined. Some CPUs (such as Marvell Feroceon) do not
generate an exception, if such an instruction is executed with an
address that is not 64 bit aligned. In such a case, the Feroceon
corrupts adjacent memory, which showed up in my tests as a crash in the
rx path of ath9k that only occured with CONFIG_XFRM set.

This crash happened, because the first field of the mac80211 rx status
info in the cb is an u64, and changing it corrupted the skb->sp field.

This patch also closes some potential pre-existing holes in the sk_buff
struct surrounding the cb[] area.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Cc: stable@kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Felix Fietkau 2010-02-23 11:45:51 +00:00 committed by David S. Miller
parent 8d6184e488
commit da3f5cf1f8
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/linux/skbuff.h
View File

@ -315,22 +315,23 @@ struct sk_buff {
struct sk_buff *next; struct sk_buff *next;
struct sk_buff *prev; struct sk_buff *prev;
struct sock *sk;
ktime_t tstamp; ktime_t tstamp;
struct sock *sk;
struct net_device *dev; struct net_device *dev;
unsigned long _skb_dst;
#ifdef CONFIG_XFRM
struct sec_path *sp;
#endif
/* /*
* This is the control buffer. It is free to use for every * This is the control buffer. It is free to use for every
* layer. Please put your private variables there. If you * layer. Please put your private variables there. If you
* want to keep them across layers you have to do a skb_clone() * want to keep them across layers you have to do a skb_clone()
* first. This is owned by whoever has the skb queued ATM. * first. This is owned by whoever has the skb queued ATM.
*/ */
char cb[48]; char cb[48] __aligned(8);
unsigned long _skb_dst;
#ifdef CONFIG_XFRM
struct sec_path *sp;
#endif
unsigned int len, unsigned int len,
data_len; data_len;
__u16 mac_len, __u16 mac_len,