summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2026-10-14 12:44:59 +0100
committerMark Brown <broonie@kernel.org>2026-10-14 12:44:59 +0100
commitad9dfb4fa70e64d7f811ebde277488ba7c9eddeb (patch)
tree164716011fc8f51fc6b3e4178193337c9cead6f5
parent48d3d90357bc3f32f4e94b1e26d61f6511bc675d (diff)
parent5b00bf0f3b7ad05eff79b84e3bacf3f98ac67dc6 (diff)
downloadlinux-next-ad9dfb4fa70e64d7f811ebde277488ba7c9eddeb.tar.gz
linux-next-ad9dfb4fa70e64d7f811ebde277488ba7c9eddeb.zip
Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git
-rw-r--r--fs/ecryptfs/ecryptfs_kernel.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h
index 58165928ed1e..3baccd4143e8 100644
--- a/fs/ecryptfs/ecryptfs_kernel.h
+++ b/fs/ecryptfs/ecryptfs_kernel.h
@@ -124,6 +124,9 @@ ecryptfs_get_key_payload_data(struct key *key)
if (!ukp)
return ERR_PTR(-EKEYREVOKED);
+ if (ukp->datalen < sizeof(struct ecryptfs_auth_tok))
+ return ERR_PTR(-EINVAL);
+
return (struct ecryptfs_auth_tok *)ukp->data;
}