diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-27 11:44:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-27 11:44:18 -0700 |
| commit | 200204f56f3b5a464c719ddb930a1a2557562dda (patch) | |
| tree | c2ef577fb7637f391c1464121938867fa34626bb /include | |
| parent | Merge tag 'perf-tools-fixes-for-v6.1-2022-10-26' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux (diff) | |
| parent | fscrypt: fix keyring memory leak on mount failure (diff) | |
| download | linux-dev-200204f56f3b5a464c719ddb930a1a2557562dda.tar.xz linux-dev-200204f56f3b5a464c719ddb930a1a2557562dda.zip | |
Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt
Pull fscrypt fix from Eric Biggers:
"Fix a memory leak that was introduced by a change that went into -rc1"
* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
fscrypt: fix keyring memory leak on mount failure
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fscrypt.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h index cad78b569c7e..4f5f8a651213 100644 --- a/include/linux/fscrypt.h +++ b/include/linux/fscrypt.h @@ -307,7 +307,7 @@ fscrypt_free_dummy_policy(struct fscrypt_dummy_policy *dummy_policy) } /* keyring.c */ -void fscrypt_sb_delete(struct super_block *sb); +void fscrypt_destroy_keyring(struct super_block *sb); int fscrypt_ioctl_add_key(struct file *filp, void __user *arg); int fscrypt_add_test_dummy_key(struct super_block *sb, const struct fscrypt_dummy_policy *dummy_policy); @@ -521,7 +521,7 @@ fscrypt_free_dummy_policy(struct fscrypt_dummy_policy *dummy_policy) } /* keyring.c */ -static inline void fscrypt_sb_delete(struct super_block *sb) +static inline void fscrypt_destroy_keyring(struct super_block *sb) { } |