Merge pull request #8715 from padelsbach/ssl-certman-codesonar

dgarske · web-flow · commit 213c43b0fc3a · 2025-05-06T14:49:57.000-07:00
Speculative fix for CodeSonar overflow issue in ssl_certman.c
diff --git a/src/ssl_certman.c b/src/ssl_certman.c
@@ -1525,7 +1525,7 @@ int CM_MemRestoreCertCache(WOLFSSL_CERT_MANAGER* cm, const void* mem, int sz)
     WOLFSSL_ENTER("CM_MemRestoreCertCache");
 
     /* Check memory available is bigger than cache header. */
-    if (current > end) {
+    if ((sz < (int)sizeof(CertCacheHeader)) || (current > end)) {
         WOLFSSL_MSG("Cert Cache Memory buffer too small");
         ret = BUFFER_E;
     }

Original file line number	Diff line number	Diff line change
`@@ -1525,7 +1525,7 @@ int CM_MemRestoreCertCache(WOLFSSL_CERT_MANAGER* cm, const void* mem, int sz)`
`1525`	`1525`	`WOLFSSL_ENTER("CM_MemRestoreCertCache");`
`1526`	`1526`
`1527`	`1527`	`/* Check memory available is bigger than cache header. */`
`1528`		`- if (current > end) {`
	`1528`	`+ if ((sz < (int)sizeof(CertCacheHeader)) \|\| (current > end)) {`
`1529`	`1529`	`WOLFSSL_MSG("Cert Cache Memory buffer too small");`
`1530`	`1530`	`ret = BUFFER_E;`
`1531`	`1531`	`}`