Commit 51518aa6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt 

Pull fsverity updates from Eric Biggers:
 "A couple small cleanups for fs/verity/"

* tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
  fs-verity: Use struct_size() helper in enable_verity()
  fs-verity: remove unused parameter desc_size in fsverity_create_info()
parents c1f4cfdb e6af1bb0

fs/verity/enable.c

+2 −2
Original line number Diff line number Diff line
@@ -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;
@@ -281,7 +281,7 @@ static int enable_verity(struct file *filp, 
	 * from disk.  This is simpler, and it serves as an extra check that the

	 * metadata we're writing is valid before actually enabling verity.

	 */

	vi = fsverity_create_info(inode, desc, desc_size);

	vi = fsverity_create_info(inode, desc);

	if (IS_ERR(vi)) {

		err = PTR_ERR(vi);

		goto rollback;

fs/verity/fsverity_private.h

+2 −4
Original line number Diff line number Diff line
@@ -122,16 +122,14 @@ int fsverity_init_merkle_tree_params(struct merkle_tree_params *params, 
				     const u8 *salt, size_t salt_size);



struct fsverity_info *fsverity_create_info(const struct inode *inode,

					   struct fsverity_descriptor *desc,

					   size_t desc_size);

					   struct fsverity_descriptor *desc);



void fsverity_set_info(struct inode *inode, struct fsverity_info *vi);



void fsverity_free_info(struct fsverity_info *vi);



int fsverity_get_descriptor(struct inode *inode,

			    struct fsverity_descriptor **desc_ret,

			    size_t *desc_size_ret);

			    struct fsverity_descriptor **desc_ret);



int __init fsverity_init_info_cache(void);

void __init fsverity_exit_info_cache(void);

fs/verity/open.c

+4 −8
Original line number Diff line number Diff line
@@ -147,8 +147,7 @@ static int compute_file_digest(struct fsverity_hash_alg *hash_alg, 
 * fsverity_descriptor must have already undergone basic validation.

 */

struct fsverity_info *fsverity_create_info(const struct inode *inode,

					   struct fsverity_descriptor *desc,

					   size_t desc_size)

					   struct fsverity_descriptor *desc)

{

	struct fsverity_info *vi;

	int err;
@@ -264,8 +263,7 @@ static bool validate_fsverity_descriptor(struct inode *inode, 
 * the filesystem, and do basic validation of it.

 */

int fsverity_get_descriptor(struct inode *inode,

			    struct fsverity_descriptor **desc_ret,

			    size_t *desc_size_ret)

			    struct fsverity_descriptor **desc_ret)

{

	int res;

	struct fsverity_descriptor *desc;
@@ -297,7 +295,6 @@ int fsverity_get_descriptor(struct inode *inode, 
	}



	*desc_ret = desc;

	*desc_size_ret = res;

	return 0;

}
@@ -306,17 +303,16 @@ static int ensure_verity_info(struct inode *inode) 
{

	struct fsverity_info *vi = fsverity_get_info(inode);

	struct fsverity_descriptor *desc;

	size_t desc_size;

	int err;



	if (vi)

		return 0;



	err = fsverity_get_descriptor(inode, &desc, &desc_size);

	err = fsverity_get_descriptor(inode, &desc);

	if (err)

		return err;



	vi = fsverity_create_info(inode, desc, desc_size);

	vi = fsverity_create_info(inode, desc);

	if (IS_ERR(vi)) {

		err = PTR_ERR(vi);

		goto out_free_desc;

fs/verity/read_metadata.c

+2 −3
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static int fsverity_read_descriptor(struct inode *inode, 
	size_t desc_size;

	int res;



	res = fsverity_get_descriptor(inode, &desc, &desc_size);

	res = fsverity_get_descriptor(inode, &desc);

	if (res)

		return res;
@@ -119,10 +119,9 @@ static int fsverity_read_signature(struct inode *inode, 
				   void __user *buf, u64 offset, int length)

{

	struct fsverity_descriptor *desc;

	size_t desc_size;

	int res;



	res = fsverity_get_descriptor(inode, &desc, &desc_size);

	res = fsverity_get_descriptor(inode, &desc);

	if (res)

		return res;