d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save a copy of errno before invoking syslog() if accept() or select() fail.

Browse Source 
syslog() can trash the errno value causing nfsd to exit for non-fatal
errors like ECONNABORTED from accept().

MFC after:	1 week
This commit is contained in:
John Baldwin 2011-02-17 17:03:56 +00:00
parent bed7dbd1d3
commit 873ec24ac8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=218777
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
usr.sbin/nfsd/nfsd.c
View File

@ -134,7 +134,7 @@ main(int argc, char **argv)
socklen_t len;
int on = 1, unregister, reregister, sock;
int tcp6sock, ip6flag, tcpflag, tcpsock;
int udpflag, ecode, s, srvcnt;
int udpflag, ecode, error, s, srvcnt;
int bindhostc, bindanyflag, rpcbreg, rpcbregcnt;
int stablefd, nfssvc_addsock;
char **bindhost = NULL;
@ -738,8 +738,9 @@ main(int argc, char **argv)
if (connect_type_cnt > 1) {
if (select(maxsock + 1,
&ready, NULL, NULL, NULL) < 1) {
error = errno;
syslog(LOG_ERR, "select failed: %m");
if (errno == EINTR)
if (error == EINTR)
continue;
nfsd_exit(1);
}
@ -750,9 +751,10 @@ main(int argc, char **argv)
len = sizeof(inetpeer);
if ((msgsock = accept(tcpsock,
(struct sockaddr *)&inetpeer, &len)) < 0) {
error = errno;
syslog(LOG_ERR, "accept failed: %m");
if (errno == ECONNABORTED ||
errno == EINTR)
if (error == ECONNABORTED ||
error == EINTR)
continue;
nfsd_exit(1);
}
@ -772,10 +774,11 @@ main(int argc, char **argv)
if ((msgsock = accept(tcpsock,
(struct sockaddr *)&inet6peer,
&len)) < 0) {
error = errno;
syslog(LOG_ERR,
"accept failed: %m");
if (errno == ECONNABORTED ||
errno == EINTR)
if (error == ECONNABORTED ||
error == EINTR)
continue;
nfsd_exit(1);
}