system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-06 17:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

ping: Verify whether a datagram timestamp was actually received.

Browse source 
ping(8) uses SO_TIMESTAMP, which attaches a timestamp to each IP datagram at
the time it's received by the kernel.  Except that occasionally it doesn't.
Add a check to see whether such a timestamp was actually set before trying
to read it.  This fixes segfaults that can happen when the kernel doesn't
attach a timestamp.

The bug has always existed, but prior to r351461 it manifested as an
implausible round-trip-time, not a segfault.

Reported by:	pho
MFC after:	3 days
MFC-With:	351461
This commit is contained in:
Alan Somers 2019-09-11 18:54:45 +00:00
parent d2e6258258
commit b17fb99228
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=352229
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sbin/ping/ping.c
View file

@ -931,7 +931,8 @@ main(int argc, char *const *argv)
continue;
}
#ifdef SO_TIMESTAMP
if (cmsg->cmsg_level == SOL_SOCKET &&
if (cmsg != NULL &&
cmsg->cmsg_level == SOL_SOCKET &&
cmsg->cmsg_type == SCM_TIMESTAMP &&
cmsg->cmsg_len == CMSG_LEN(sizeof *tv)) {
/* Copy to avoid alignment problems: */