From 63e6ed35cb09fb110d5725192d6dc1cce5643678 Mon Sep 17 00:00:00 2001 From: Kapil Gupta Date: Sat, 21 Dec 2024 00:10:57 +0530 Subject: [PATCH 1/2] fix(esp_wifi): Fix coverity issue (CID:470090) --- components/wpa_supplicant/src/eap_peer/eap_ttls.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/wpa_supplicant/src/eap_peer/eap_ttls.c b/components/wpa_supplicant/src/eap_peer/eap_ttls.c index e664d57eff..fd7949513e 100644 --- a/components/wpa_supplicant/src/eap_peer/eap_ttls.c +++ b/components/wpa_supplicant/src/eap_peer/eap_ttls.c @@ -170,7 +170,8 @@ static u8 * eap_ttls_avp_hdr(u8 *avphdr, u32 avp_code, u32 vendor_id, } avp->avp_code = host_to_be32(avp_code); - avp->avp_length = host_to_be32((flags << 24) | (u32) (hdrlen + len)); + avp->avp_length = host_to_be32(((u32) (flags << 24)) | + (u32) (hdrlen + len)); return avphdr + hdrlen; } From b72d39ab3edfb8770155567471b6b8a3ec783554 Mon Sep 17 00:00:00 2001 From: Kapil Gupta Date: Sat, 21 Dec 2024 00:18:43 +0530 Subject: [PATCH 2/2] fix(esp_wifi): Fix coverity issue CID: 470126 --- .../esp_supplicant/src/crypto/crypto_mbedtls-ec.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/components/wpa_supplicant/esp_supplicant/src/crypto/crypto_mbedtls-ec.c b/components/wpa_supplicant/esp_supplicant/src/crypto/crypto_mbedtls-ec.c index 5f929284be..f804f40dfa 100644 --- a/components/wpa_supplicant/esp_supplicant/src/crypto/crypto_mbedtls-ec.c +++ b/components/wpa_supplicant/esp_supplicant/src/crypto/crypto_mbedtls-ec.c @@ -983,7 +983,12 @@ int crypto_pk_write_formatted_pubkey_der(mbedtls_pk_context *key, unsigned char c = buf + size; - MBEDTLS_ASN1_CHK_ADD(len, mbedtls_pk_write_pubkey_formatted(&c, buf, key, format)); + ret = mbedtls_pk_write_pubkey_formatted(&c, buf, key, format); + + if (ret < 0) { + return ret; + } + MBEDTLS_ASN1_CHK_ADD(len, ret); if (c - buf < 1) { return (MBEDTLS_ERR_ASN1_BUF_TOO_SMALL);