diff options
| author | Greg Kroah-Hartman <[email protected]> | 2020-01-21 18:36:59 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2020-01-21 18:36:59 +0000 |
| commit | dd7d99dc688d0fc448976f52f8517fbdeccdccda (patch) | |
| tree | 4ad59de5d584cf03e772ee153260c24ba0d717bd /net/core/skmsg.c | |
| parent | phy: ti: j721e-wiz: Fix build error without CONFIG_OF_ADDRESS (diff) | |
| parent | Linux 5.5-rc7 (diff) | |
| download | kernel-dd7d99dc688d0fc448976f52f8517fbdeccdccda.tar.gz kernel-dd7d99dc688d0fc448976f52f8517fbdeccdccda.zip | |
Merge 5.5-rc7 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
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); |