Commit 4d67829e 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:
 "Fix kerneldoc warnings and some coding style inconsistencies.

  This mirrors the similar cleanups being done in fs/crypto/"

* tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
  fs-verity: remove unnecessary extern keywords
  fs-verity: fix all kerneldoc warnings
parents afdb0f2e 9cd6b593

fs/verity/enable.c

+2 −0
Original line number Diff line number Diff line
@@ -329,6 +329,8 @@ rollback: 


/**

 * fsverity_ioctl_enable() - enable verity on a file

 * @filp: file to enable verity on

 * @uarg: user pointer to fsverity_enable_arg

 *

 * Enable fs-verity on a file.  See the "FS_IOC_ENABLE_VERITY" section of

 * Documentation/filesystems/fsverity.rst for the documentation.

fs/verity/fsverity_private.h

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ struct merkle_tree_params { 
	u64 level_start[FS_VERITY_MAX_LEVELS];

};



/**

/*

 * fsverity_info - cached verity metadata for an inode

 *

 * When a verity file is first opened, an instance of this struct is allocated
@@ -134,7 +134,7 @@ void __init fsverity_check_hash_algs(void); 


/* init.c */



extern void __printf(3, 4) __cold

void __printf(3, 4) __cold

fsverity_msg(const struct inode *inode, const char *level,

	     const char *fmt, ...);

fs/verity/measure.c

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 


/**

 * fsverity_ioctl_measure() - get a verity file's measurement

 * @filp: file to get measurement of

 * @_uarg: user pointer to fsverity_digest

 *

 * Retrieve the file measurement that the kernel is enforcing for reads from a

 * verity file.  See the "FS_IOC_MEASURE_VERITY" section of

fs/verity/open.c

+1 −0
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ EXPORT_SYMBOL_GPL(fsverity_prepare_setattr); 


/**

 * fsverity_cleanup_inode() - free the inode's verity info, if present

 * @inode: an inode being evicted

 *

 * Filesystems must call this on inode eviction to free ->i_verity_info.

 */

fs/verity/signature.c

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ static struct key *fsverity_keyring; 


/**

 * fsverity_verify_signature() - check a verity file's signature

 * @vi: the file's fsverity_info

 * @desc: the file's fsverity_descriptor

 * @desc_size: size of @desc

 *

 * If the file's fs-verity descriptor includes a signature of the file

 * measurement, verify it against the certificates in the fs-verity keyring.

CRA Git | Maintained and supported by SUSTech CRA and CCSE