diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h
--- a/fs/ecryptfs/ecryptfs_kernel.h
+++ b/fs/ecryptfs/ecryptfs_kernel.h
@@ -xx,6 +xx,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;
 }