Skip to content

Commit 67db96a

Browse files
committed
cov-482743: jit-trust: untaint prder_len
1 parent a3dfde2 commit 67db96a

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

lib/tls/tls-jit-trust.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -632,6 +632,7 @@ lws_tls_jit_trust_blob_queury_skid(const void *_blob, size_t blen,
632632
{
633633
const uint8_t *pskidlen, *pskids, *pder, *blob = (uint8_t *)_blob;
634634
const uint16_t *pderlen;
635+
size_t siz;
635636
int certs;
636637

637638
/* sanity check blob length and magic */
@@ -690,11 +691,14 @@ lws_tls_jit_trust_blob_queury_skid(const void *_blob, size_t blen,
690691
* We found a trusted CA cert of the right SKID
691692
*/
692693
*prpder = pder;
693-
*prder_len = lws_ser_ru16be((uint8_t *)pderlen);
694-
if ((const uint16_t *)(pder + *prder_len) >=
694+
siz = lws_ser_ru16be((uint8_t *)pderlen);
695+
696+
if ((const uint16_t *)(pder + siz) >=
695697
(const uint16_t *)(blob + blen))
696698
break;
697699

700+
*prder_len = siz;
701+
698702
return 0;
699703
}
700704

0 commit comments

Comments
 (0)