https://github.com/torvalds/linux
Revision 2c7269b231194aae23fb90ab65842573a91acbc9 authored by Sabrina Dubroca on 10 June 2020, 10:19:43 UTC, committed by Alexei Starovoitov on 12 June 2020, 22:10:12 UTC
If the peer is closed, we will never get more data, so
tcp_bpf_wait_data will get stuck forever. In case we passed
MSG_DONTWAIT to recv(), we get EAGAIN but we should actually get
0.
>From man 2 recv:
RETURN VALUE
When a stream socket peer has performed an orderly shutdown, the
return value will be 0 (the traditional "end-of-file" return).
This patch makes tcp_bpf_wait_data always return 1 when the peer
socket has been shutdown. Either we have data available, and it would
have returned 1 anyway, or there isn't, in which case we'll call
tcp_recvmsg which does the right thing in this situation.
Fixes: 604326b41a6f ("bpf, sockmap: convert to generic sk_msg interface")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Jakub Sitnicki <jakub@cloudflare.com>
Link: https://lore.kernel.org/bpf/26038a28c21fea5d04d4bd4744c5686d3f2e5504.1591784177.git.sd@queasysnail.net
1 parent 2c4779e
Tip revision: 2c7269b231194aae23fb90ab65842573a91acbc9 authored by Sabrina Dubroca on 10 June 2020, 10:19:43 UTC
bpf: tcp: Recv() should return 0 when the peer socket is closed
bpf: tcp: Recv() should return 0 when the peer socket is closed
Tip revision: 2c7269b
| File | Mode | Size |
|---|---|---|
| 9p | ||
| adfs | ||
| affs | ||
| afs | ||
| autofs | ||
| befs | ||
| bfs | ||
| btrfs | ||
| cachefiles | ||
| ceph | ||
| cifs | ||
| coda | ||
| configfs | ||
| cramfs | ||
| crypto | ||
| debugfs | ||
| devpts | ||
| dlm | ||
| ecryptfs | ||
| efivarfs | ||
| efs | ||
| erofs | ||
| exfat | ||
| exportfs | ||
| ext2 | ||
| ext4 | ||
| f2fs | ||
| fat | ||
| freevxfs | ||
| fscache | ||
| fuse | ||
| gfs2 | ||
| hfs | ||
| hfsplus | ||
| hostfs | ||
| hpfs | ||
| hugetlbfs | ||
| iomap | ||
| isofs | ||
| jbd2 | ||
| jffs2 | ||
| jfs | ||
| kernfs | ||
| lockd | ||
| minix | ||
| nfs | ||
| nfs_common | ||
| nfsd | ||
| nilfs2 | ||
| nls | ||
| notify | ||
| ntfs | ||
| ocfs2 | ||
| omfs | ||
| openpromfs | ||
| orangefs | ||
| overlayfs | ||
| proc | ||
| pstore | ||
| qnx4 | ||
| qnx6 | ||
| quota | ||
| ramfs | ||
| reiserfs | ||
| romfs | ||
| squashfs | ||
| sysfs | ||
| sysv | ||
| tracefs | ||
| ubifs | ||
| udf | ||
| ufs | ||
| unicode | ||
| vboxsf | ||
| verity | ||
| xfs | ||
| zonefs | ||
| Kconfig | -rw-r--r-- | 7.7 KB |
| Kconfig.binfmt | -rw-r--r-- | 7.6 KB |
| Makefile | -rw-r--r-- | 4.5 KB |
| aio.c | -rw-r--r-- | 56.6 KB |
| anon_inodes.c | -rw-r--r-- | 4.6 KB |
| attr.c | -rw-r--r-- | 9.7 KB |
| bad_inode.c | -rw-r--r-- | 5.3 KB |
| binfmt_aout.c | -rw-r--r-- | 8.3 KB |
| binfmt_elf.c | -rw-r--r-- | 65.7 KB |
| binfmt_elf_fdpic.c | -rw-r--r-- | 47.1 KB |
| binfmt_em86.c | -rw-r--r-- | 2.8 KB |
| binfmt_flat.c | -rw-r--r-- | 28.0 KB |
| binfmt_misc.c | -rw-r--r-- | 18.5 KB |
| binfmt_script.c | -rw-r--r-- | 4.4 KB |
| block_dev.c | -rw-r--r-- | 56.7 KB |
| buffer.c | -rw-r--r-- | 89.6 KB |
| char_dev.c | -rw-r--r-- | 16.5 KB |
| compat.c | -rw-r--r-- | 3.2 KB |
| compat_binfmt_elf.c | -rw-r--r-- | 3.4 KB |
| coredump.c | -rw-r--r-- | 22.3 KB |
| d_path.c | -rw-r--r-- | 11.3 KB |
| dax.c | -rw-r--r-- | 45.7 KB |
| dcache.c | -rw-r--r-- | 84.4 KB |
| dcookies.c | -rw-r--r-- | 7.1 KB |
| direct-io.c | -rw-r--r-- | 39.7 KB |
| drop_caches.c | -rw-r--r-- | 1.8 KB |
| eventfd.c | -rw-r--r-- | 11.6 KB |
| eventpoll.c | -rw-r--r-- | 66.0 KB |
| exec.c | -rw-r--r-- | 48.2 KB |
| fcntl.c | -rw-r--r-- | 23.3 KB |
| fhandle.c | -rw-r--r-- | 6.8 KB |
| file.c | -rw-r--r-- | 24.7 KB |
| file_table.c | -rw-r--r-- | 10.2 KB |
| filesystems.c | -rw-r--r-- | 6.4 KB |
| fs-writeback.c | -rw-r--r-- | 74.5 KB |
| fs_context.c | -rw-r--r-- | 17.3 KB |
| fs_parser.c | -rw-r--r-- | 10.1 KB |
| fs_pin.c | -rw-r--r-- | 1.9 KB |
| fs_struct.c | -rw-r--r-- | 3.3 KB |
| fs_types.c | -rw-r--r-- | 2.5 KB |
| fsopen.c | -rw-r--r-- | 11.0 KB |
| inode.c | -rw-r--r-- | 60.4 KB |
| internal.h | -rw-r--r-- | 5.0 KB |
| io-wq.c | -rw-r--r-- | 26.9 KB |
| io-wq.h | -rw-r--r-- | 3.7 KB |
| io_uring.c | -rw-r--r-- | 192.1 KB |
| ioctl.c | -rw-r--r-- | 21.5 KB |
| libfs.c | -rw-r--r-- | 34.7 KB |
| locks.c | -rw-r--r-- | 79.7 KB |
| mbcache.c | -rw-r--r-- | 12.0 KB |
| mount.h | -rw-r--r-- | 4.2 KB |
| mpage.c | -rw-r--r-- | 20.5 KB |
| namei.c | -rw-r--r-- | 119.3 KB |
| namespace.c | -rw-r--r-- | 97.9 KB |
| no-block.c | -rw-r--r-- | 478 bytes |
| nsfs.c | -rw-r--r-- | 6.6 KB |
| open.c | -rw-r--r-- | 32.8 KB |
| pipe.c | -rw-r--r-- | 31.1 KB |
| pnode.c | -rw-r--r-- | 15.1 KB |
| pnode.h | -rw-r--r-- | 1.9 KB |
| posix_acl.c | -rw-r--r-- | 21.5 KB |
| proc_namespace.c | -rw-r--r-- | 7.9 KB |
| read_write.c | -rw-r--r-- | 52.7 KB |
| readdir.c | -rw-r--r-- | 13.9 KB |
| select.c | -rw-r--r-- | 34.3 KB |
| seq_file.c | -rw-r--r-- | 23.9 KB |
| signalfd.c | -rw-r--r-- | 9.0 KB |
| splice.c | -rw-r--r-- | 40.5 KB |
| stack.c | -rw-r--r-- | 2.5 KB |
| stat.c | -rw-r--r-- | 20.2 KB |
| statfs.c | -rw-r--r-- | 9.6 KB |
| super.c | -rw-r--r-- | 47.9 KB |
| sync.c | -rw-r--r-- | 10.5 KB |
| timerfd.c | -rw-r--r-- | 13.6 KB |
| userfaultfd.c | -rw-r--r-- | 52.7 KB |
| utimes.c | -rw-r--r-- | 7.4 KB |
| xattr.c | -rw-r--r-- | 23.7 KB |
Computing file changes ...
