decode_varint() accepts any number of continuation bytes. From the 11th
byte on, the shift count exceeds 63, which is undefined behaviour (UBSan:
"shift exponent 67 is too large for 64-bit type"), and a 10-byte varint
whose last byte is above 15 silently wraps: a value >= 2^64 is decoded
modulo 2^64. For example an SPOP agent sending the AGENT-HELLO
max-frame-size as f0 ff ff ff ff ff ff ff ff 7f has it decoded as
2314921131297212640 instead of being rejected.
In order to avoid adding costly checks in the inner loop, let's only
process the first 9 bytes as usual in the current loop and make a
special case of the 10th byte where we add an overflow check if ever
met.
This should be backported to all stable versions.
Reported-by: Martin Mirchev <mirchevmartin2203@gmail.com>
Co-authored-by: Martin Mirchev <mirchevmartin2203@gmail.com>
static inline int decode_varint(char **buf, char *end, uint64_t *i)
{
unsigned char *p = (unsigned char *)*buf;
+ unsigned char *stop;
+ uint64_t v;
int r;
if (p >= (unsigned char *)end)
}
r = 4;
+
+ /* r=4,11,18,25,32,39,46,53,60; only the 9th from here (r=60) can
+ * overflow so let's stop reading before p+8 to avoid checks in the
+ * common loop, and deal with the last byte at the end.
+ */
+ stop = (unsigned char *)end;
+ if (p + 8 < stop)
+ stop = p + 8;
+
do {
- if (p >= (unsigned char *)end)
- return -1;
+ if (p >= stop) {
+ /* last byte (r=60): must exist, be final, and not overflow */
+ if (p >= (unsigned char *)end || *p > 0xf)
+ return -1;
+
+ v = ((uint64_t)*p++ << 60);
+ if (*i + v < *i)
+ return -1;
+ *i += v;
+ break;
+ }
*i += (uint64_t)*p << r;
r += 7;
} while (*p++ >= 128);