crypto: caam - ARRAY_SIZE() vs sizeof()

PATCH In review Dan Carpenter 3 participants 3 messages Mar 15, 2011 – Mar 23, 2011

Subsystems (3)

Kernel janitors Crypto API Freescale CAAM (Cryptographic Acceleration and Assurance Module) driver

lore

Share & tools

lore

Dan Carpenter

author

2011-03-15 06:59 UTC #0 lore raw

PATCH 1/1 crypto: caam - ARRAY_SIZE() vs sizeof()

ARRAY_SIZE() was intended here instead of sizeof(). sizeof() is four times larger than ARRAY_SIZE(). outstr is normally 256 chars so printing garbage to it could overfill the buffer and corrupt memory.

Signed-off-by Dan Carpenter <[email protected]>

drivers/crypto/caam/error.c +4 -4

index bd57a68..7e2d54b 100644
@@ -73,7 +73,7 @@ static void report_ccb_status(u32 status, char *outstr)
 
 	report_jump_idx(status, outstr);
 
-	if (cha_id < sizeof(cha_id_list)) {
+	if (cha_id < ARRAY_SIZE(cha_id_list)) {
 		SPRINTFCAT(outstr, "%s: ", cha_id_list[cha_id],
 			   strlen(cha_id_list[cha_id]));
 	} else {

@@ -81,7 +81,7 @@ static void report_ccb_status(u32 status, char *outstr)
 			   cha_id, sizeof("ff"));
 	}
 
-	if (err_id < sizeof(err_id_list)) {
+	if (err_id < ARRAY_SIZE(err_id_list)) {
 		SPRINTFCAT(outstr, "%s", err_id_list[err_id],
 			   strlen(err_id_list[err_id]));
 	} else {

@@ -198,11 +198,11 @@ static void report_deco_status(u32 status, char *outstr)
 
 	report_jump_idx(status, outstr);
 
-	for (i = 0; i < sizeof(desc_error_list); i++)
+	for (i = 0; i < ARRAY_SIZE(desc_error_list); i++)
 		if (desc_error_list[i].value = desc_error)
 			break;
 
-	if (i != sizeof(desc_error_list) && desc_error_list[i].error_text) {
+	if (i != ARRAY_SIZE(desc_error_list) && desc_error_list[i].error_text) {
 		SPRINTFCAT(outstr, "%s", desc_error_list[i].error_text,
 			   strlen(desc_error_list[i].error_text));
 	} else {

Kim Phillips

Acked-by on v1 1/1

2011-03-15 22:20 UTC #1 lore raw

Quoted 5 lines · On Tue, 15 Mar 2011 09:59:55 +0300 Dan Carpenter <[email protected]> wrote:

ARRAY_SIZE() was intended here instead of sizeof(). sizeof() is four times larger than ARRAY_SIZE(). outstr is normally 256 chars so printing garbage to it could overfill the buffer and corrupt memory.
Signed-off-by Dan Carpenter <[email protected]>

Acked-by Kim Phillips <[email protected]>

Thanks Dan,

Kim

Herbert Xu

2011-03-23 13:22 UTC #2 lore raw

Quoted 10 lines · Kim Phillips

Quoted 5 lines · On Tue, 15 Mar 2011 09:59:55 +0300 Dan Carpenter <[email protected]> wrote:
ARRAY_SIZE() was intended here instead of sizeof(). sizeof() is four times larger than ARRAY_SIZE(). outstr is normally 256 chars so printing garbage to it could overfill the buffer and corrupt memory.
Signed-off-by Dan Carpenter <[email protected]>
Acked-by Kim Phillips <[email protected]>

Also applied. Thanks!

Signature · 3 lines

Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt