From: Zhang Jianhua Date: Thu, 19 May 2022 02:24:50 +0000 (+0800) Subject: fs-verity: Use struct_size() helper in enable_verity() X-Git-Tag: v5.19-rc1~200^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6af1bb07704b53bad7771db1b05ee17abad11cb;p=thirdparty%2Flinux.git fs-verity: Use struct_size() helper in enable_verity() Follow the best practice for allocating a variable-sized structure. Signed-off-by: Zhang Jianhua [ebiggers: adjusted commit message] Signed-off-by: Eric Biggers Link: https://lore.kernel.org/r/20220519022450.2434483-1-chris.zjh@huawei.com --- diff --git a/fs/verity/enable.c b/fs/verity/enable.c index 0f953bae17476..d52872c808fff 100644 --- a/fs/verity/enable.c +++ b/fs/verity/enable.c @@ -202,7 +202,7 @@ static int enable_verity(struct file *filp, const struct fsverity_operations *vops = inode->i_sb->s_vop; struct merkle_tree_params params = { }; struct fsverity_descriptor *desc; - size_t desc_size = sizeof(*desc) + arg->sig_size; + size_t desc_size = struct_size(desc, signature, arg->sig_size); struct fsverity_info *vi; int err;