diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/strparser/strparser.c | 13 | ||||
-rw-r--r-- | net/tls/tls_sw.c | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/net/strparser/strparser.c b/net/strparser/strparser.c index 092bebc..1a96951 100644 --- a/net/strparser/strparser.c +++ b/net/strparser/strparser.c @@ -512,6 +512,19 @@ int strp_init(struct strparser *strp, struct sock *sk, } EXPORT_SYMBOL_GPL(strp_init); +/* Sock process lock held (lock_sock) */ +void __strp_unpause(struct strparser *strp) +{ + strp->paused = 0; + + if (strp->need_bytes) { + if (strp_peek_len(strp) < strp->need_bytes) + return; + } + strp_read_sock(strp); +} +EXPORT_SYMBOL_GPL(__strp_unpause); + void strp_unpause(struct strparser *strp) { strp->paused = 0; diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 839e1e1..8ca57d0 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -735,7 +735,7 @@ static bool tls_sw_advance_skb(struct sock *sk, struct sk_buff *skb, /* Finished with message */ ctx->recv_pkt = NULL; kfree_skb(skb); - strp_unpause(&ctx->strp); + __strp_unpause(&ctx->strp); return true; } |