summaryrefslogtreecommitdiff
path: root/source4/smb_server
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2008-04-17 15:20:39 +0200
committerAndrew Tridgell <tridge@samba.org>2008-04-17 15:20:39 +0200
commit11703b298685c9984a6a3c3a64eddb8a1a516b90 (patch)
treee747019d16a998f1a61f28762b2aaaab673a0d08 /source4/smb_server
parent107ab090e23dfc517bc74bb553315cd3528e1f7d (diff)
downloadsamba-11703b298685c9984a6a3c3a64eddb8a1a516b90.tar.gz
samba-11703b298685c9984a6a3c3a64eddb8a1a516b90.tar.bz2
samba-11703b298685c9984a6a3c3a64eddb8a1a516b90.zip
fix the overflow/wrap checks in Samba4 for new gcc optimisation behavior
The approach I have used is as set out in https://www.securecoding.cert.org/confluence/display/seccode/ARR38-C.+Do+not+add+or+subtract+an+integer+to+a+pointer+if+the+resulting+value+does+not+refer+to+an+element+within+the+array (This used to be commit 92d5fb531db39be655f0cbd2d75b5f675a0a4cfa)
Diffstat (limited to 'source4/smb_server')
-rw-r--r--source4/smb_server/smb/request.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/smb_server/smb/request.c b/source4/smb_server/smb/request.c
index 87073517dd..c7fa2d7d8a 100644
--- a/source4/smb_server/smb/request.c
+++ b/source4/smb_server/smb/request.c
@@ -651,10 +651,10 @@ bool req_data_oob(struct request_bufinfo *bufinfo, const uint8_t *ptr, uint32_t
}
/* be careful with wraparound! */
- if (ptr < bufinfo->data ||
- ptr >= bufinfo->data + bufinfo->data_size ||
+ if ((uintptr_t)ptr < (uintptr_t)bufinfo->data ||
+ (uintptr_t)ptr >= (uintptr_t)bufinfo->data + bufinfo->data_size ||
count > bufinfo->data_size ||
- ptr + count > bufinfo->data + bufinfo->data_size) {
+ (uintptr_t)ptr + count > (uintptr_t)bufinfo->data + bufinfo->data_size) {
return true;
}
return false;