Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9401a795 authored by Taesoo Kim's avatar Taesoo Kim Committed by Artem Bityutskiy
Browse files

UBIFS: fix incorrect unlocking handling 



When ubifs_init_security() fails, 'ui_mutex' is incorrectly
unlocked and incorrectly restores 'i_size'. Fix this.

Signed-off-by: default avatarTaesoo Kim <tsgatesv@gmail.com>
Fixes: d7f0b70d ("UBIFS: Add security.* XATTR support for the UBIFS")
Reviewed-by: default avatarBen Shelton <ben.shelton@ni.com>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent 3527a86b

fs/ubifs/dir.c

+7 −4
Original line number Original line Diff line number Diff line
@@ -272,7 +272,7 @@ static int ubifs_create(struct inode *dir, struct dentry *dentry, umode_t mode, 




	err = ubifs_init_security(dir, inode, &dentry->d_name);

	err = ubifs_init_security(dir, inode, &dentry->d_name);

	if (err)

	if (err)

		goto out_cancel;

		goto out_inode;





	mutex_lock(&dir_ui->ui_mutex);

	mutex_lock(&dir_ui->ui_mutex);

	dir->i_size += sz_change;

	dir->i_size += sz_change;
@@ -292,6 +292,7 @@ static int ubifs_create(struct inode *dir, struct dentry *dentry, umode_t mode, 
	dir->i_size -= sz_change;

	dir->i_size -= sz_change;

	dir_ui->ui_size = dir->i_size;

	dir_ui->ui_size = dir->i_size;

	mutex_unlock(&dir_ui->ui_mutex);

	mutex_unlock(&dir_ui->ui_mutex);

out_inode:

	make_bad_inode(inode);

	make_bad_inode(inode);

	iput(inode);

	iput(inode);

out_budg:

out_budg:
@@ -732,7 +733,7 @@ static int ubifs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) 




	err = ubifs_init_security(dir, inode, &dentry->d_name);

	err = ubifs_init_security(dir, inode, &dentry->d_name);

	if (err)

	if (err)

		goto out_cancel;

		goto out_inode;





	mutex_lock(&dir_ui->ui_mutex);

	mutex_lock(&dir_ui->ui_mutex);

	insert_inode_hash(inode);

	insert_inode_hash(inode);
@@ -757,6 +758,7 @@ static int ubifs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) 
	dir_ui->ui_size = dir->i_size;

	dir_ui->ui_size = dir->i_size;

	drop_nlink(dir);

	drop_nlink(dir);

	mutex_unlock(&dir_ui->ui_mutex);

	mutex_unlock(&dir_ui->ui_mutex);

out_inode:

	make_bad_inode(inode);

	make_bad_inode(inode);

	iput(inode);

	iput(inode);

out_budg:

out_budg:
@@ -816,7 +818,7 @@ static int ubifs_mknod(struct inode *dir, struct dentry *dentry, 




	err = ubifs_init_security(dir, inode, &dentry->d_name);

	err = ubifs_init_security(dir, inode, &dentry->d_name);

	if (err)

	if (err)

		goto out_cancel;

		goto out_inode;





	mutex_lock(&dir_ui->ui_mutex);

	mutex_lock(&dir_ui->ui_mutex);

	dir->i_size += sz_change;

	dir->i_size += sz_change;
@@ -836,6 +838,7 @@ static int ubifs_mknod(struct inode *dir, struct dentry *dentry, 
	dir->i_size -= sz_change;

	dir->i_size -= sz_change;

	dir_ui->ui_size = dir->i_size;

	dir_ui->ui_size = dir->i_size;

	mutex_unlock(&dir_ui->ui_mutex);

	mutex_unlock(&dir_ui->ui_mutex);

out_inode:

	make_bad_inode(inode);

	make_bad_inode(inode);

	iput(inode);

	iput(inode);

out_budg:

out_budg:
@@ -896,7 +899,7 @@ static int ubifs_symlink(struct inode *dir, struct dentry *dentry, 




	err = ubifs_init_security(dir, inode, &dentry->d_name);

	err = ubifs_init_security(dir, inode, &dentry->d_name);

	if (err)

	if (err)

		goto out_cancel;

		goto out_inode;





	mutex_lock(&dir_ui->ui_mutex);

	mutex_lock(&dir_ui->ui_mutex);

	dir->i_size += sz_change;

	dir->i_size += sz_change;