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

Commit f4a8e43f authored by Dave Watson's avatar Dave Watson Committed by David S. Miller
Browse files

tls: Pass error code explicitly to tls_err_abort 



Pass EBADMSG explicitly to tls_err_abort.  Receive path will
pass additional codes - EMSGSIZE if framing is larger than max
TLS record size, EINVAL if TLS version mismatch.

Signed-off-by: default avatarDave Watson <davejwatson@fb.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dbe42559

include/net/tls.h

+3 −3
Original line number Diff line number Diff line
@@ -174,9 +174,9 @@ static inline bool tls_is_pending_open_record(struct tls_context *tls_ctx) 
	return tls_ctx->pending_open_record_frags;

}



static inline void tls_err_abort(struct sock *sk)

static inline void tls_err_abort(struct sock *sk, int err)

{

	sk->sk_err = EBADMSG;

	sk->sk_err = err;

	sk->sk_error_report(sk);

}
@@ -197,7 +197,7 @@ static inline void tls_advance_record_sn(struct sock *sk, 
					 struct cipher_context *ctx)

{

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

		tls_err_abort(sk);

		tls_err_abort(sk, EBADMSG);

	tls_bigint_increment(ctx->iv + TLS_CIPHER_AES_GCM_128_SALT_SIZE,

			     ctx->iv_size);

}

net/tls/tls_sw.c

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static int tls_push_record(struct sock *sk, int flags, 
	/* Only pass through MSG_DONTWAIT and MSG_NOSIGNAL flags */

	rc = tls_push_sg(sk, tls_ctx, ctx->sg_encrypted_data, 0, flags);

	if (rc < 0 && rc != -EAGAIN)

		tls_err_abort(sk);

		tls_err_abort(sk, EBADMSG);



	tls_advance_record_sn(sk, &tls_ctx->tx);

	return rc;