lkml.org 
[lkml]   [2011]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] kmemleak: Never return a pointer you didn't 'get'
On 27/04/11 10:31 +0100, ext Catalin Marinas wrote:
> On Thu, 2011-04-21 at 12:39 +0100, Phil Carmody wrote:
> > Old - If you don't get the last pointer that you looked at, then it will
> > still be put, as there's no way of knowing you didn't get it.
> >
> > New - If you didn't get it, then it refers to something deleted, and
> > your work is done, so return NULL.
> >
> > Signed-off-by: Phil Carmody <ext-phil.2.carmody@nokia.com>
>
> Good catch. But I think the code may look slightly simpler as below:
>
> diff --git a/mm/kmemleak.c b/mm/kmemleak.c
> index c1d5867..aacee45 100644
> --- a/mm/kmemleak.c
> +++ b/mm/kmemleak.c
> @@ -1414,9 +1414,12 @@ static void *kmemleak_seq_next(struct seq_file *seq, void *v, loff_t *pos)
> ++(*pos);
>
> list_for_each_continue_rcu(n, &object_list) {
> - next_obj = list_entry(n, struct kmemleak_object, object_list);
> - if (get_object(next_obj))
> + struct kmemleak_object *obj =
> + list_entry(n, struct kmemleak_object, object_list);
> + if (get_object(obj)) {
> + next_obj = obj;
> break;
> + }
> }
>
> put_object(prev_obj);

I did consider that way too, but had no strong preference. I think I now
prefer yours, so please add:

Signed-off-by: Phil Carmody <ext-phil.2.carmody@nokia.com>

Cheers,
Phil


\
 
 \ /
  Last update: 2011-04-27 12:19    [W:0.041 / U:0.716 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site