summaryrefslogtreecommitdiffstats
path: root/fs/pstore
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung@kernel.org>2016-10-19 03:23:40 +0200
committerKees Cook <keescook@chromium.org>2016-11-16 01:34:31 +0100
commite9e360b08a44098ec6f31de8e5a29a3ffaada828 (patch)
tree547a1aeec67bf4b76b7cc43d2cc4bf479f511926 /fs/pstore
parentpstore: Use global ftrace filters for function trace filtering (diff)
downloadlinux-e9e360b08a44098ec6f31de8e5a29a3ffaada828.tar.xz
linux-e9e360b08a44098ec6f31de8e5a29a3ffaada828.zip
pstore: Protect unlink with read_mutex
When update_ms is set, pstore_get_records() will be called when there's a new entry. But unlink can be called at the same time and might contend with the open-read-close loop. Depending on the implementation of platform driver, it may be safe or not. But I think it'd be better to protect those race in the first place. Cc: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'fs/pstore')
-rw-r--r--fs/pstore/inode.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c
index 0d6bbcf47d52..57c0646479f5 100644
--- a/fs/pstore/inode.c
+++ b/fs/pstore/inode.c
@@ -199,11 +199,14 @@ static int pstore_unlink(struct inode *dir, struct dentry *dentry)
if (err)
return err;
- if (p->psi->erase)
+ if (p->psi->erase) {
+ mutex_lock(&p->psi->read_mutex);
p->psi->erase(p->type, p->id, p->count,
d_inode(dentry)->i_ctime, p->psi);
- else
+ mutex_unlock(&p->psi->read_mutex);
+ } else {
return -EPERM;
+ }
return simple_unlink(dir, dentry);
}