diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2020-03-17 09:29:11 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2020-03-17 09:29:11 +0100 |
| commit | 51b8479ab20ba3804348824c63abdb3f35b0aaeb (patch) | |
| tree | f3ecae09fc31773c9da185de167bf2034f1aaa2e /fs/ecryptfs/keystore.c | |
| parent | 6afe6929964bca6847986d0507a555a041f07753 (diff) | |
| parent | 69ddce0970d9d1de63bed9c24eefa0814db29a5a (diff) | |
| download | linux-51b8479ab20ba3804348824c63abdb3f35b0aaeb.tar.gz | |
Merge drm/drm-next into drm-misc-next
Jernej needs some patches that got merged in -rc5. Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'fs/ecryptfs/keystore.c')
| -rw-r--r-- | fs/ecryptfs/keystore.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c index 7d326aa0308e..af3eb02bbca1 100644 --- a/fs/ecryptfs/keystore.c +++ b/fs/ecryptfs/keystore.c @@ -1304,7 +1304,7 @@ parse_tag_1_packet(struct ecryptfs_crypt_stat *crypt_stat, printk(KERN_WARNING "Tag 1 packet contains key larger " "than ECRYPTFS_MAX_ENCRYPTED_KEY_BYTES\n"); rc = -EINVAL; - goto out; + goto out_free; } memcpy((*new_auth_tok)->session_key.encrypted_key, &data[(*packet_size)], (body_size - (ECRYPTFS_SIG_SIZE + 2))); |