wireguard: noise: read preshared key while taking lock
authorJason A. Donenfeld <Jason@zx2c4.com>
Wed, 20 May 2020 04:49:28 +0000 (22:49 -0600)
committerDavid S. Miller <davem@davemloft.net>
Thu, 21 May 2020 03:55:09 +0000 (20:55 -0700)
commitbc67d371256f5c47d824e2eec51e46c8d62d022e
treebc1e1c7b59120be31ea92b720df058c9b3fd9ead
parentee3c1aa3f34b7842c1557cfe5d8c3f7b8c692de8
wireguard: noise: read preshared key while taking lock

Prior we read the preshared key after dropping the handshake lock, which
isn't an actual crypto issue if it races, but it's still not quite
correct. So copy that part of the state into a temporary like we do with
the rest of the handshake state variables. Then we can release the lock,
operate on the temporary, and zero it out at the end of the function. In
performance tests, the impact of this was entirely unnoticable, probably
because those bytes are coming from the same cacheline as other things
that are being copied out in the same manner.

Reported-by: Matt Dunwoodie <ncon@noconroy.net>
Fixes: e7096c131e51 ("net: WireGuard secure network tunnel")
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/wireguard/noise.c