diff options
| author | Thomas Guyot-Sionnest <dermoth@users.sourceforge.net> | 2008-11-19 05:59:33 (GMT) |
|---|---|---|
| committer | Thomas Guyot-Sionnest <dermoth@users.sourceforge.net> | 2008-11-19 05:59:33 (GMT) |
| commit | 16f53e0717b60660145388b0feb351628f606211 (patch) | |
| tree | 9b1ce2730cfb9b8c255da8c3c137cc1e98e22d39 /plugins | |
| parent | 53058522125ef86a65c241ad0a5f56df01d55d6a (diff) | |
| download | monitoring-plugins-16f53e0717b60660145388b0feb351628f606211.tar.gz | |
Fixed buffer overflow in check_ntp/check_ntp_peer (#1999319, Ubuntu #291265)
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2086 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/check_ntp.c | 2 | ||||
| -rw-r--r-- | plugins/check_ntp_peer.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c index 68c82d1..489ad60 100644 --- a/plugins/check_ntp.c +++ b/plugins/check_ntp.c | |||
| @@ -198,7 +198,7 @@ typedef struct { | |||
| 198 | /* NTP control message header is 12 bytes, plus any data in the data | 198 | /* NTP control message header is 12 bytes, plus any data in the data |
| 199 | * field, plus null padding to the nearest 32-bit boundary per rfc. | 199 | * field, plus null padding to the nearest 32-bit boundary per rfc. |
| 200 | */ | 200 | */ |
| 201 | #define SIZEOF_NTPCM(m) (12+ntohs(m.count)+((m.count)?4-(ntohs(m.count)%4):0)) | 201 | #define SIZEOF_NTPCM(m) (12+ntohs(m.count)+((ntohs(m.count)%4)?4-(ntohs(m.count)%4):0)) |
| 202 | 202 | ||
| 203 | /* finally, a little helper or two for debugging: */ | 203 | /* finally, a little helper or two for debugging: */ |
| 204 | #define DBG(x) do{if(verbose>1){ x; }}while(0); | 204 | #define DBG(x) do{if(verbose>1){ x; }}while(0); |
diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c index 3add273..e489a58 100644 --- a/plugins/check_ntp_peer.c +++ b/plugins/check_ntp_peer.c | |||
| @@ -131,7 +131,7 @@ typedef struct { | |||
| 131 | /* NTP control message header is 12 bytes, plus any data in the data | 131 | /* NTP control message header is 12 bytes, plus any data in the data |
| 132 | * field, plus null padding to the nearest 32-bit boundary per rfc. | 132 | * field, plus null padding to the nearest 32-bit boundary per rfc. |
| 133 | */ | 133 | */ |
| 134 | #define SIZEOF_NTPCM(m) (12+ntohs(m.count)+((m.count)?4-(ntohs(m.count)%4):0)) | 134 | #define SIZEOF_NTPCM(m) (12+ntohs(m.count)+((ntohs(m.count)%4)?4-(ntohs(m.count)%4):0)) |
| 135 | 135 | ||
| 136 | /* finally, a little helper or two for debugging: */ | 136 | /* finally, a little helper or two for debugging: */ |
| 137 | #define DBG(x) do{if(verbose>1){ x; }}while(0); | 137 | #define DBG(x) do{if(verbose>1){ x; }}while(0); |