提交 196c31b4 编写于 作者: I Ilya Lesokhin 提交者: David S. Miller

tls: Avoid copying crypto_info again after cipher_type check.

Avoid copying crypto_info again after cipher_type check
to avoid a TOCTOU exploits.
The temporary array on the stack is removed as we don't really need it

Fixes: 3c4d7559 ('tls: kernel TLS support')
Signed-off-by: NIlya Lesokhin <ilyal@mellanox.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 213ef6e7
...@@ -355,7 +355,7 @@ static int tls_getsockopt(struct sock *sk, int level, int optname, ...@@ -355,7 +355,7 @@ static int tls_getsockopt(struct sock *sk, int level, int optname,
static int do_tls_setsockopt_tx(struct sock *sk, char __user *optval, static int do_tls_setsockopt_tx(struct sock *sk, char __user *optval,
unsigned int optlen) unsigned int optlen)
{ {
struct tls_crypto_info *crypto_info, tmp_crypto_info; struct tls_crypto_info *crypto_info;
struct tls_context *ctx = tls_get_ctx(sk); struct tls_context *ctx = tls_get_ctx(sk);
int rc = 0; int rc = 0;
int tx_conf; int tx_conf;
...@@ -365,36 +365,31 @@ static int do_tls_setsockopt_tx(struct sock *sk, char __user *optval, ...@@ -365,36 +365,31 @@ static int do_tls_setsockopt_tx(struct sock *sk, char __user *optval,
goto out; goto out;
} }
rc = copy_from_user(&tmp_crypto_info, optval, sizeof(*crypto_info)); crypto_info = &ctx->crypto_send;
/* Currently we don't support set crypto info more than one time */
if (TLS_CRYPTO_INFO_READY(crypto_info))
goto out;
rc = copy_from_user(crypto_info, optval, sizeof(*crypto_info));
if (rc) { if (rc) {
rc = -EFAULT; rc = -EFAULT;
goto out; goto out;
} }
/* check version */ /* check version */
if (tmp_crypto_info.version != TLS_1_2_VERSION) { if (crypto_info->version != TLS_1_2_VERSION) {
rc = -ENOTSUPP; rc = -ENOTSUPP;
goto out; goto err_crypto_info;
} }
/* get user crypto info */ switch (crypto_info->cipher_type) {
crypto_info = &ctx->crypto_send;
/* Currently we don't support set crypto info more than one time */
if (TLS_CRYPTO_INFO_READY(crypto_info))
goto out;
switch (tmp_crypto_info.cipher_type) {
case TLS_CIPHER_AES_GCM_128: { case TLS_CIPHER_AES_GCM_128: {
if (optlen != sizeof(struct tls12_crypto_info_aes_gcm_128)) { if (optlen != sizeof(struct tls12_crypto_info_aes_gcm_128)) {
rc = -EINVAL; rc = -EINVAL;
goto out; goto out;
} }
rc = copy_from_user( rc = copy_from_user(crypto_info + 1, optval + sizeof(*crypto_info),
crypto_info, optlen - sizeof(*crypto_info));
optval,
sizeof(struct tls12_crypto_info_aes_gcm_128));
if (rc) { if (rc) {
rc = -EFAULT; rc = -EFAULT;
goto err_crypto_info; goto err_crypto_info;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册