summaryrefslogtreecommitdiffstats
path: root/fs/pstore
diff options
context:
space:
mode:
authorAnton Vorontsov <anton.vorontsov@linaro.org>2012-06-18 19:15:51 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-20 16:15:22 -0700
commit90b58d96907e0a45555429c0d3a79c85cea4b9fc (patch)
treead2a80bf0c8648493c62822eb140b38db7d1c238 /fs/pstore
parent924d37118f9e18825294b2012a10c6245d6c25e1 (diff)
pstore/ram: Fix error handling during przs allocation
persistent_ram_new() returns ERR_PTR() value on errors, so during freeing of the przs we should check for both NULL and IS_ERR() entries, otherwise bad things will happen. Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org> Acked-by: Kees Cook <keescook@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/pstore')
-rw-r--r--fs/pstore/ram.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 0b36e91978e..58b93fbd117 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -260,7 +260,7 @@ static void ramoops_free_przs(struct ramoops_context *cxt)
if (!cxt->przs)
return;
- for (i = 0; cxt->przs[i]; i++)
+ for (i = 0; !IS_ERR_OR_NULL(cxt->przs[i]); i++)
persistent_ram_free(cxt->przs[i]);
kfree(cxt->przs);
}