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

Commit fb0f886f authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

net/tls: don't pass version to tls_advance_record_sn() 



All callers pass prot->version as the last parameter
of tls_advance_record_sn(), yet tls_advance_record_sn()
itself needs a pointer to prot.  Pass prot from callers.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarDirk van der Merwe <dirk.vandermerwe@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f0aaa2c9

include/net/tls.h

+3 −7
Original line number Diff line number Diff line
@@ -446,20 +446,16 @@ static inline struct tls_context *tls_get_ctx(const struct sock *sk) 
}



static inline void tls_advance_record_sn(struct sock *sk,

					 struct cipher_context *ctx,

					 int version)

					 struct tls_prot_info *prot,

					 struct cipher_context *ctx)

{

	struct tls_context *tls_ctx = tls_get_ctx(sk);

	struct tls_prot_info *prot = &tls_ctx->prot_info;



	if (tls_bigint_increment(ctx->rec_seq, prot->rec_seq_size))

		tls_err_abort(sk, EBADMSG);



	if (version != TLS_1_3_VERSION) {

	if (prot->version != TLS_1_3_VERSION)

		tls_bigint_increment(ctx->iv + TLS_CIPHER_AES_GCM_128_SALT_SIZE,

				     prot->iv_size);

}

}



static inline void tls_fill_prepend(struct tls_context *ctx,

			     char *buf,

net/tls/tls_device.c

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ static int tls_push_record(struct sock *sk, 
	list_add_tail(&record->list, &offload_ctx->records_list);

	spin_unlock_irq(&offload_ctx->lock);

	offload_ctx->open_record = NULL;

	tls_advance_record_sn(sk, &ctx->tx, prot->version);

	tls_advance_record_sn(sk, prot, &ctx->tx);



	for (i = 0; i < record->num_frags; i++) {

		frag = &record->frags[i];

net/tls/tls_sw.c

+4 −5
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ static int tls_do_encryption(struct sock *sk, 


	/* Unhook the record from context if encryption is not failure */

	ctx->open_rec = NULL;

	tls_advance_record_sn(sk, &tls_ctx->tx, prot->version);

	tls_advance_record_sn(sk, prot, &tls_ctx->tx);

	return rc;

}
@@ -1486,7 +1486,6 @@ static int decrypt_skb_update(struct sock *sk, struct sk_buff *skb, 
	struct tls_context *tls_ctx = tls_get_ctx(sk);

	struct tls_sw_context_rx *ctx = tls_sw_ctx_rx(tls_ctx);

	struct tls_prot_info *prot = &tls_ctx->prot_info;

	int version = prot->version;

	struct strp_msg *rxm = strp_msg(skb);

	int pad, err = 0;
@@ -1504,8 +1503,8 @@ static int decrypt_skb_update(struct sock *sk, struct sk_buff *skb, 
					       async);

			if (err < 0) {

				if (err == -EINPROGRESS)

					tls_advance_record_sn(sk, &tls_ctx->rx,

							      version);

					tls_advance_record_sn(sk, prot,

							      &tls_ctx->rx);



				return err;

			}
@@ -1520,7 +1519,7 @@ static int decrypt_skb_update(struct sock *sk, struct sk_buff *skb, 
		rxm->full_len -= pad;

		rxm->offset += prot->prepend_size;

		rxm->full_len -= prot->overhead_size;

		tls_advance_record_sn(sk, &tls_ctx->rx, version);

		tls_advance_record_sn(sk, prot, &tls_ctx->rx);

		ctx->decrypted = true;

		ctx->saved_data_ready(sk);

	} else {