| Message ID | 1305530791.3120.217.camel@edumazet-laptop |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, May 16, 2011 at 09:26 +0200, Eric Dumazet wrote: > Le dimanche 15 mai 2011 à 17:44 -0400, David Miller a écrit : > > > Just get rid of ping_ioctl() entirely, as that is the effect of > > this change since inet_ioctl() returns -ENOIOCTLCMD when > > sk_prot->ioctl is NULL. > > > > Also get rid of asm/ioctls.h since that will be no longer needed. > > Sure, here is updated version, thanks. > > [PATCH net-next-2.6 v2] net: ping: dont call udp_ioctl() > > udp_ioctl() really handles UDP and UDPLite protocols. > > 1) It can increment UDP_MIB_INERRORS in case first_packet_length() finds > a frame with bad checksum. > > 2) It has a dependency on sizeof(struct udphdr), not applicable to > ICMP/PING > > If ping sockets need to handle SIOCINQ/SIOCOUTQ ioctl, this should be > done differently. > > Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Acked-by: Vasiliy Kulikov <segoon@openwall.com> Thanks,
From: Eric Dumazet <eric.dumazet@gmail.com> Date: Mon, 16 May 2011 09:26:31 +0200 > Le dimanche 15 mai 2011 à 17:44 -0400, David Miller a écrit : > >> Just get rid of ping_ioctl() entirely, as that is the effect of >> this change since inet_ioctl() returns -ENOIOCTLCMD when >> sk_prot->ioctl is NULL. >> >> Also get rid of asm/ioctls.h since that will be no longer needed. > > Sure, here is updated version, thanks. > > [PATCH net-next-2.6 v2] net: ping: dont call udp_ioctl() > > udp_ioctl() really handles UDP and UDPLite protocols. > > 1) It can increment UDP_MIB_INERRORS in case first_packet_length() finds > a frame with bad checksum. > > 2) It has a dependency on sizeof(struct udphdr), not applicable to > ICMP/PING > > If ping sockets need to handle SIOCINQ/SIOCOUTQ ioctl, this should be > done differently. > > Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> > CC: Vasiliy Kulikov <segoon@openwall.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 7041d09..41836ab 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -22,7 +22,6 @@ #include <asm/system.h> #include <linux/uaccess.h> -#include <asm/ioctls.h> #include <linux/types.h> #include <linux/fcntl.h> #include <linux/socket.h> @@ -609,23 +608,6 @@ do_confirm: goto out; } -/* - * IOCTL requests applicable to the UDP^H^H^HICMP protocol - */ - -int ping_ioctl(struct sock *sk, int cmd, unsigned long arg) -{ - pr_debug("ping_ioctl(sk=%p,sk->num=%u,cmd=%d,arg=%lu)\n", - inet_sk(sk), inet_sk(sk)->inet_num, cmd, arg); - switch (cmd) { - case SIOCOUTQ: - case SIOCINQ: - return udp_ioctl(sk, cmd, arg); - default: - return -ENOIOCTLCMD; - } -} - int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, size_t len, int noblock, int flags, int *addr_len) { @@ -735,7 +717,6 @@ struct proto ping_prot = { .close = ping_close, .connect = ip4_datagram_connect, .disconnect = udp_disconnect, - .ioctl = ping_ioctl, .setsockopt = ip_setsockopt, .getsockopt = ip_getsockopt, .sendmsg = ping_sendmsg,