projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
69497c1
)
batman-adv: bat_socket_read missing checks
author
Paul Kot
<
[email protected]
>
Sat, 10 Dec 2011 14:28:34 +0000
(15:28 +0100)
committer
Marek Lindner
<
[email protected]
>
Mon, 12 Dec 2011 11:11:06 +0000
(19:11 +0800)
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 <
[email protected]
>
[
[email protected]
: made it checkpatch clean]
Signed-off-by: Sven Eckelmann <
[email protected]
>
Signed-off-by: Marek Lindner <
[email protected]
>
net/batman-adv/icmp_socket.c
patch
|
blob
|
history
diff --git
a/net/batman-adv/icmp_socket.c
b/net/batman-adv/icmp_socket.c
index defd6929ceae51a621b8d04288c053611a377b87..88ab26f5f7269a347421957cec4552f22396ac73 100644
(file)
--- 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);