From ad03fe743959c04a9e7d611c026c201a14ce0ed6 Mon Sep 17 00:00:00 2001
From: Andrey Koloskov <kolos...@ispras.ru>
To: David Woodhouse <dw...@infradead.org>
Cc: linux-...@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Date: Tue, 13 Jan 2015 14:37:18 +0400
Subject: [PATCH] jffs2: Do not rewrite posix_acl_equiv_mode() result in
jffs2_set_acl()
Result of posix_acl_equiv_mode() is rewritten with one of
jffs2_do_setattr(),
so it is always assumed that acl can be exactly represented by the
traditional file mode permission bits.
The patch adds a new variable for store result of
posix_acl_equiv_mode().
Found by Linux File System Verification project (linuxtesting.org).
Signed-off-by: Andrey Koloskov <kolos...@ispras.ru>
---
fs/jffs2/acl.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
index 2f7a3c0..63705bd 100644
--- a/fs/jffs2/acl.c
+++ b/fs/jffs2/acl.c
@@ -229,16 +229,16 @@ static int __jffs2_set_acl(struct inode *inode,
int xprefix, struct posix_acl *a
int jffs2_set_acl(struct inode *inode, struct posix_acl *acl, int
type)
{
- int rc, xprefix;
+ int rc, xprefix, not_equiv;
switch (type) {
case ACL_TYPE_ACCESS:
xprefix = JFFS2_XPREFIX_ACL_ACCESS;
if (acl) {
umode_t mode = inode->i_mode;
- rc = posix_acl_equiv_mode(acl, &mode);
- if (rc < 0)
- return rc;
+ not_equiv = posix_acl_equiv_mode(acl, &mode);
+ if (not_equiv < 0)
+ return not_equiv;
if (inode->i_mode != mode) {
struct iattr attr;
@@ -249,7 +249,7 @@ int jffs2_set_acl(struct inode *inode, struct
posix_acl *acl, int type)
if (rc < 0)
return rc;
}
- if (rc == 0)
+ if (not_equiv == 0)
acl = NULL;
}
break;
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
