f2fs: explicitly null-terminate the xattr list

[platform/kernel/linux-rpi.git] / fs / f2fs / xattr.c

diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c
index 465d145..e197657 100644 (file)
--- 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);