diff options
| author | Jim Ma <majinjing3@gmail.com> | 2021-05-12 17:00:11 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-05-12 14:31:30 -0700 |
| commit | d8654f4f9300e5e7cf8d5e7885978541cf61326b (patch) | |
| tree | e69f746a8afc01f0e4b3c415b9646a7a9edaca77 | |
| parent | 34e7434ba4e97f4b85c1423a59b2922ba7dff2ea (diff) | |
| download | linux-stable-d8654f4f9300e5e7cf8d5e7885978541cf61326b.tar.gz linux-stable-d8654f4f9300e5e7cf8d5e7885978541cf61326b.tar.bz2 linux-stable-d8654f4f9300e5e7cf8d5e7885978541cf61326b.zip | |
tls splice: remove inappropriate flags checking for MSG_PEEK
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>
| -rw-r--r-- | net/tls/tls_sw.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 1dcb34dfd56b..7b59ec9a24c5 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -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); |