diff options
author | Dave Airlie <airlied@redhat.com> | 2020-01-20 11:08:11 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2020-01-20 11:42:57 +1000 |
commit | 3d4743131b8de970faa4b979ead0fadfe5d2de9d (patch) | |
tree | 68e948c2d94d48598dd37e31bb654feb0b43ae4a /net/core/skmsg.c | |
parent | df95968ff78931576ac7a3d3b30312894aaaf22e (diff) | |
parent | def9d2780727cec3313ed3522d0123158d87224d (diff) | |
download | blackbird-op-linux-3d4743131b8de970faa4b979ead0fadfe5d2de9d.tar.gz blackbird-op-linux-3d4743131b8de970faa4b979ead0fadfe5d2de9d.zip |
Backmerge v5.5-rc7 into drm-next
msm needs 5.5-rc4, go to the latest.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'net/core/skmsg.c')
-rw-r--r-- | net/core/skmsg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/skmsg.c b/net/core/skmsg.c index ded2d5227678..3866d7e20c07 100644 --- a/net/core/skmsg.c +++ b/net/core/skmsg.c @@ -594,6 +594,8 @@ EXPORT_SYMBOL_GPL(sk_psock_destroy); void sk_psock_drop(struct sock *sk, struct sk_psock *psock) { + sock_owned_by_me(sk); + sk_psock_cork_free(psock); sk_psock_zap_ingress(psock); |