diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2011-04-27 16:44:26 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2011-05-19 17:35:28 +0100 |
| commit | 52c3ce4ec5601ee383a14f1485f6bac7b278896e (patch) | |
| tree | c987bc17100f9b5e5bdaa3b2b83612fe65bbb39a | |
| parent | 8e10cd74342c7f5ce259cceca36f6eba084f5d58 (diff) | |
| download | op-kernel-dev-52c3ce4ec5601ee383a14f1485f6bac7b278896e.zip op-kernel-dev-52c3ce4ec5601ee383a14f1485f6bac7b278896e.tar.gz | |
kmemleak: Do not return a pointer to an object that kmemleak did not get
The kmemleak_seq_next() function tries to get an object (and increment
its use count) before returning it. If it could not get the last object
during list traversal (because it may have been freed), the function
should return NULL rather than a pointer to such object that it did not
get.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Reported-by: Phil Carmody <ext-phil.2.carmody@nokia.com>
Acked-by: Phil Carmody <ext-phil.2.carmody@nokia.com>
Cc: <stable@kernel.org>
| -rw-r--r-- | mm/kmemleak.c | 7 |
1 files changed, 5 insertions, 2 deletions
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); |
