Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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>
zhong jiang 7 years ago
parent
b053fcc4a1
commit
969d509003
2 changed files with 2 additions and 4 deletions
Split View Show Diff Stats
  1. 1 2
      net/tls/tls_device.c
  2. 1 2
      net/tls/tls_sw.c

+ 1 - 2
net/tls/tls_device.c
View File 

@@ -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)

+ 1 - 2
net/tls/tls_sw.c
View File 

@@ -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,