diff options
| author | Mark Brown <broonie@kernel.org> | 2025-03-05 19:10:50 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2025-03-05 19:10:50 +0000 |
| commit | c6141ba0110f98266106699aca071fed025c3d64 (patch) | |
| tree | 5b2c335cbed607d85e2fa51c54e29a2e4b0eb24d /net/strparser/strparser.c | |
| parent | a1462fb8b5dd1018e3477a6861822d75c6a59449 (diff) | |
| parent | 927e6bec5cf3624665b0a2e9f64a1d32f3d22cdd (diff) | |
| download | lwn-c6141ba0110f98266106699aca071fed025c3d64.tar.gz lwn-c6141ba0110f98266106699aca071fed025c3d64.zip | |
ASoC: Merge up fixes
Merge branch 'for-6.14' of
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into
asoc-6.15 to avoid a bunch of add/add conflicts.
Diffstat (limited to 'net/strparser/strparser.c')
| -rw-r--r-- | net/strparser/strparser.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/net/strparser/strparser.c b/net/strparser/strparser.c index 8299ceb3e373..95696f42647e 100644 --- a/net/strparser/strparser.c +++ b/net/strparser/strparser.c @@ -347,7 +347,10 @@ static int strp_read_sock(struct strparser *strp) struct socket *sock = strp->sk->sk_socket; read_descriptor_t desc; - if (unlikely(!sock || !sock->ops || !sock->ops->read_sock)) + if (unlikely(!sock || !sock->ops)) + return -EBUSY; + + if (unlikely(!strp->cb.read_sock && !sock->ops->read_sock)) return -EBUSY; desc.arg.data = strp; @@ -355,7 +358,10 @@ static int strp_read_sock(struct strparser *strp) desc.count = 1; /* give more than one skb per call */ /* sk should be locked here, so okay to do read_sock */ - sock->ops->read_sock(strp->sk, &desc, strp_recv); + if (strp->cb.read_sock) + strp->cb.read_sock(strp, &desc, strp_recv); + else + sock->ops->read_sock(strp->sk, &desc, strp_recv); desc.error = strp->cb.read_sock_done(strp, desc.error); @@ -468,6 +474,7 @@ int strp_init(struct strparser *strp, struct sock *sk, strp->cb.unlock = cb->unlock ? : strp_sock_unlock; strp->cb.rcv_msg = cb->rcv_msg; strp->cb.parse_msg = cb->parse_msg; + strp->cb.read_sock = cb->read_sock; strp->cb.read_sock_done = cb->read_sock_done ? : default_read_sock_done; strp->cb.abort_parser = cb->abort_parser ? : strp_abort_strp; |