Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 969d5090 authored by zhong jiang's avatar zhong jiang Committed by David S. Miller
Browse files

net/tls: Use kmemdup to simplify the code 



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

Signed-off-by: default avatarzhong jiang <zhongjiang@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b053fcc4

net/tls/tls_device.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

net/tls/tls_sw.c

+1 −2
Original line number Diff line number Diff line
@@ -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,