Add some protection against NULL pointer dereference

aiden-ct · aiden-ct · commit e52372727900 · 2020-10-28T14:50:41.000Z
diff --git a/components/network/ble/blemesh/src/crypto.c b/components/network/ble/blemesh/src/crypto.c
@@ -243,7 +243,7 @@ static int bt_mesh_ccm_decrypt(const u8_t key[16], u8_t nonce[13],
 	}
 
 	/* If AAD is being used to authenticate, include it here */
-	if (aad_len) {
+	if (aad_len && aad) {
 		sys_put_be16(aad_len, pmsg);
 
 		for (i = 0; i < sizeof(u16_t); i++) {
@@ -407,7 +407,7 @@ static int bt_mesh_ccm_encrypt(const u8_t key[16], u8_t nonce[13],
 	}
 
 	/* If AAD is being used to authenticate, include it here */
-	if (aad_len) {
+	if (aad_len && aad) {
 		sys_put_be16(aad_len, pmsg);
 
 		for (i = 0; i < sizeof(u16_t); i++) {

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ static int bt_mesh_ccm_decrypt(const u8_t key[16], u8_t nonce[13],`
`243`	`243`	`}`
`244`	`244`
`245`	`245`	`/* If AAD is being used to authenticate, include it here */`
`246`		`- if (aad_len) {`
	`246`	`+ if (aad_len && aad) {`
`247`	`247`	`sys_put_be16(aad_len, pmsg);`
`248`	`248`
`249`	`249`	`for (i = 0; i < sizeof(u16_t); i++) {`
`@@ -407,7 +407,7 @@ static int bt_mesh_ccm_encrypt(const u8_t key[16], u8_t nonce[13],`
`407`	`407`	`}`
`408`	`408`
`409`	`409`	`/* If AAD is being used to authenticate, include it here */`
`410`		`- if (aad_len) {`
	`410`	`+ if (aad_len && aad) {`
`411`	`411`	`sys_put_be16(aad_len, pmsg);`
`412`	`412`
`413`	`413`	`for (i = 0; i < sizeof(u16_t); i++) {`