Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fs-verity: remove unused parameter desc_size in fsverity_create_info()

The parameter desc_size in fsverity_create_info() is useless and it is
not referenced anywhere. The greatest meaning of desc_size here is to
indecate the size of struct fsverity_descriptor and futher calculate the
size of signature. However, the desc->sig_size can do it also and it is
indeed, so remove it.

Therefore, it is no need to acquire desc_size by fsverity_get_descriptor()
in ensure_verity_info(), so remove the parameter desc_ret in
fsverity_get_descriptor() too.

Signed-off-by: Zhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20220518132256.2297655-1-chris.zjh@huawei.com

authored by

Zhang Jianhua and committed by
Eric Biggers
b0487ede 42226c98

+9 -16
+1 -1
fs/verity/enable.c
··· 281 281 * from disk. This is simpler, and it serves as an extra check that the 282 282 * metadata we're writing is valid before actually enabling verity. 283 283 */ 284 - vi = fsverity_create_info(inode, desc, desc_size); 284 + vi = fsverity_create_info(inode, desc); 285 285 if (IS_ERR(vi)) { 286 286 err = PTR_ERR(vi); 287 287 goto rollback;
+2 -4
fs/verity/fsverity_private.h
··· 122 122 const u8 *salt, size_t salt_size); 123 123 124 124 struct fsverity_info *fsverity_create_info(const struct inode *inode, 125 - struct fsverity_descriptor *desc, 126 - size_t desc_size); 125 + struct fsverity_descriptor *desc); 127 126 128 127 void fsverity_set_info(struct inode *inode, struct fsverity_info *vi); 129 128 130 129 void fsverity_free_info(struct fsverity_info *vi); 131 130 132 131 int fsverity_get_descriptor(struct inode *inode, 133 - struct fsverity_descriptor **desc_ret, 134 - size_t *desc_size_ret); 132 + struct fsverity_descriptor **desc_ret); 135 133 136 134 int __init fsverity_init_info_cache(void); 137 135 void __init fsverity_exit_info_cache(void);
+4 -8
fs/verity/open.c
··· 147 147 * fsverity_descriptor must have already undergone basic validation. 148 148 */ 149 149 struct fsverity_info *fsverity_create_info(const struct inode *inode, 150 - struct fsverity_descriptor *desc, 151 - size_t desc_size) 150 + struct fsverity_descriptor *desc) 152 151 { 153 152 struct fsverity_info *vi; 154 153 int err; ··· 263 264 * the filesystem, and do basic validation of it. 264 265 */ 265 266 int fsverity_get_descriptor(struct inode *inode, 266 - struct fsverity_descriptor **desc_ret, 267 - size_t *desc_size_ret) 267 + struct fsverity_descriptor **desc_ret) 268 268 { 269 269 int res; 270 270 struct fsverity_descriptor *desc; ··· 295 297 } 296 298 297 299 *desc_ret = desc; 298 - *desc_size_ret = res; 299 300 return 0; 300 301 } 301 302 ··· 303 306 { 304 307 struct fsverity_info *vi = fsverity_get_info(inode); 305 308 struct fsverity_descriptor *desc; 306 - size_t desc_size; 307 309 int err; 308 310 309 311 if (vi) 310 312 return 0; 311 313 312 - err = fsverity_get_descriptor(inode, &desc, &desc_size); 314 + err = fsverity_get_descriptor(inode, &desc); 313 315 if (err) 314 316 return err; 315 317 316 - vi = fsverity_create_info(inode, desc, desc_size); 318 + vi = fsverity_create_info(inode, desc); 317 319 if (IS_ERR(vi)) { 318 320 err = PTR_ERR(vi); 319 321 goto out_free_desc;
+2 -3
fs/verity/read_metadata.c
··· 101 101 size_t desc_size; 102 102 int res; 103 103 104 - res = fsverity_get_descriptor(inode, &desc, &desc_size); 104 + res = fsverity_get_descriptor(inode, &desc); 105 105 if (res) 106 106 return res; 107 107 ··· 119 119 void __user *buf, u64 offset, int length) 120 120 { 121 121 struct fsverity_descriptor *desc; 122 - size_t desc_size; 123 122 int res; 124 123 125 - res = fsverity_get_descriptor(inode, &desc, &desc_size); 124 + res = fsverity_get_descriptor(inode, &desc); 126 125 if (res) 127 126 return res; 128 127