diff options
| author | Sven Eckelmann <sven@narfation.org> | 2012-11-04 17:11:45 +0100 |
|---|---|---|
| committer | Antonio Quartulli <ordex@autistici.org> | 2012-11-07 20:00:16 +0100 |
| commit | 5b246574430f808e5b98ef40b8058bf5ac1df02d (patch) | |
| tree | 7bc67e708ef2aee632de51020d7ba0d8c55a0883 /net/batman-adv/icmp_socket.c | |
| parent | 6f0a0986e328dd61610d898a09c9f4aa960ae64a (diff) | |
| download | blackbird-op-linux-5b246574430f808e5b98ef40b8058bf5ac1df02d.tar.gz blackbird-op-linux-5b246574430f808e5b98ef40b8058bf5ac1df02d.zip | |
batman-adv: Reserve extra bytes in skb for better alignment
The ethernet header is 14 bytes long. Therefore, the data after it is not 4
byte aligned and may cause problems on systems without unaligned data access.
Reserving NET_IP_ALIGN more byes can fix the misalignment of the ethernet
header.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Diffstat (limited to 'net/batman-adv/icmp_socket.c')
| -rw-r--r-- | net/batman-adv/icmp_socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c index 5874c0e84846..87ca8095b011 100644 --- a/net/batman-adv/icmp_socket.c +++ b/net/batman-adv/icmp_socket.c @@ -177,13 +177,13 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, if (len >= sizeof(struct batadv_icmp_packet_rr)) packet_len = sizeof(struct batadv_icmp_packet_rr); - skb = dev_alloc_skb(packet_len + ETH_HLEN); + skb = dev_alloc_skb(packet_len + ETH_HLEN + NET_IP_ALIGN); if (!skb) { len = -ENOMEM; goto out; } - skb_reserve(skb, ETH_HLEN); + skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN); icmp_packet = (struct batadv_icmp_packet_rr *)skb_put(skb, packet_len); if (copy_from_user(icmp_packet, buff, packet_len)) { |
