net/tls: Use kmemdup to simplify the code

Kmemdup is better than kmalloc+memcpy. So replace them.

Signed-off-by: zhong jiang <zhongjiang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c
index 1e968d238adf9139780b980e36483c8221f37227..292742e50bfa4b3a540cbaa3eb2b07400e7141be 100644 (file)
--- a/net/tls/tls_device.c
+++ b/net/tls/tls_device.c
@@ -716,12 +716,11 @@ int tls_set_device_offload(struct sock *sk, struct tls_context *ctx)
        memcpy(ctx->tx.iv + TLS_CIPHER_AES_GCM_128_SALT_SIZE, iv, iv_size);
 
        ctx->tx.rec_seq_size = rec_seq_size;
-       ctx->tx.rec_seq = kmalloc(rec_seq_size, GFP_KERNEL);
+       ctx->tx.rec_seq = kmemdup(rec_seq, rec_seq_size, GFP_KERNEL);
        if (!ctx->tx.rec_seq) {
                rc = -ENOMEM;
                goto free_iv;
        }
-       memcpy(ctx->tx.rec_seq, rec_seq, rec_seq_size);
 
        rc = tls_sw_fallback_init(sk, offload_ctx, crypto_info);
        if (rc)

diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 33838f11fafa3740be2bfca1773cadfb7ffff437..ff3a6904a722fdc7fd8727e21f4aff7028ef9244 100644 (file)
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -1173,12 +1173,11 @@ int tls_set_sw_offload(struct sock *sk, struct tls_context *ctx, int tx)
        memcpy(cctx->iv, gcm_128_info->salt, TLS_CIPHER_AES_GCM_128_SALT_SIZE);
        memcpy(cctx->iv + TLS_CIPHER_AES_GCM_128_SALT_SIZE, iv, iv_size);
        cctx->rec_seq_size = rec_seq_size;
-       cctx->rec_seq = kmalloc(rec_seq_size, GFP_KERNEL);
+       cctx->rec_seq = kmemdup(rec_seq, rec_seq_size, GFP_KERNEL);
        if (!cctx->rec_seq) {
                rc = -ENOMEM;
                goto free_iv;
        }
-       memcpy(cctx->rec_seq, rec_seq, rec_seq_size);
 
        if (sw_ctx_tx) {
                sg_init_table(sw_ctx_tx->sg_encrypted_data,