diff options
| author |   Nobuo Iwata <nobuo.iwata@fujixerox.co.jp> | 2016-09-30 14:44:04 +0900 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-07 10:19:49 +0100 |
| commit | 220c61b6f73a1d6f28591aeedff51a668068361b (patch) | |
| tree | 259dcc6ecf4483505e17dda462f154ecb2a99125 /tools/usb | |
| parent | Merge 4.9-rc3 into usb-next (diff) | |
| download | wireguard-linux-220c61b6f73a1d6f28591aeedff51a668068361b.tar.xz wireguard-linux-220c61b6f73a1d6f28591aeedff51a668068361b.zip | |
usbip: deletion of incorrect socket descriptor checking
This patch removes checking of socket descriptor value in daemons.
It was checked to be less than FD_SETSIZE(1024 usually) but it's not
correct.
To be exact, the maximum value of descriptor comes from
rlimit(RLIMIT_NOFILE).
Following kernel code determines the value :
get_unused_fd_flags() : fs/files.c
__alloc_fd() : fs/files.c
expand_files() : fs/files.c
The defalut (soft limit) is defines as INR_OPEN_CUR(1024) in
include/linux/fs.h which is referenced form INIT_RLIMS in
include/asm-generic/resource.h. The value may be modified with ulimt,
sysctl, security configuration and etc.
With the kernel code above, when socket() system call returns positive
value, the value must be within rlimit(RLIMIT_NOFILE). No extra
checking is needed when socket() returns positive.
Without 'usbip: vhci number of ports extension' patch set, there's no
practical problem because of number of USB port restriction. With the
patch set, the value of socket descriptor can exceed FD_SETSIZE(1024
usually) if the rlimit is changed.
Signed-off-by: Nobuo Iwata <nobuo.iwata@fujixerox.co.jp>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/usb')
| -rw-r--r-- | tools/usb/usbip/src/usbipd.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tools/usb/usbip/src/usbipd.c b/tools/usb/usbip/src/usbipd.c index a0972dea9e6c..009afb4a3aae 100644 --- a/tools/usb/usbip/src/usbipd.c +++ b/tools/usb/usbip/src/usbipd.c @@ -398,13 +398,6 @@ static int listen_all_addrinfo(struct addrinfo *ai_head, int sockfdlist[], * (see do_standalone_mode()) */ usbip_net_set_v6only(sock); - if (sock >= FD_SETSIZE) { - err("FD_SETSIZE: %s: sock=%d, max=%d", - ai_buf, sock, FD_SETSIZE); - close(sock); - continue; - } - ret = bind(sock, ai->ai_addr, ai->ai_addrlen); if (ret < 0) { err("bind: %s: %d (%s)", |