[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 c00b6856fc642b234895cfabd15b289e76726430
Author: Paul Kot <pawlkt at gmail.com>
Date:   Sat Dec 10 15:28:34 2011 +0100

    batman-adv: bat_socket_read missing checks
    
    Writing a icmp_packet_rr and then reading icmp_packet can lead to kernel
    memory corruption, if __user *buf is just below TASK_SIZE.
    
    Signed-off-by: Paul Kot <pawlkt at gmail.com>
    [sven at narfation.org: made it checkpatch clean]
    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 defd692..88ab26f 100644
--- a/net/batman-adv/icmp_socket.c
+++ b/net/batman-adv/icmp_socket.c
@@ -136,8 +136,8 @@ 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);
+	error = copy_to_user(buf, &socket_packet->icmp_packet,
+			     socket_packet->icmp_len);
 
 	packet_len = socket_packet->icmp_len;
 	kfree(socket_packet);

-- 
LinuxNextTracking


More information about the linux-merge mailing list