diff options
| author | Sven Eckelmann <sven@narfation.org> | 2011-12-10 15:28:36 +0100 |
|---|---|---|
| committer | Marek Lindner <lindner_marek@yahoo.de> | 2011-12-12 19:11:07 +0800 |
| commit | b5a1eeef04cc7859f34dec9b72ea1b28e4aba07c (patch) | |
| tree | 4503055d16bbf2b05eac3adc6d04402bab8eba36 /net/batman-adv/icmp_socket.c | |
| parent | d18eb45332478f319e5cf996e093228a68864cce (diff) | |
| download | blackbird-op-linux-b5a1eeef04cc7859f34dec9b72ea1b28e4aba07c.tar.gz blackbird-op-linux-b5a1eeef04cc7859f34dec9b72ea1b28e4aba07c.zip | |
batman-adv: Only write requested number of byte to user buffer
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>
Diffstat (limited to 'net/batman-adv/icmp_socket.c')
| -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 3b04fff3ede3..d9c1e7bb7fbf 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) |
