netdev - Re: virtio-net header alignment

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 10 Jun 2009 15:12:27 +1000
From:	Herbert Xu <herbert@...dor.apana.org.au>
To:	Mark McLoughlin <markmc@...hat.com>
Cc:	Rusty Russell <rusty@...tcorp.com.au>,
	Danielius Kudinskas <kudinskas@...ibm.com>,
	aliguori@...ux.vnet.ibm.com, Paul T Knowles <pablo@...ibm.com>,
	netdev@...r.kernel.org
Subject: Re: virtio-net header alignment

On Mon, May 25, 2009 at 05:17:03PM +0100, Mark McLoughlin wrote:
> 
> Perhaps; would padding struct virtio_net_hdr_mrg_rxbuf have avoided it?
> 
> Cc-ing Herbert, he initially wrote the guest side of this.

Does this fix it?

virtio_net: Fix IP alignment on mergeable RX path

We need to enforce the IP alignment on the mergeable RX path just
like the other RX path.  Not doing so results in misaligned IP
headers.

Signed-off-by: Herbert Xu <herbert@...dor.apana.org.au>

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 4d1d479..52fba8e 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -283,10 +283,11 @@ static void try_fill_recv_maxbufs(struct virtnet_info *vi)
 	for (;;) {
 		struct virtio_net_hdr *hdr;
 
-		skb = netdev_alloc_skb(vi->dev, MAX_PACKET_LEN);
+		skb = netdev_alloc_skb(vi->dev, MAX_PACKET_LEN + NET_IP_ALIGN);
 		if (unlikely(!skb))
 			break;
 
+		skb_reserve(skb, NET_IP_ALIGN);
 		skb_put(skb, MAX_PACKET_LEN);
 
 		hdr = skb_vnet_hdr(skb);

Cheers,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@...dor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html