Thank you for your contribution! Sashiko AI review found 3 potential
issue(s) to consider.
Critical: 0 · High: 1 · Medium: 0 · Low: 2
If you believe none of the issues are legitimate, please reply to each
issue of Medium severity or higher and explain why the AI is wrong.
If any of them are legitimate and you plan to respin, please let patchwork
know by including "pw-bot: cr" as a separate line at the end of your reply
(one such reply per series is enough).
- [High] Retry/NEW_TOKEN tokens can reuse an AES-GCM (key, nonce) pair
across sockets.
- [Low] The AEAD integrity limit is enforced per encryption level, but it
is documented as per connection.
- [Low] crypto->async_pending[] decides when the AEAD transforms can be
rekeyed, but every access to it is relaxed.
--
quic: add crypto packet encryption and decryption
This patch adds AEAD payload protection and QUIC header protection for
the TX and RX paths, through quic_crypto_encrypt() and
quic_crypto_decrypt(). It also adds Retry integrity tag computation and
helpers to generate and verify Retry and address validation tokens.
quoted hunk ↗ jump to hunk
diff --git a/net/quic/crypto.c b/net/quic/crypto.c
index c4bf99b3e8239..54fccaf715105 100644
--- a/net/quic/crypto.c
+++ b/net/quic/crypto.c
[ ... ]
quoted hunk ↗ jump to hunk
+int quic_crypto_decrypt(struct quic_crypto *crypto, struct sk_buff *skb,
+ gfp_t gfp)
+{
[ ... ]
quoted hunk ↗ jump to hunk
+ phase = cb->key_phase;
+ if (phase != crypto->key_phase && !crypto->key_pending) {
+ if (!crypto->send_ready) /* Not ready for key update. */
+ return -EINVAL;
+ if (!cb->backlog) /* Key update requires process context. */
+ return -EKEYREVOKED;
+ /* Cannot do key update while async crypto is in progress. */
+ if (unlikely(atomic_read(&crypto->async_pending[phase])))
+ return -EBUSY;
+ err = quic_crypto_key_update(crypto); /* Perform key update. */
[Severity: Low]
Is the memory ordering here strong enough to make rekeying the tfm safe?
The async completion path reports that it is done using a void atomic op:
quic_crypto_done() {
...
crypto = *(struct quic_crypto **)cb->crypto_ctx;
atomic_dec(&crypto->async_pending[cb->key_phase]);
...
}
This side then checks the counter with a plain atomic_read() before
quic_crypto_key_update()->quic_crypto_keys_derive_and_install() calls
crypto_aead_setkey() on the same phase's tfm.
Documentation/atomic_t.txt says void atomic RMW ops are unordered. So
nothing orders the driver's earlier reads of the key context before the
decrement, and there is no acquire on the reader side.
On weakly ordered architectures, could a request completing on one CPU
still be reading the old key schedule after another CPU has seen
async_pending == 0 and rekeyed? That request would then run with mixed
key material.
Would atomic_dec_return_release() (or smp_mb__before_atomic()) in
quic_crypto_done(), paired with atomic_read_acquire() here, be enough?
[ ... ]
quoted hunk ↗ jump to hunk
+ return 0;
+err:
+ if (err == -EBADMSG && ++crypto->rx_fails >= crypto->cipher->rxlimit)
+ err = -EKEYEXPIRED;
+ return err;
+}
[Severity: Low]
Does this enforce the limit per connection? struct quic_cipher in
net/quic/crypto.h documents it as:
u64 rxlimit; /* Max decryption failures per connection */
The v17 changelog also calls rx_fails a connection-wide counter.
However, rx_fails is a field of struct quic_crypto, and quic_init_sock()
allocates a separate quic_crypto for each of the QUIC_CRYPTO_MAX
encryption levels. Authentication failures at the Initial, Handshake,
0-RTT and 1-RTT levels are therefore counted separately and never add
up.
RFC 9001 section 6.6 counts failures within the connection, across all
keys. Should the counter be shared across levels, or should the comment
and changelog be updated?
[ ... ]
quoted hunk ↗ jump to hunk
+static int quic_crypto_token_protect(struct quic_crypto *crypto, u8 *token,
+ u32 len, u32 adlen, bool enc)
+{
[ ... ]
quoted hunk ↗ jump to hunk
+ memcpy(nonce, crypto->tx_iv[1], QUIC_IV_LEN);
+
+ /* Read counter value from token AAD (bytes 1-8) and XOR with IV. */
+ clen = sizeof(c);
+ p = token + adlen - clen;
+ quic_get_int(&p, &clen, &c, clen);
+
+ n = cpu_to_be64(c);
+ for (i = 0; i < sizeof(n); i++)
+ nonce[QUIC_IV_LEN - sizeof(n) + i] ^= ((u8 *)&n)[i];
[ ... ]
quoted hunk ↗ jump to hunk
+int quic_crypto_generate_token(struct quic_crypto *crypto, void *addr,
+ u32 addrlen, struct quic_conn_id *conn_id,
+ u8 *token, u32 *tlen)
+{
[ ... ]
+ /* Use counter for nonce derivation to prevent collisions. */
+ counter = crypto->tx_count[1]++;
[Severity: High]
Can this counter value repeat under the same token key on different
sockets?
quic_crypto_token_protect() builds the AES-GCM nonce as tx_iv[1] XOR
counter. Both the AEAD key and tx_iv[1] are derived only from
tx_secret[1] in quic_crypto_set_token_secret(), and that function keeps
any secret that is already set:
if (!memchr_inv(srt, 0, TLS_CIPHER_AES_GCM_128_SECRET_SIZE))
get_random_bytes(srt, TLS_CIPHER_AES_GCM_128_SECRET_SIZE);
The token secret looks like it is meant to be shared server-wide. Later
in the series, quic_packet_process() verifies both Retry and
QUIC_TOKEN_FLAG_REGULAR (NEW_TOKEN) tokens with the listener's Initial
crypto, but accepted sockets are the ones that issue NEW_TOKEN.
quic_crypto_derive_secret() also seeds the stateless reset and
resumption secrets from tx_secret[1].
tx_count[1], on the other hand, is per quic_crypto. quic_init_sock()
kzalloc's each quic_crypto, so every socket's counter starts at 0.
quic_crypto_keys_derive_and_install() also resets tx_count[] like a
packet counter.
So wouldn't the listener's first token and the first token from each
accepted socket all use nonce tx_iv[1] XOR 0 under the same key?
Two AES-GCM messages with the same (key, nonce) let an attacker recover
the GHASH key and forge valid tokens. For example, they could swap in a
different client address or an arbitrary ODCID, which defeats address
validation. The counter is sent in the clear in the AAD, so collisions
are easy to spot.
The note after the --- line about token nonce reuse argues from the
earlier timestamp nonce and socket lock serialization. Does that
reasoning still apply when separate sockets keep independent counters
under one shared key?
--
Sashiko AI review · https://netdev-ai.bots.linux.dev/sashiko/#/patchset/cover.1794241654.git.lucien.xin%40gmail.com