kevin/linux
1
Fork 0
Code

ubifs: Fix space leak when powercut happens in linking tmpfile

Browse Source 
There is a potential space leak problem when powercut happens in linking
tmpfile, in which case, inode node (with nlink=0) and its' data nodes can
be found from tnc (on flash), but there are no dentries related to the
inode, so the file is invisible but takes free space. Detailed process is
shown as:
 ubifs_tmpfile
  ubifs_jnl_update // Add bud A into log area
   ubifs_add_orphan // Add inode into orphan list

     P1             P2
 ubifs_link
  ubifs_delete_orphan // Delete inode from orphan list, then inode won't
		      // be written into orphan area, there is no chance
		      // to delete inode by replaying orphan.
                commit // bud A won't be replayed in next mounting
   >> powercut <<
  ubifs_jnl_update // Link inode to dentry

The root cause is that orphan entry deletion and journal writing(for link)
are interrupted by commit, which makes the two operations are not atomic.
Fix it by doing ubifs_delete_orphan under the protection of c->commit_sem
within ubifs_jnl_update. This is also a preparation to support all creating
new files by orphan inode.

v1 is https://lore.kernel.org/linux-mtd/20200701093227.674945-1-chengzhihao1@huawei.com/

Fixes: 32fe905c17 ("ubifs: Fix O_TMPFILE corner case in ubifs_link()")
Link: https://bugzilla.kernel.org/show_bug.cgi?id=208405
Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Zhihao Cheng 2024-04-10 15:37:49 +08:00 committed by Richard Weinberger
parent 9f5ecacfce
commit b25e6a5f78
4 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fs/ubifs/dir.c
View File

@ -325,7 +325,7 @@ static int ubifs_create(struct mnt_idmap *idmap, struct inode *dir,
dir_ui->ui_size = dir->i_size; dir_ui->ui_size = dir->i_size;
inode_set_mtime_to_ts(dir, inode_set_mtime_to_ts(dir,
inode_set_ctime_to_ts(dir, inode_get_ctime(inode))); inode_set_ctime_to_ts(dir, inode_get_ctime(inode)));
err = ubifs_jnl_update(c, dir, &nm, inode, 0, 0); err = ubifs_jnl_update(c, dir, &nm, inode, 0, 0, 0);
if (err) if (err)
goto out_cancel; goto out_cancel;
mutex_unlock(&dir_ui->ui_mutex); mutex_unlock(&dir_ui->ui_mutex);
@ -479,7 +479,7 @@ static int ubifs_tmpfile(struct mnt_idmap *idmap, struct inode *dir,
mutex_unlock(&ui->ui_mutex); mutex_unlock(&ui->ui_mutex);
lock_2_inodes(dir, inode); lock_2_inodes(dir, inode);
err = ubifs_jnl_update(c, dir, &nm, inode, 1, 0); err = ubifs_jnl_update(c, dir, &nm, inode, 1, 0, 0);
if (err) if (err)
goto out_cancel; goto out_cancel;
unlock_2_inodes(dir, inode); unlock_2_inodes(dir, inode);
@ -760,10 +760,6 @@ static int ubifs_link(struct dentry *old_dentry, struct inode *dir,
lock_2_inodes(dir, inode); lock_2_inodes(dir, inode);
/* Handle O_TMPFILE corner case, it is allowed to link a O_TMPFILE. */
if (inode->i_nlink == 0)
ubifs_delete_orphan(c, inode->i_ino);
inc_nlink(inode); inc_nlink(inode);
ihold(inode); ihold(inode);
inode_set_ctime_current(inode); inode_set_ctime_current(inode);
@ -771,7 +767,7 @@ static int ubifs_link(struct dentry *old_dentry, struct inode *dir,
dir_ui->ui_size = dir->i_size; dir_ui->ui_size = dir->i_size;
inode_set_mtime_to_ts(dir, inode_set_mtime_to_ts(dir,
inode_set_ctime_to_ts(dir, inode_get_ctime(inode))); inode_set_ctime_to_ts(dir, inode_get_ctime(inode)));
err = ubifs_jnl_update(c, dir, &nm, inode, 0, 0); err = ubifs_jnl_update(c, dir, &nm, inode, 0, 0, inode->i_nlink == 1);
if (err) if (err)
goto out_cancel; goto out_cancel;
unlock_2_inodes(dir, inode); unlock_2_inodes(dir, inode);
@ -785,8 +781,6 @@ out_cancel:
dir->i_size -= sz_change; dir->i_size -= sz_change;
dir_ui->ui_size = dir->i_size; dir_ui->ui_size = dir->i_size;
drop_nlink(inode); drop_nlink(inode);
if (inode->i_nlink == 0)
ubifs_add_orphan(c, inode->i_ino);
unlock_2_inodes(dir, inode); unlock_2_inodes(dir, inode);
ubifs_release_budget(c, &req); ubifs_release_budget(c, &req);
iput(inode); iput(inode);
@ -846,7 +840,7 @@ static int ubifs_unlink(struct inode *dir, struct dentry *dentry)
dir_ui->ui_size = dir->i_size; dir_ui->ui_size = dir->i_size;
inode_set_mtime_to_ts(dir, inode_set_mtime_to_ts(dir,
inode_set_ctime_to_ts(dir, inode_get_ctime(inode))); inode_set_ctime_to_ts(dir, inode_get_ctime(inode)));
err = ubifs_jnl_update(c, dir, &nm, inode, 1, 0); err = ubifs_jnl_update(c, dir, &nm, inode, 1, 0, 0);
if (err) if (err)
goto out_cancel; goto out_cancel;
unlock_2_inodes(dir, inode); unlock_2_inodes(dir, inode);
@ -950,7 +944,7 @@ static int ubifs_rmdir(struct inode *dir, struct dentry *dentry)
dir_ui->ui_size = dir->i_size; dir_ui->ui_size = dir->i_size;
inode_set_mtime_to_ts(dir, inode_set_mtime_to_ts(dir,
inode_set_ctime_to_ts(dir, inode_get_ctime(inode))); inode_set_ctime_to_ts(dir, inode_get_ctime(inode)));
err = ubifs_jnl_update(c, dir, &nm, inode, 1, 0); err = ubifs_jnl_update(c, dir, &nm, inode, 1, 0, 0);
if (err) if (err)
goto out_cancel; goto out_cancel;
unlock_2_inodes(dir, inode); unlock_2_inodes(dir, inode);
@ -1025,7 +1019,7 @@ static int ubifs_mkdir(struct mnt_idmap *idmap, struct inode *dir,
dir_ui->ui_size = dir->i_size; dir_ui->ui_size = dir->i_size;
inode_set_mtime_to_ts(dir, inode_set_mtime_to_ts(dir,
inode_set_ctime_to_ts(dir, inode_get_ctime(inode))); inode_set_ctime_to_ts(dir, inode_get_ctime(inode)));
err = ubifs_jnl_update(c, dir, &nm, inode, 0, 0); err = ubifs_jnl_update(c, dir, &nm, inode, 0, 0, 0);
if (err) { if (err) {
ubifs_err(c, "cannot create directory, error %d", err); ubifs_err(c, "cannot create directory, error %d", err);
goto out_cancel; goto out_cancel;
@ -1119,7 +1113,7 @@ static int ubifs_mknod(struct mnt_idmap *idmap, struct inode *dir,
dir_ui->ui_size = dir->i_size; dir_ui->ui_size = dir->i_size;
inode_set_mtime_to_ts(dir, inode_set_mtime_to_ts(dir,
inode_set_ctime_to_ts(dir, inode_get_ctime(inode))); inode_set_ctime_to_ts(dir, inode_get_ctime(inode)));
err = ubifs_jnl_update(c, dir, &nm, inode, 0, 0); err = ubifs_jnl_update(c, dir, &nm, inode, 0, 0, 0);
if (err) if (err)
goto out_cancel; goto out_cancel;
mutex_unlock(&dir_ui->ui_mutex); mutex_unlock(&dir_ui->ui_mutex);
@ -1220,7 +1214,7 @@ static int ubifs_symlink(struct mnt_idmap *idmap, struct inode *dir,
dir_ui->ui_size = dir->i_size; dir_ui->ui_size = dir->i_size;
inode_set_mtime_to_ts(dir, inode_set_mtime_to_ts(dir,
inode_set_ctime_to_ts(dir, inode_get_ctime(inode))); inode_set_ctime_to_ts(dir, inode_get_ctime(inode)));
err = ubifs_jnl_update(c, dir, &nm, inode, 0, 0); err = ubifs_jnl_update(c, dir, &nm, inode, 0, 0, 0);
if (err) if (err)
goto out_cancel; goto out_cancel;
mutex_unlock(&dir_ui->ui_mutex); mutex_unlock(&dir_ui->ui_mutex);

6
fs/ubifs/journal.c
View File

@ -643,6 +643,7 @@ static void set_dent_cookie(struct ubifs_info *c, struct ubifs_dent_node *dent)
* @inode: inode to update * @inode: inode to update
* @deletion: indicates a directory entry deletion i.e unlink or rmdir * @deletion: indicates a directory entry deletion i.e unlink or rmdir
* @xent: non-zero if the directory entry is an extended attribute entry * @xent: non-zero if the directory entry is an extended attribute entry
* @delete_orphan: indicates an orphan entry deletion for @inode
* *
* This function updates an inode by writing a directory entry (or extended * This function updates an inode by writing a directory entry (or extended
* attribute entry), the inode itself, and the parent directory inode (or the * attribute entry), the inode itself, and the parent directory inode (or the
@ -664,7 +665,7 @@ static void set_dent_cookie(struct ubifs_info *c, struct ubifs_dent_node *dent)
*/ */
int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir, int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir,
const struct fscrypt_name *nm, const struct inode *inode, const struct fscrypt_name *nm, const struct inode *inode,
int deletion, int xent) int deletion, int xent, int delete_orphan)
{ {
int err, dlen, ilen, len, lnum, ino_offs, dent_offs, orphan_added = 0; int err, dlen, ilen, len, lnum, ino_offs, dent_offs, orphan_added = 0;
int aligned_dlen, aligned_ilen, sync = IS_DIRSYNC(dir); int aligned_dlen, aligned_ilen, sync = IS_DIRSYNC(dir);
@ -806,6 +807,9 @@ int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir,
if (err) if (err)
goto out_ro; goto out_ro;
if (delete_orphan)
ubifs_delete_orphan(c, inode->i_ino);
finish_reservation(c); finish_reservation(c);
spin_lock(&ui->ui_lock); spin_lock(&ui->ui_lock);
ui->synced_i_size = ui->ui_size; ui->synced_i_size = ui->ui_size;

2
fs/ubifs/ubifs.h
View File

@ -1800,7 +1800,7 @@ int ubifs_consolidate_log(struct ubifs_info *c);
/* journal.c */ /* journal.c */
int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir, int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir,
const struct fscrypt_name *nm, const struct inode *inode, const struct fscrypt_name *nm, const struct inode *inode,
int deletion, int xent); int deletion, int xent, int delete_orphan);
int ubifs_jnl_write_data(struct ubifs_info *c, const struct inode *inode, int ubifs_jnl_write_data(struct ubifs_info *c, const struct inode *inode,
const union ubifs_key *key, const void *buf, int len); const union ubifs_key *key, const void *buf, int len);
int ubifs_jnl_write_inode(struct ubifs_info *c, const struct inode *inode); int ubifs_jnl_write_inode(struct ubifs_info *c, const struct inode *inode);

2
fs/ubifs/xattr.c
View File

@ -149,7 +149,7 @@ static int create_xattr(struct ubifs_info *c, struct inode *host,
if (strcmp(fname_name(nm), UBIFS_XATTR_NAME_ENCRYPTION_CONTEXT) == 0) if (strcmp(fname_name(nm), UBIFS_XATTR_NAME_ENCRYPTION_CONTEXT) == 0)
host_ui->flags |= UBIFS_CRYPT_FL; host_ui->flags |= UBIFS_CRYPT_FL;
err = ubifs_jnl_update(c, host, nm, inode, 0, 1); err = ubifs_jnl_update(c, host, nm, inode, 0, 1, 0);
if (err) if (err)
goto out_cancel; goto out_cancel;
ubifs_set_inode_flags(host); ubifs_set_inode_flags(host);