]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitad4d8e0b7891e4240404b1fed4ffc6e110c85302
treebc1e1c7b59120be31ea92b720df058c9b3fd9ead
parent1c659cae6db2a937b26031a3f682b640290ef65a
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: 0c73bbc77a76 ("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