emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

udhcpc: make sure we do not overflow poll timeout

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-02-17 19:20:32 +01:00
parent 94dcfd8cc0
commit 7c67f1e9ab
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
networking/udhcp/d6_dhcpc.c
View File

@ -1085,7 +1085,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
if (tv > 0) { if (tv > 0) {
log1("waiting on select %u seconds", tv); log1("waiting on select %u seconds", tv);
timestamp_before_wait = (unsigned)monotonic_sec(); timestamp_before_wait = (unsigned)monotonic_sec();
retval = poll(pfds, 2, tv * 1000); retval = poll(pfds, 2, tv < INT_MAX/1000 ? tv * 1000 : INT_MAX);
if (retval < 0) { if (retval < 0) {
/* EINTR? A signal was caught, don't panic */ /* EINTR? A signal was caught, don't panic */
if (errno == EINTR) { if (errno == EINTR) {

2
networking/udhcp/dhcpc.c
View File

@ -1453,7 +1453,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
if (tv > 0) { if (tv > 0) {
log1("waiting on select %u seconds", tv); log1("waiting on select %u seconds", tv);
timestamp_before_wait = (unsigned)monotonic_sec(); timestamp_before_wait = (unsigned)monotonic_sec();
retval = poll(pfds, 2, tv * 1000); retval = poll(pfds, 2, tv < INT_MAX/1000 ? tv * 1000 : INT_MAX);
if (retval < 0) { if (retval < 0) {
/* EINTR? A signal was caught, don't panic */ /* EINTR? A signal was caught, don't panic */
if (errno == EINTR) { if (errno == EINTR) {