From: Sven Eckelmann Date: Sat, 10 Dec 2011 14:28:36 +0000 (+0100) Subject: batman-adv: Only write requested number of byte to user buffer X-Git-Tag: v3.2.41~8 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=f3fa0df5ebda0dc467920f9e855a7b9481b3dafd 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 Signed-off-by: Marek Lindner Signed-off-by: Ben Hutchings --- diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c index a9d85853d2bc..0c82ce3b80f5 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)