From 46fce2e458f09606e7ebeca31d2f04b4d25621d2 Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Tue, 24 Jul 2018 13:25:12 +0530 Subject: dict: handle negative key/value length while unserialize Fixes: bz#1625089 Change-Id: Ie56df0da46c242846a1ba51ccb9e011af118b119 Signed-off-by: Amar Tumballi --- libglusterfs/src/dict.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libglusterfs/src/dict.c b/libglusterfs/src/dict.c index 1061a98577e..388f6f746b2 100644 --- a/libglusterfs/src/dict.c +++ b/libglusterfs/src/dict.c @@ -3093,7 +3093,8 @@ dict_unserialize (char *orig_buf, int32_t size, dict_t **fill) vallen = ntoh32 (hostord); buf += DICT_DATA_HDR_VAL_LEN; - if ((buf + keylen) > (orig_buf + size)) { + if ((keylen < 0) || (vallen < 0) || + (buf + keylen) > (orig_buf + size)) { gf_msg_callingfn ("dict", GF_LOG_ERROR, 0, LG_MSG_UNDERSIZED_BUF, "undersized buffer passed. " -- cgit