diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-03-17 14:01:30 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-03-17 14:01:30 +0300 |
| commit | d26a3a6ce7e02f9c056ad992bcd9624735022337 (patch) | |
| tree | 9df8aeaceed50bf65d01172c67f67035c9fa59ef /net/unix/unix_bpf.c | |
| parent | 007e50eb5dbe7b33a43a1449a0d9c29e8dcf1c67 (diff) | |
| parent | eeac8ede17557680855031c6f305ece2378af326 (diff) | |
| download | linux-d26a3a6ce7e02f9c056ad992bcd9624735022337.tar.xz | |
Merge tag 'v6.3-rc2' into next
Merge with mainline to get of_property_present() and other newer APIs.
Diffstat (limited to 'net/unix/unix_bpf.c')
| -rw-r--r-- | net/unix/unix_bpf.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/unix/unix_bpf.c b/net/unix/unix_bpf.c index e9bf15513961..2f9d8271c6ec 100644 --- a/net/unix/unix_bpf.c +++ b/net/unix/unix_bpf.c @@ -54,6 +54,9 @@ static int unix_bpf_recvmsg(struct sock *sk, struct msghdr *msg, struct sk_psock *psock; int copied; + if (!len) + return 0; + psock = sk_psock_get(sk); if (unlikely(!psock)) return __unix_recvmsg(sk, msg, len, flags); |