upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-23 07:08:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[MINOR] stream_sock: don't dereference a non-existing frontend

Browse source 
The stream_sock accept() can be used without any frontend. Check
everywhere if it exists before dereferencing it in the error path.
This commit is contained in:
Willy Tarreau 2010-06-04 20:46:13 +02:00
parent 1d315eaa24
commit 7999ddbc95
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/stream_sock.c
View file

@ -1156,20 +1156,23 @@ int stream_sock_accept(int fd)
case ECONNABORTED:
return 0; /* nothing more to accept */
case ENFILE:
send_log(p, LOG_EMERG,
"Proxy %s reached system FD limit at %d. Please check system tunables.\n",
p->id, maxfd);
if (p)
send_log(p, LOG_EMERG,
"Proxy %s reached system FD limit at %d. Please check system tunables.\n",
p->id, maxfd);
return 0;
case EMFILE:
send_log(p, LOG_EMERG,
"Proxy %s reached process FD limit at %d. Please check 'ulimit-n' and restart.\n",
p->id, maxfd);
if (p)
send_log(p, LOG_EMERG,
"Proxy %s reached process FD limit at %d. Please check 'ulimit-n' and restart.\n",
p->id, maxfd);
return 0;
case ENOBUFS:
case ENOMEM:
send_log(p, LOG_EMERG,
"Proxy %s reached system memory limit at %d sockets. Please check system tunables.\n",
p->id, maxfd);
if (p)
send_log(p, LOG_EMERG,
"Proxy %s reached system memory limit at %d sockets. Please check system tunables.\n",
p->id, maxfd);
return 0;
default:
return 0;
@ -1184,8 +1187,10 @@ int stream_sock_accept(int fd)
ret = l->accept(l, cfd, &addr);
if (unlikely(ret < 0)) {
/* critical error encountered, generally a resource shortage */
EV_FD_CLR(fd, DIR_RD);
p->state = PR_STIDLE;
if (p) {
EV_FD_CLR(fd, DIR_RD);
p->state = PR_STIDLE;
}
goto out_close;
}
else if (unlikely(ret == 0)) {