]> git.baikalelectronics.ru Git - kernel.git/commit
tls: reset crypto_info when do_tls_setsockopt_tx fails
authorSabrina Dubroca <sd@queasysnail.net>
Tue, 16 Jan 2018 15:04:28 +0000 (16:04 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 17 Jan 2018 21:16:04 +0000 (16:16 -0500)
commitc5a4562871a83d062ced6c2fa1410c1f5630c567
tree1004c0d1cbf18fa4ab30034bd6cd38205cc32e77
parent72da7d11081b4a042408e988538efffb3eab72c5
tls: reset crypto_info when do_tls_setsockopt_tx fails

The current code copies directly from userspace to ctx->crypto_send, but
doesn't always reinitialize it to 0 on failure. This causes any
subsequent attempt to use this setsockopt to fail because of the
TLS_CRYPTO_INFO_READY check, eventhough crypto_info is not actually
ready.

This should result in a correctly set up socket after the 3rd call, but
currently it does not:

    size_t s = sizeof(struct tls12_crypto_info_aes_gcm_128);
    struct tls12_crypto_info_aes_gcm_128 crypto_good = {
        .info.version = TLS_1_2_VERSION,
        .info.cipher_type = TLS_CIPHER_AES_GCM_128,
    };

    struct tls12_crypto_info_aes_gcm_128 crypto_bad_type = crypto_good;
    crypto_bad_type.info.cipher_type = 42;

    setsockopt(sock, SOL_TLS, TLS_TX, &crypto_bad_type, s);
    setsockopt(sock, SOL_TLS, TLS_TX, &crypto_good, s - 1);
    setsockopt(sock, SOL_TLS, TLS_TX, &crypto_good, s);

Fixes: c2c217d10788 ("tls: kernel TLS support")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/tls/tls_main.c