]> git.proxmox.com Git - mirror_ubuntu-focal-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)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 20 May 2022 13:19:32 +0000 (15:19 +0200)
commitfbece90b045ba621de77b50a275d1f51f7ac62bf
treef478d5089d3b8e60451ca349e829c9cc443024d3
parentea191831df27988f036eda7080c89c59f90e4684
ubifs: setflags: Make dirtied_ino_d 8 bytes aligned

BugLink: https://bugs.launchpad.net/bugs/1971497
commit 1b83ec057db16b4d0697dc21ef7a9743b6041f72 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
fs/ubifs/ioctl.c