tls splice: remove inappropriate flags checking for MSG_PEEK
authorJim Ma <majinjing3@gmail.com>
Wed, 12 May 2021 09:00:11 +0000 (17:00 +0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 12 May 2021 21:31:30 +0000 (14:31 -0700)
In function tls_sw_splice_read, before call tls_sw_advance_skb
it checks likely(!(flags & MSG_PEEK)), while MSG_PEEK is used
for recvmsg, splice supports SPLICE_F_NONBLOCK, SPLICE_F_MOVE,
SPLICE_F_MORE, should remove this checking.

Signed-off-by: Jim Ma <majinjing3@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/tls/tls_sw.c

index 1dcb34d..7b59ec9 100644 (file)
@@ -2018,8 +2018,7 @@ ssize_t tls_sw_splice_read(struct socket *sock,  loff_t *ppos,
        if (copied < 0)
                goto splice_read_end;
 
-       if (likely(!(flags & MSG_PEEK)))
-               tls_sw_advance_skb(sk, skb, copied);
+       tls_sw_advance_skb(sk, skb, copied);
 
 splice_read_end:
        release_sock(sk);