diff --git a/[refs] b/[refs]
index 602eb8b73a43..9afc0ec4205f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d18eb45332478f319e5cf996e093228a68864cce
+refs/heads/master: b5a1eeef04cc7859f34dec9b72ea1b28e4aba07c
diff --git a/trunk/net/batman-adv/icmp_socket.c b/trunk/net/batman-adv/icmp_socket.c
index 3b04fff3ede3..d9c1e7bb7fbf 100644
--- a/trunk/net/batman-adv/icmp_socket.c
+++ b/trunk/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)