diff options
| author | Mark Brown <broonie@kernel.org> | 2026-08-21 13:56:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-08-21 13:56:44 +0100 |
| commit | ac8420416e13c022d9495dfe9aa8388fb1c3ca39 (patch) | |
| tree | f2bda564c7b2e8402667d050edfe9fba550e7167 /fs/ecryptfs/miscdev.c | |
| parent | 5a91bf467b12a0973d8a6634e8c9b7a4918828c5 (diff) | |
| parent | f3d3bb6e63ceddb85bf640fab8c2fa621b706ab1 (diff) | |
| download | linux-next-ac8420416e13c022d9495dfe9aa8388fb1c3ca39.tar.gz linux-next-ac8420416e13c022d9495dfe9aa8388fb1c3ca39.zip | |
Merge branch 'fs-next' of linux-next
Diffstat (limited to 'fs/ecryptfs/miscdev.c')
| -rw-r--r-- | fs/ecryptfs/miscdev.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c index 5a7d08149922..68804399a5df 100644 --- a/fs/ecryptfs/miscdev.c +++ b/fs/ecryptfs/miscdev.c @@ -360,7 +360,7 @@ ecryptfs_miscdev_write(struct file *file, const char __user *buf, u32 seq; size_t packet_size, packet_size_length; char *data; - unsigned char packet_size_peek[ECRYPTFS_MAX_PKT_LEN_SIZE]; + unsigned char packet_size_peek[ECRYPTFS_MAX_PKT_LEN_SIZE] = { }; ssize_t rc; if (count == 0) { @@ -376,7 +376,8 @@ ecryptfs_miscdev_write(struct file *file, const char __user *buf, } if (copy_from_user(packet_size_peek, &buf[PKT_LEN_OFFSET], - sizeof(packet_size_peek))) { + min_t(size_t, count - PKT_LEN_OFFSET, + sizeof(packet_size_peek)))) { printk(KERN_WARNING "%s: Error while inspecting packet size\n", __func__); return -EFAULT; |