[linux-next] LinuxNextTracking branch, master, updated. next-20111214

batman at open-mesh.org batman at open-mesh.org
Thu Dec 15 00:16:49 CET 2011

The following commit has been merged in the master branch:
commit b5a1eeef04cc7859f34dec9b72ea1b28e4aba07c
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat Dec 10 15:28:36 2011 +0100

    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 at narfation.org>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>

diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c
index 3b04fff..d9c1e7b 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,
-	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;
 	if (error)


More information about the linux-merge mailing list