Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ubifs: setflags: Make dirtied_ino_d 8 bytes aligned

Make 'ui->data_len' aligned with 8 bytes before it is assigned to
dirtied_ino_d. Since 8871d84c8f8b0c6b("ubifs: convert to fileattr")
applied, 'setflags()' only affects regular files and directories, only
xattr inode, symlink inode and special inode(pipe/char_dev/block_dev)
have none- zero 'ui->data_len' field, so assertion
'!(req->dirtied_ino_d & 7)' cannot fail in ubifs_budget_space().
To avoid assertion fails in future evolution(eg. setflags can operate
special inodes), it's better to make dirtied_ino_d 8 bytes aligned,
after all aligned size is still zero for regular files.

Fixes: 1e51764a3c2ac05a ("UBIFS: add new flash file system")
Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: Richard Weinberger <richard@nod.at>

authored by

Zhihao Cheng and committed by
Richard Weinberger
1b83ec05 a6dab660

+1 -1
+1 -1
fs/ubifs/ioctl.c
··· 108 108 struct ubifs_inode *ui = ubifs_inode(inode); 109 109 struct ubifs_info *c = inode->i_sb->s_fs_info; 110 110 struct ubifs_budget_req req = { .dirtied_ino = 1, 111 - .dirtied_ino_d = ui->data_len }; 111 + .dirtied_ino_d = ALIGN(ui->data_len, 8) }; 112 112 113 113 err = ubifs_budget_space(c, &req); 114 114 if (err)