lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 1 Nov 2017 22:25:59 +0100 From: Willy Tarreau <w@....eu> To: linux-kernel@...r.kernel.org, stable@...r.kernel.org, linux@...ck-us.net Cc: Konstantin Khlebnikov <khlebnikov@...dex-team.ru>, "Theodore Ts'o" <tytso@....edu>, Willy Tarreau <w@....eu> Subject: [PATCH 3.10 058/139] ext4: keep existing extra fields when inode expands From: Konstantin Khlebnikov <khlebnikov@...dex-team.ru> commit 887a9730614727c4fff7cb756711b190593fc1df upstream. ext4_expand_extra_isize() should clear only space between old and new size. Fixes: 6dd4ee7cab7e # v2.6.23 Cc: stable@...r.kernel.org Signed-off-by: Konstantin Khlebnikov <khlebnikov@...dex-team.ru> Signed-off-by: Theodore Ts'o <tytso@....edu> Signed-off-by: Willy Tarreau <w@....eu> --- fs/ext4/inode.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 1095d77..1094017 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -5045,8 +5045,9 @@ static int ext4_expand_extra_isize(struct inode *inode, /* No extended attributes present */ if (!ext4_test_inode_state(inode, EXT4_STATE_XATTR) || header->h_magic != cpu_to_le32(EXT4_XATTR_MAGIC)) { - memset((void *)raw_inode + EXT4_GOOD_OLD_INODE_SIZE, 0, - new_extra_isize); + memset((void *)raw_inode + EXT4_GOOD_OLD_INODE_SIZE + + EXT4_I(inode)->i_extra_isize, 0, + new_extra_isize - EXT4_I(inode)->i_extra_isize); EXT4_I(inode)->i_extra_isize = new_extra_isize; return 0; } -- 2.8.0.rc2.1.gbe9624a
Powered by blists - more mailing lists