diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-18 09:51:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-18 09:51:10 -0700 |
| commit | a96fd1cc3ff3f9dd6f06140fc0b8c91342859450 (patch) | |
| tree | 8335ca5f1af3df76702eadbf358fc918a1c09904 /fs/ubifs/auth.c | |
| parent | 9d9af1007bc08971953ae915d88dc9bb21344b53 (diff) | |
| parent | e2a05cc7f8229e150243cdae40f2af9021d67a4a (diff) | |
| download | lwn-a96fd1cc3ff3f9dd6f06140fc0b8c91342859450.tar.gz lwn-a96fd1cc3ff3f9dd6f06140fc0b8c91342859450.zip | |
Merge tag 'for-linus-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs
Pull ubifs updates from Richard Weinberger:
- Kernel-doc fixes
- Fixes for memory leaks in authentication option parsing
* tag 'for-linus-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
ubifs: mount_ubifs: Release authentication resource in error handling path
ubifs: Don't parse authentication mount options in remount process
ubifs: Fix a memleak after dumping authentication mount options
ubifs: Fix some kernel-doc warnings in tnc.c
ubifs: Fix some kernel-doc warnings in replay.c
ubifs: Fix some kernel-doc warnings in gc.c
ubifs: Fix 'hash' kernel-doc warning in auth.c
Diffstat (limited to 'fs/ubifs/auth.c')
| -rw-r--r-- | fs/ubifs/auth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/auth.c b/fs/ubifs/auth.c index cc5c0abfd536..b93b3cd10bfd 100644 --- a/fs/ubifs/auth.c +++ b/fs/ubifs/auth.c @@ -54,7 +54,7 @@ static int ubifs_hash_calc_hmac(const struct ubifs_info *c, const u8 *hash, * ubifs_prepare_auth_node - Prepare an authentication node * @c: UBIFS file-system description object * @node: the node to calculate a hash for - * @hash: input hash of previous nodes + * @inhash: input hash of previous nodes * * This function prepares an authentication node for writing onto flash. * It creates a HMAC from the given input hash and writes it to the node. |