]> git.baikalelectronics.ru Git - kernel.git/commit
ubifs: setflags: Make dirtied_ino_d 8 bytes aligned
authorZhihao Cheng <chengzhihao1@huawei.com>
Mon, 27 Dec 2021 03:22:39 +0000 (11:22 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 Apr 2022 12:24:08 +0000 (14:24 +0200)
commitb58cd3a3bdb1a68b0aa92a07bbf511722b732700
tree4dc0e928ad6bc7e8b9714c46baed5aff253d2ed4
parent3a5579273a985d79184ec11856824087b550dfce
ubifs: setflags: Make dirtied_ino_d 8 bytes aligned

commit ad2b4a7ea0c5a27379162b946cba11b50f5994d5 upstream.

Make 'ui->data_len' aligned with 8 bytes before it is assigned to
dirtied_ino_d. Since b3237213fb398b62("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: 974763da840dbf0d ("UBIFS: add new flash file system")
Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/ubifs/ioctl.c