Commit 974271e5 authored by Jim Ma's avatar Jim Ma Committed by David S. Miller
Browse files

tls splice: check SPLICE_F_NONBLOCK instead of MSG_DONTWAIT 



In tls_sw_splice_read, checkout MSG_* is inappropriate, should use
SPLICE_*, update tls_wait_data to accept nonblock arguments instead
of flags for recvmsg and splice.

Fixes: c46234eb ("tls: RX path for ktls")
Signed-off-by: default avatarJim Ma <majinjing3@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 75016891

net/tls/tls_sw.c

+6 −5
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 


#include <linux/sched/signal.h>

#include <linux/module.h>

#include <linux/splice.h>

#include <crypto/aead.h>



#include <net/strparser.h>
@@ -1281,7 +1282,7 @@ int tls_sw_sendpage(struct sock *sk, struct page *page, 
}



static struct sk_buff *tls_wait_data(struct sock *sk, struct sk_psock *psock,

				     int flags, long timeo, int *err)

				     bool nonblock, long timeo, int *err)

{

	struct tls_context *tls_ctx = tls_get_ctx(sk);

	struct tls_sw_context_rx *ctx = tls_sw_ctx_rx(tls_ctx);
@@ -1306,7 +1307,7 @@ static struct sk_buff *tls_wait_data(struct sock *sk, struct sk_psock *psock, 
		if (sock_flag(sk, SOCK_DONE))

			return NULL;



		if ((flags & MSG_DONTWAIT) || !timeo) {

		if (nonblock || !timeo) {

			*err = -EAGAIN;

			return NULL;

		}
@@ -1786,7 +1787,7 @@ int tls_sw_recvmsg(struct sock *sk, 
		bool async_capable;

		bool async = false;



		skb = tls_wait_data(sk, psock, flags, timeo, &err);

		skb = tls_wait_data(sk, psock, flags & MSG_DONTWAIT, timeo, &err);

		if (!skb) {

			if (psock) {

				int ret = sk_msg_recvmsg(sk, psock, msg, len,
@@ -1990,9 +1991,9 @@ ssize_t tls_sw_splice_read(struct socket *sock, loff_t *ppos, 


	lock_sock(sk);



	timeo = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);

	timeo = sock_rcvtimeo(sk, flags & SPLICE_F_NONBLOCK);



	skb = tls_wait_data(sk, NULL, flags, timeo, &err);

	skb = tls_wait_data(sk, NULL, flags & SPLICE_F_NONBLOCK, timeo, &err);

	if (!skb)

		goto splice_read_end;