diff options
| author | Sven Eckelmann <sven@narfation.org> | 2011-12-10 15:28:36 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-03-20 15:03:39 +0000 |
| commit | f3fa0df5ebda0dc467920f9e855a7b9481b3dafd (patch) | |
| tree | cf7197e13ea2c751709fb4e64e4f93ab5f1f6a2c /net/batman-adv | |
| parent | 83257435faca1827b17e7e6e1766f9c0c216595d (diff) | |
| download | kernel_samsung_smdk4412-f3fa0df5ebda0dc467920f9e855a7b9481b3dafd.zip kernel_samsung_smdk4412-f3fa0df5ebda0dc467920f9e855a7b9481b3dafd.tar.gz kernel_samsung_smdk4412-f3fa0df5ebda0dc467920f9e855a7b9481b3dafd.tar.bz2 | |
batman-adv: Only write requested number of byte to user buffer
commit b5a1eeef04cc7859f34dec9b72ea1b28e4aba07c upstream.
Don't write more than the requested number of bytes of an batman-adv icmp
packet to the userspace buffer. Otherwise unrelated userspace memory might get
overridden by the kernel.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/batman-adv')
| -rw-r--r-- | net/batman-adv/icmp_socket.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c index a9d8585..0c82ce3 100644 --- a/net/batman-adv/icmp_socket.c +++ b/net/batman-adv/icmp_socket.c @@ -136,10 +136,9 @@ static ssize_t bat_socket_read(struct file *file, char __user *buf, spin_unlock_bh(&socket_client->lock); - error = copy_to_user(buf, &socket_packet->icmp_packet, - socket_packet->icmp_len); + packet_len = min(count, socket_packet->icmp_len); + error = copy_to_user(buf, &socket_packet->icmp_packet, packet_len); - packet_len = socket_packet->icmp_len; kfree(socket_packet); if (error) |