The following commit has been merged in the next branch: commit 201371597326fcd8118be4000954ff9ba8fd0ccd Author: Paul Kot pawlkt@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@gmail.com [sven@narfation.org: made it checkpatch clean] Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/icmp_socket.c b/icmp_socket.c index defd692..88ab26f 100644 --- a/icmp_socket.c +++ b/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);