2011-03-15 07:00:13

by Dan Carpenter

Subject: [patch] 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]>

diff --git a/drivers/crypto/caam/error.c b/drivers/crypto/caam/error.c
index bd57a68..7e2d54b 100644
--- a/drivers/crypto/caam/error.c
+++ b/drivers/crypto/caam/error.c
@@ -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 {

2011-03-15 22:20:42

by Kim Phillips

Subject: Re: [patch] crypto: caam - ARRAY_SIZE() vs sizeof()

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

2011-03-23 13:22:28

by Herbert Xu

Subject: Re: [patch] crypto: caam - ARRAY_SIZE() vs sizeof()

On Tue, Mar 15, 2011 at 05:20:37PM -0500, Kim Phillips wrote:
> 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!
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt