From: Daniel Drake Date: Thu, 22 Nov 2007 22:03:42 +0000 (+0000) Subject: ieee80211: fix unaligned access in ieee80211_copy_snap X-Git-Tag: v2.6.24-rc4~8^2~8^2~4 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=01e1f045e65b683fe7203b1e16a915bbb94c15fe;p=linux-2.6-omap-h63xx.git ieee80211: fix unaligned access in ieee80211_copy_snap There is no guarantee that data+SNAP_SIZE will reside on an even numbered address, so doing a 16 bit read will cause an unaligned access in some situations. Based on a patch from Jun Sun. Signed-off-by: Daniel Drake Signed-off-by: John W. Linville --- diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c index a4c3c51140a..6d06f1385e2 100644 --- a/net/ieee80211/ieee80211_tx.c +++ b/net/ieee80211/ieee80211_tx.c @@ -144,7 +144,8 @@ static int ieee80211_copy_snap(u8 * data, u16 h_proto) snap->oui[1] = oui[1]; snap->oui[2] = oui[2]; - *(u16 *) (data + SNAP_SIZE) = htons(h_proto); + h_proto = htons(h_proto); + memcpy(data + SNAP_SIZE, &h_proto, sizeof(u16)); return SNAP_SIZE + sizeof(u16); }