projects
/
freeradius.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FR-GV-302 - do checks based on pointers, not on decoded data
[freeradius.git]
/
src
/
lib
/
radius.c
diff --git
a/src/lib/radius.c
b/src/lib/radius.c
index
180b006
..
81a8066
100644
(file)
--- a/
src/lib/radius.c
+++ b/
src/lib/radius.c
@@
-2952,16
+2952,23
@@
static ssize_t data2vp_concat(TALLOC_CTX *ctx,
* don't care about walking off of the end of it.
*/
while (ptr < end) {
* don't care about walking off of the end of it.
*/
while (ptr < end) {
+ if (ptr[1] < 2) return -1;
+ if ((ptr + ptr[1]) > end) return -1;
+
total += ptr[1] - 2;
ptr += ptr[1];
total += ptr[1] - 2;
ptr += ptr[1];
+ if (ptr == end) break;
+
/*
* Attributes MUST be consecutive.
*/
if (ptr[0] != attr) break;
}
/*
* Attributes MUST be consecutive.
*/
if (ptr[0] != attr) break;
}
+ end = ptr;
+
vp = fr_pair_afrom_da(ctx, da);
if (!vp) return -1;
vp = fr_pair_afrom_da(ctx, da);
if (!vp) return -1;
@@
-2974,7
+2981,7
@@
static ssize_t data2vp_concat(TALLOC_CTX *ctx,
total = 0;
ptr = start;
total = 0;
ptr = start;
- while (
total < vp->vp_length
) {
+ while (
ptr < end
) {
memcpy(p, ptr + 2, ptr[1] - 2);
p += ptr[1] - 2;
total += ptr[1] - 2;
memcpy(p, ptr + 2, ptr[1] - 2);
p += ptr[1] - 2;
total += ptr[1] - 2;
@@
-2982,6
+2989,7
@@
static ssize_t data2vp_concat(TALLOC_CTX *ctx,
}
*pvp = vp;
}
*pvp = vp;
+
return ptr - start;
}
return ptr - start;
}