From: Boris Pismenny <borisp@mellanox.com>
Date: Wed, 14 Feb 2018 08:46:06 +0000 (+0200)
Subject: tls: retrun the correct IV in getsockopt
X-Git-Tag: v4.16-rc3~29^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1dfa6812b682eef750412dd5a90e7d38d7af068;p=thirdparty%2Fkernel%2Flinux.git

tls: retrun the correct IV in getsockopt

Current code returns four bytes of salt followed by four bytes of IV.
This patch returns all eight bytes of IV.

fixes: 3c4d7559159b ("tls: kernel TLS support")
Signed-off-by: Boris Pismenny <borisp@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index b0d5fcea47e73..a6c3702e0ddbb 100644
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -308,7 +308,8 @@ static int do_tls_getsockopt_tx(struct sock *sk, char __user *optval,
 			goto out;
 		}
 		lock_sock(sk);
-		memcpy(crypto_info_aes_gcm_128->iv, ctx->iv,
+		memcpy(crypto_info_aes_gcm_128->iv,
+		       ctx->iv + TLS_CIPHER_AES_GCM_128_SALT_SIZE,
 		       TLS_CIPHER_AES_GCM_128_IV_SIZE);
 		release_sock(sk);
 		if (copy_to_user(optval,