tun: read vnet_hdr_sz once
authorWillem de Bruijn <willemb@google.com>
Fri, 3 Feb 2017 23:20:48 +0000 (18:20 -0500)
committerWilly Tarreau <w@1wt.eu>
Tue, 20 Jun 2017 12:04:54 +0000 (14:04 +0200)
commit302c74b132987d69752aedeb33b232076d2006df
treeba13274e612b279c5b33a07001b7ef4ab06e4656
parent58e4633a0841c48ce32f14cd797ec5482ecfa83b
tun: read vnet_hdr_sz once

commit e1edab87faf6ca30cd137e0795bc73aa9a9a22ec 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.

Read this value once and cache locally, as it can be updated between
the test and use (TOCTOU).

[js] we have TUN_VNET_HDR in 3.12

Signed-off-by: Willem de Bruijn <willemb@google.com>
Reported-by: Dmitry Vyukov <dvyukov@google.com>
CC: Eric Dumazet <edumazet@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
[wt: s/READ_ONCE/ACCESS_ONCE]
Signed-off-by: Willy Tarreau <w@1wt.eu>
drivers/net/tun.c