summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2023-11-06 20:44:34 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-01-20 11:53:00 +0100
commitf6c30bfe5a49bc38cae985083a11016800708fea (patch)
treeb6443a1ccef54bea861e16d76c0e139c901029c9
parent0dd3ee31125508cd67f7e7172247f05b7fd1753a (diff)
downloadlinux-stable-f6c30bfe5a49bc38cae985083a11016800708fea.tar.gz
linux-stable-f6c30bfe5a49bc38cae985083a11016800708fea.tar.bz2
linux-stable-f6c30bfe5a49bc38cae985083a11016800708fea.zip
f2fs: explicitly null-terminate the xattr list
commit e26b6d39270f5eab0087453d9b544189a38c8564 upstream. When setting an xattr, explicitly null-terminate the xattr list. This eliminates the fragile assumption that the unused xattr space is always zeroed. Signed-off-by: Eric Biggers <ebiggers@google.com> Reviewed-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/f2fs/xattr.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c
index 47e88b4d4e7d..a8fc2cac6879 100644
--- a/fs/f2fs/xattr.c
+++ b/fs/f2fs/xattr.c
@@ -754,6 +754,12 @@ retry:
memcpy(pval, value, size);
last->e_value_size = cpu_to_le16(size);
new_hsize += newsize;
+ /*
+ * Explicitly add the null terminator. The unused xattr space
+ * is supposed to always be zeroed, which would make this
+ * unnecessary, but don't depend on that.
+ */
+ *(u32 *)((u8 *)last + newsize) = 0;
}
error = write_all_xattrs(inode, new_hsize, base_addr, ipage);