upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-04-23 23:29:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix an out-of-bounds memcpy(3) and add a realloc(3) error check in

Browse source 
jitter_request().


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1666 f882894a-f735-0410-b71e-b25c423dba1c
This commit is contained in:
Holger Weiss 2007-03-31 18:48:17 +00:00
parent eac5cdc26f
commit cedc77a0ae
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/check_ntp.c
View file

@ -506,6 +506,7 @@ double jitter_request(const char *host, int *status){
ntp_control_message req;
double rval = 0.0, jitter = -1.0;
char *startofvalue=NULL, *nptr=NULL;
void *tmp;
/* Long-winded explanation:
* Getting the jitter requires a number of steps:
@ -539,8 +540,10 @@ double jitter_request(const char *host, int *status){
* we represent as a ntp_assoc_status_pair datatype.
*/
npeers+=(ntohs(req.count)/sizeof(ntp_assoc_status_pair));
peers=(ntp_assoc_status_pair*)realloc(peers, sizeof(ntp_assoc_status_pair)*npeers);
memcpy((void*)((ptrdiff_t)peers+peer_offset), (void*)req.data, sizeof(ntp_assoc_status_pair)*npeers);
if((tmp=realloc(peers, sizeof(ntp_assoc_status_pair)*npeers)) == NULL)
free(peers), die(STATE_UNKNOWN, "can not (re)allocate 'peers' buffer\n");
peers=tmp;
memcpy((void*)((ptrdiff_t)peers+peer_offset), (void*)req.data, ntohs(req.count));
peer_offset+=ntohs(req.count);
} while(req.op&REM_MORE);