ubifs: Fix off-by-one error

[ Upstream commit d984bcf5766dbdbe95d325bb8a1b49a996fecfd4 ]

An inode is allowed to have ubifs_xattr_max_cnt() xattrs, so we must
complain only when an inode has more xattrs, having exactly
ubifs_xattr_max_cnt() xattrs is fine.
With this the maximum number of xattrs can be created without hitting
the "has too many xattrs" warning when removing it.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c
index 091c2ad8f21113ac7f04f9b8d89e59b57027880d..7927dea2babac6ee8a68485e08cdad63eb6406df 100644 (file)
--- a/fs/ubifs/journal.c
+++ b/fs/ubifs/journal.c
@@ -881,7 +881,7 @@ int ubifs_jnl_write_inode(struct ubifs_info *c, const struct inode *inode)
                struct inode *xino;
                struct ubifs_dent_node *xent, *pxent = NULL;
 
-               if (ui->xattr_cnt >= ubifs_xattr_max_cnt(c)) {
+               if (ui->xattr_cnt > ubifs_xattr_max_cnt(c)) {
                        ubifs_err(c, "Cannot delete inode, it has too much xattrs!");
                        goto out_release;
                }

diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c
index 09280796fc61075224919bc974b4d4f47c7f2a33..17745f5462f02e863988991b33a546bd2c35b830 100644 (file)
--- a/fs/ubifs/xattr.c
+++ b/fs/ubifs/xattr.c
@@ -512,7 +512,7 @@ int ubifs_purge_xattrs(struct inode *host)
        struct fscrypt_name nm = {0};
        int err;
 
-       if (ubifs_inode(host)->xattr_cnt < ubifs_xattr_max_cnt(c))
+       if (ubifs_inode(host)->xattr_cnt <= ubifs_xattr_max_cnt(c))
                return 0;
 
        ubifs_warn(c, "inode %lu has too many xattrs, doing a non-atomic deletion",