Commit 8550be08 authored by Seth Jennings's avatar Seth Jennings Committed by Greg Kroah-Hartman

staging: zcache: fix crash on cpu remove

In the case that a cpu is taken offline before zcache_do_preload() is
ever called on the cpu, the per-cpu zcache_preloads structure will
be uninitialized.  In the CPU_DEAD case for zcache_cpu_notifier(),
kp->obj is not checked before calling kmem_cache_free() on it.
If it is NULL, a crash results.

This patch ensures that both kp->obj and kp->page are not NULL before
calling the respective free functions. In practice, just checking
one or the other should be sufficient since they are assigned together
in zcache_do_preload(), but I check both for safety.
Signed-off-by: default avatarSeth Jennings <sjenning@linux.vnet.ibm.com>
Acked-by: default avatarDave Hansen <dave@linux.vnet.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5ba321cf
...@@ -1357,8 +1357,14 @@ static int zcache_cpu_notifier(struct notifier_block *nb, ...@@ -1357,8 +1357,14 @@ static int zcache_cpu_notifier(struct notifier_block *nb,
kp->objnodes[kp->nr - 1] = NULL; kp->objnodes[kp->nr - 1] = NULL;
kp->nr--; kp->nr--;
} }
if (kp->obj) {
kmem_cache_free(zcache_obj_cache, kp->obj); kmem_cache_free(zcache_obj_cache, kp->obj);
kp->obj = NULL;
}
if (kp->page) {
free_page((unsigned long)kp->page); free_page((unsigned long)kp->page);
kp->page = NULL;
}
break; break;
default: default:
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment