]> git.itanic.dy.fi Git - linux-stable/commit
wireguard: netlink: send staged packets when setting initial private key
authorJason A. Donenfeld <Jason@zx2c4.com>
Mon, 3 Jul 2023 01:27:05 +0000 (03:27 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 3 Jul 2023 08:17:52 +0000 (09:17 +0100)
commitf58d0a9b4c6a7a5199c3af967e43cc8b654604d4
treee97ab11c3e2a8e75bbd191fa1c99d8a5cb066a78
parent7387943fa35516f6f8017a3b0e9ce48a3bef9faa
wireguard: netlink: send staged packets when setting initial private key

Packets bound for peers can queue up prior to the device private key
being set. For example, if persistent keepalive is set, a packet is
queued up to be sent as soon as the device comes up. However, if the
private key hasn't been set yet, the handshake message never sends, and
no timer is armed to retry, since that would be pointless.

But, if a user later sets a private key, the expectation is that those
queued packets, such as a persistent keepalive, are actually sent. So
adjust the configuration logic to account for this edge case, and add a
test case to make sure this works.

Maxim noticed this with a wg-quick(8) config to the tune of:

    [Interface]
    PostUp = wg set %i private-key somefile

    [Peer]
    PublicKey = ...
    Endpoint = ...
    PersistentKeepalive = 25

Here, the private key gets set after the device comes up using a PostUp
script, triggering the bug.

Fixes: e7096c131e51 ("net: WireGuard secure network tunnel")
Cc: stable@vger.kernel.org
Reported-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Tested-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Link: https://lore.kernel.org/wireguard/87fs7xtqrv.fsf@gmail.com/
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/wireguard/netlink.c
tools/testing/selftests/wireguard/netns.sh