From 172357d6e15da4f164201b6323cac136676be62e Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Sat, 10 Dec 2011 15:28:35 +0100 Subject: [PATCH] --- yaml --- r: 278757 b: refs/heads/master c: d18eb45332478f319e5cf996e093228a68864cce h: refs/heads/master i: 278755: 11c6eae7a4e664c690e0310122e683b1c9f08d3c v: v3 --- [refs] | 2 +- trunk/net/batman-adv/icmp_socket.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 20fdf31d37c2..602eb8b73a43 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c00b6856fc642b234895cfabd15b289e76726430 +refs/heads/master: d18eb45332478f319e5cf996e093228a68864cce diff --git a/trunk/net/batman-adv/icmp_socket.c b/trunk/net/batman-adv/icmp_socket.c index 88ab26f5f726..3b04fff3ede3 100644 --- a/trunk/net/batman-adv/icmp_socket.c +++ b/trunk/net/batman-adv/icmp_socket.c @@ -187,12 +187,7 @@ static ssize_t bat_socket_write(struct file *file, const char __user *buff, skb_reserve(skb, sizeof(struct ethhdr)); icmp_packet = (struct icmp_packet_rr *)skb_put(skb, packet_len); - if (!access_ok(VERIFY_READ, buff, packet_len)) { - len = -EFAULT; - goto free_skb; - } - - if (__copy_from_user(icmp_packet, buff, packet_len)) { + if (copy_from_user(icmp_packet, buff, packet_len)) { len = -EFAULT; goto free_skb; }