From: Namhyung Kim <namhyung@kernel.org>
Date: Wed, 19 Oct 2016 01:23:40 +0000 (+0900)
Subject: pstore: Protect unlink with read_mutex
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e9e360b08a44098ec6f31de8e5a29a3ffaada828;p=openwrt%2Fstaging%2Fblogic.git

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>
---

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);
 }