2011-02-20 22:45:41

by Ilia Mirkin

Subject: [PATCH] lru_cache: Use correct type in sizeof for allocation

This has no actual effect, since sizeof(struct hlist_head) ==
sizeof(struct hlist_head *), but it's still the wrong type to use.

The semantic match that finds this problem:
// <smpl>
@@
type T;
identifier x;
@@
T *x;
...
* x = kzalloc(... * sizeof(T*) * ..., ...);
// </smpl>

Signed-off-by: Ilia Mirkin <[email protected]>

---
lib/lru_cache.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

Note that in lc_reset, there is the line

memset(lc->lc_slot, 0, sizeof(struct hlist_head) * lc->nr_elements);

So this seems correct. But otherwise untested.

diff --git a/lib/lru_cache.c b/lib/lru_cache.c
index 270de9d..b312c8f 100644
--- a/lib/lru_cache.c
+++ b/lib/lru_cache.c
@@ -84,7 +84,7 @@ struct lru_cache *lc_create(const char *name, struct kmem_cache *cache,
if (e_count > LC_MAX_ACTIVE)
return NULL;

- slot = kzalloc(e_count * sizeof(struct hlist_head*), GFP_KERNEL);
+ slot = kzalloc(e_count * sizeof(struct hlist_head), GFP_KERNEL);
if (!slot)
goto out_fail;
element = kzalloc(e_count * sizeof(struct lc_element *), GFP_KERNEL);
--
1.7.3.4

2011-02-21 08:50:38

by Lars Ellenberg

Subject: Re: [Drbd-dev] [PATCH] lru_cache: Use correct type in sizeof for allocation

On Sun, Feb 20, 2011 at 05:45:14PM -0500, Ilia Mirkin wrote:
> This has no actual effect, since sizeof(struct hlist_head) ==
> sizeof(struct hlist_head *), but it's still the wrong type to use.
>
> The semantic match that finds this problem:
> // <smpl>
> @@
> type T;
> identifier x;
> @@
> T *x;
> ...
> * x = kzalloc(... * sizeof(T*) * ..., ...);
> // </smpl>
>
> Signed-off-by: Ilia Mirkin <[email protected]>

Acked-by: Lars Ellenberg <[email protected]>

>
> ---
> lib/lru_cache.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> Note that in lc_reset, there is the line
>
> memset(lc->lc_slot, 0, sizeof(struct hlist_head) * lc->nr_elements);
>
> So this seems correct. But otherwise untested.
>
> diff --git a/lib/lru_cache.c b/lib/lru_cache.c
> index 270de9d..b312c8f 100644
> --- a/lib/lru_cache.c
> +++ b/lib/lru_cache.c
> @@ -84,7 +84,7 @@ struct lru_cache *lc_create(const char *name, struct kmem_cache *cache,
> if (e_count > LC_MAX_ACTIVE)
> return NULL;
>
> - slot = kzalloc(e_count * sizeof(struct hlist_head*), GFP_KERNEL);
> + slot = kzalloc(e_count * sizeof(struct hlist_head), GFP_KERNEL);

Luckily sizeof(struct hlist_head*) == sizeof(struct hlist_head),
so this went unnoticed, as it did not have any effect.

Thanks for having this spotted by semantic matching.

Lars

> if (!slot)
> goto out_fail;
> element = kzalloc(e_count * sizeof(struct lc_element *), GFP_KERNEL);
> --
> 1.7.3.4

2011-04-07 21:19:49

by Andrew Morton

Subject: Re: [PATCH] lru_cache: Use correct type in sizeof for allocation

On Sun, 20 Feb 2011 17:45:14 -0500
Ilia Mirkin <[email protected]> wrote:

> This has no actual effect, since sizeof(struct hlist_head) ==
> sizeof(struct hlist_head *), but it's still the wrong type to use.
>
> The semantic match that finds this problem:
> // <smpl>
> @@
> type T;
> identifier x;
> @@
> T *x;
> ...
> * x = kzalloc(... * sizeof(T*) * ..., ...);
> // </smpl>
>
> ...
>
> --- a/lib/lru_cache.c
> +++ b/lib/lru_cache.c
> @@ -84,7 +84,7 @@ struct lru_cache *lc_create(const char *name, struct kmem_cache *cache,
> if (e_count > LC_MAX_ACTIVE)
> return NULL;
>
> - slot = kzalloc(e_count * sizeof(struct hlist_head*), GFP_KERNEL);
> + slot = kzalloc(e_count * sizeof(struct hlist_head), GFP_KERNEL);
> if (!slot)
> goto out_fail;
> element = kzalloc(e_count * sizeof(struct lc_element *), GFP_KERNEL);

This is one of the reasons why I think it's better to use

foo = kmalloc(sizeof(*foo));

Then, you just *know* it's correct by looking at the code and you don't
need to scroll up and double-check the type of foo.

The code as you have it is still vulnerable to multiplicative overflow.
So, to be really really correct,


--- a/lib/lru_cache.c~lru_cache-use-correct-type-in-sizeof-for-allocation-fix
+++ a/lib/lru_cache.c
@@ -84,7 +84,7 @@ struct lru_cache *lc_create(const char *
if (e_count > LC_MAX_ACTIVE)
return NULL;

- slot = kzalloc(e_count * sizeof(struct hlist_head), GFP_KERNEL);
+ slot = kcalloc(e_count, sizeof(struct hlist_head), GFP_KERNEL);
if (!slot)
goto out_fail;
element = kzalloc(e_count * sizeof(struct lc_element *), GFP_KERNEL);
_