.. | .. |
---|
177 | 177 | * (level 0) and ascending to the root node (level 'num_levels - 1'). |
---|
178 | 178 | * Then at the end (level 'num_levels'), calculate the root hash. |
---|
179 | 179 | */ |
---|
180 | | - blocks = (inode->i_size + params->block_size - 1) >> |
---|
| 180 | + blocks = ((u64)inode->i_size + params->block_size - 1) >> |
---|
181 | 181 | params->log_blocksize; |
---|
182 | 182 | for (level = 0; level <= params->num_levels; level++) { |
---|
183 | 183 | err = build_merkle_tree_level(filp, level, blocks, params, |
---|
.. | .. |
---|
356 | 356 | if (arg.block_size != PAGE_SIZE) |
---|
357 | 357 | return -EINVAL; |
---|
358 | 358 | |
---|
359 | | - if (arg.salt_size > FIELD_SIZEOF(struct fsverity_descriptor, salt)) |
---|
| 359 | + if (arg.salt_size > sizeof_field(struct fsverity_descriptor, salt)) |
---|
360 | 360 | return -EMSGSIZE; |
---|
361 | 361 | |
---|
362 | 362 | if (arg.sig_size > FS_VERITY_MAX_SIGNATURE_SIZE) |
---|