macvtap: read vnet_hdr_size once
authorWillem de Bruijn <willemb@google.com>
Fri, 3 Feb 2017 23:20:49 +0000 (18:20 -0500)
committerWilly Tarreau <w@1wt.eu>
Tue, 20 Jun 2017 12:04:19 +0000 (14:04 +0200)
commitb0899f80092e17d83979cd6c2825a5d4ee2cdcf7
tree4373bcc06819f85e350de0a3f3210ac7134b2d3a
parent5c235ec479dcdec8d7ba8f6126b6a92df3f56c32
macvtap: read vnet_hdr_size once

commit 837585a5375c38d40361cfe64e6fd11e1addb936 upstream.

When IFF_VNET_HDR is enabled, a virtio_net header must precede data.
Data length is verified to be greater than or equal to expected header
length tun->vnet_hdr_sz before copying.

Macvtap functions read the value once, but unless READ_ONCE is used,
the compiler may ignore this and read multiple times. Enforce a single
read and locally cached value to avoid updates between test and use.

Signed-off-by: Willem de Bruijn <willemb@google.com>
Suggested-by: Eric Dumazet <edumazet@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[wt: s/READ_ONCE/ACCESS_ONCE]

Signed-off-by: Willy Tarreau <w@1wt.eu>
drivers/net/macvtap.c