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

Commit 15008579 authored by Vakul Garg's avatar Vakul Garg Committed by David S. Miller
Browse files

net/tls: Fixed return value when tls_complete_pending_work() fails 



In tls_sw_sendmsg() and tls_sw_sendpage(), the variable 'ret' has
been set to return value of tls_complete_pending_work(). This allows
return of proper error code if tls_complete_pending_work() fails.

Fixes: 3c4d7559 ("tls: kernel TLS support")
Signed-off-by: default avatarVakul Garg <vakul.garg@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 80de556a

net/tls/tls_sw.c

+6 −4
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) 
{

	struct tls_context *tls_ctx = tls_get_ctx(sk);

	struct tls_sw_context_tx *ctx = tls_sw_ctx_tx(tls_ctx);

	int ret = 0;

	int ret;

	int required_size;

	long timeo = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT);

	bool eor = !(msg->msg_flags & MSG_MORE);
@@ -502,7 +502,8 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) 


	lock_sock(sk);



	if (tls_complete_pending_work(sk, tls_ctx, msg->msg_flags, &timeo))

	ret = tls_complete_pending_work(sk, tls_ctx, msg->msg_flags, &timeo);

	if (ret)

		goto send_end;



	if (unlikely(msg->msg_controllen)) {
@@ -637,7 +638,7 @@ int tls_sw_sendpage(struct sock *sk, struct page *page, 
{

	struct tls_context *tls_ctx = tls_get_ctx(sk);

	struct tls_sw_context_tx *ctx = tls_sw_ctx_tx(tls_ctx);

	int ret = 0;

	int ret;

	long timeo = sock_sndtimeo(sk, flags & MSG_DONTWAIT);

	bool eor;

	size_t orig_size = size;
@@ -657,7 +658,8 @@ int tls_sw_sendpage(struct sock *sk, struct page *page, 


	sk_clear_bit(SOCKWQ_ASYNC_NOSPACE, sk);



	if (tls_complete_pending_work(sk, tls_ctx, flags, &timeo))

	ret = tls_complete_pending_work(sk, tls_ctx, flags, &timeo);

	if (ret)

		goto sendpage_end;



	/* Call the sk_stream functions to manage the sndbuf mem. */