-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAllBIXAACgkQONu9yGCS aT6T+w//VjXDZ+MddWJ4UeQDyIANYeFpa4tJNoqR3JsnT6yg1HODRZDR7aP5QJmN GIoRWU/2Q2nmYbAO0c8RPxs07w2xtIZzTUn+H+i6sG7bRs5RbLM5AMg4W/A/X88L V5c34kCvCf1HRfrdd4rXIZiibFnSZGqUv6o1YyQqCIvx15pyB6elMM714zt8uubk iL4/WJ2M4SrmamHWA349ldEtPjQKpwpwdBcCn+M4awbimdc0pm8oZqNkAfwJ+vLO HsuClO57I699ESU2Zt5bfEdVsW/gc7WiJOAr1Mrl2suToryrWfs2YT+sC/IQhkfC gUsi9Cm/6YMu+tiP4o6aqYvTFoFplFErpEbC3mqAEvHGGHKhrgEDotYJ+FnvI3q7 Jaxix0B/Q/NIqsJPnqe5ONOCKFmW7rGR2e2j5+45GuiofioNVNF12HWfQkoItPOL YeR2JB8K9aywzYM4gaJuy8ScJ1shN8TY1FKgZa5gBT2ym4pDDcQmxz7Jr7agREHe F2sJ23zMU+o9guGA4Is2yqWCQ5yM+3kpPPISz+Pcgh8Q95o+ftCSyOeB2F5roW8I EO22AlJPlQH0LWDQhOJ5ZuAVe+qB8EdrQqqdLbP4/oHp7MtlR5ge+idRuZc+AUsa UoASccPsEwHyBErQmHoWNI4nPRciFrKliOqERmPLcuzewUwSatw= =wXRR -----END PGP SIGNATURE----- Merge 4.4.72 into android-4.4 Changes in 4.4.72 bnx2x: Fix Multi-Cos ipv6: xfrm: Handle errors reported by xfrm6_find_1stfragopt() cxgb4: avoid enabling napi twice to the same queue tcp: disallow cwnd undo when switching congestion control vxlan: fix use-after-free on deletion ipv6: Fix leak in ipv6_gso_segment(). net: ping: do not abuse udp_poll() net: ethoc: enable NAPI before poll may be scheduled net: bridge: start hello timer only if device is up sparc64: mm: fix copy_tsb to correctly copy huge page TSBs sparc: Machine description indices can vary sparc64: reset mm cpumask after wrap sparc64: combine activate_mm and switch_mm sparc64: redefine first version sparc64: add per-cpu mm of secondary contexts sparc64: new context wrap sparc64: delete old wrap code arch/sparc: support NR_CPUS = 4096 serial: ifx6x60: fix use-after-free on module unload ptrace: Properly initialize ptracer_cred on fork KEYS: fix dereferencing NULL payload with nonzero length KEYS: fix freeing uninitialized memory in key_update() crypto: gcm - wait for crypto op not signal safe drm/amdgpu/ci: disable mclk switching for high refresh rates (v2) nfsd4: fix null dereference on replay nfsd: Fix up the "supattr_exclcreat" attributes kvm: async_pf: fix rcu_irq_enter() with irqs enabled KVM: cpuid: Fix read/write out-of-bounds vulnerability in cpuid emulation arm: KVM: Allow unaligned accesses at HYP KVM: async_pf: avoid async pf injection when in guest mode dmaengine: usb-dmac: Fix DMAOR AE bit definition dmaengine: ep93xx: Always start from BASE0 xen/privcmd: Support correctly 64KB page granularity when mapping memory xen-netfront: do not cast grant table reference to signed short xen-netfront: cast grant table reference first to type int ext4: fix SEEK_HOLE ext4: keep existing extra fields when inode expands ext4: fix fdatasync(2) after extent manipulation operations usb: gadget: f_mass_storage: Serialize wake and sleep execution usb: chipidea: udc: fix NULL pointer dereference if udc_start failed usb: chipidea: debug: check before accessing ci_role staging/lustre/lov: remove set_fs() call from lov_getstripe() iio: light: ltr501 Fix interchanged als/ps register field iio: proximity: as3935: fix AS3935_INT mask drivers: char: random: add get_random_long() random: properly align get_random_int_hash stackprotector: Increase the per-task stack canary's random range from 32 bits to 64 bits on 64-bit platforms cpufreq: cpufreq_register_driver() should return -ENODEV if init fails target: Re-add check to reject control WRITEs with overflow data drm/msm: Expose our reservation object when exporting a dmabuf. Input: elantech - add Fujitsu Lifebook E546/E557 to force crc_enabled cpuset: consider dying css as offline fs: add i_blocksize() ufs: restore proper tail allocation fix ufs_isblockset() ufs: restore maintaining ->i_blocks ufs: set correct ->s_maxsize ufs_extend_tail(): fix the braino in calling conventions of ufs_new_fragments() ufs_getfrag_block(): we only grab ->truncate_mutex on block creation path cxl: Fix error path on bad ioctl btrfs: use correct types for page indices in btrfs_page_exists_in_range btrfs: fix memory leak in update_space_info failure path KVM: arm/arm64: Handle possible NULL stage2 pud when ageing pages scsi: qla2xxx: don't disable a not previously enabled PCI device powerpc/eeh: Avoid use after free in eeh_handle_special_event() powerpc/numa: Fix percpu allocations to be NUMA aware powerpc/hotplug-mem: Fix missing endian conversion of aa_index perf/core: Drop kernel samples even though :u is specified drm/vmwgfx: Handle vmalloc() failure in vmw_local_fifo_reserve() drm/vmwgfx: limit the number of mip levels in vmw_gb_surface_define_ioctl() drm/vmwgfx: Make sure backup_handle is always valid drm/nouveau/tmr: fully separate alarm execution/pending lists ALSA: timer: Fix race between read and ioctl ALSA: timer: Fix missing queue indices reset at SNDRV_TIMER_IOCTL_SELECT ASoC: Fix use-after-free at card unregistration drivers: char: mem: Fix wraparound check to allow mappings up to the end tty: Drop krefs for interrupted tty lock serial: sh-sci: Fix panic when serial console and DMA are enabled net: better skb->sender_cpu and skb->napi_id cohabitation mm: consider memblock reservations for deferred memory initialization sizing NFS: Ensure we revalidate attributes before using execute_ok() NFSv4: Don't perform cached access checks before we've OPENed the file Make __xfs_xattr_put_listen preperly report errors. arm64: hw_breakpoint: fix watchpoint matching for tagged pointers arm64: entry: improve data abort handling of tagged pointers RDMA/qib,hfi1: Fix MR reference count leak on write with immediate usercopy: Adjust tests to deal with SMAP/PAN arm64: armv8_deprecated: ensure extension of addr arm64: ensure extension of smp_store_release value Linux 4.4.72 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
277 lines
7.2 KiB
C
277 lines
7.2 KiB
C
/*
|
|
* INET An implementation of the TCP/IP protocol suite for the LINUX
|
|
* operating system. INET is implemented using the BSD Socket
|
|
* interface as the means of communication with the user level.
|
|
*
|
|
* "Ping" sockets
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the License, or (at your option) any later version.
|
|
*
|
|
* Based on ipv4/ping.c code.
|
|
*
|
|
* Authors: Lorenzo Colitti (IPv6 support)
|
|
* Vasiliy Kulikov / Openwall (IPv4 implementation, for Linux 2.6),
|
|
* Pavel Kankovsky (IPv4 implementation, for Linux 2.4.32)
|
|
*
|
|
*/
|
|
|
|
#include <net/addrconf.h>
|
|
#include <net/ipv6.h>
|
|
#include <net/ip6_route.h>
|
|
#include <net/protocol.h>
|
|
#include <net/udp.h>
|
|
#include <net/transp_v6.h>
|
|
#include <net/ping.h>
|
|
|
|
struct proto pingv6_prot = {
|
|
.name = "PINGv6",
|
|
.owner = THIS_MODULE,
|
|
.init = ping_init_sock,
|
|
.close = ping_close,
|
|
.connect = ip6_datagram_connect_v6_only,
|
|
.disconnect = udp_disconnect,
|
|
.setsockopt = ipv6_setsockopt,
|
|
.getsockopt = ipv6_getsockopt,
|
|
.sendmsg = ping_v6_sendmsg,
|
|
.recvmsg = ping_recvmsg,
|
|
.bind = ping_bind,
|
|
.backlog_rcv = ping_queue_rcv_skb,
|
|
.hash = ping_hash,
|
|
.unhash = ping_unhash,
|
|
.get_port = ping_get_port,
|
|
.obj_size = sizeof(struct raw6_sock),
|
|
};
|
|
EXPORT_SYMBOL_GPL(pingv6_prot);
|
|
|
|
static struct inet_protosw pingv6_protosw = {
|
|
.type = SOCK_DGRAM,
|
|
.protocol = IPPROTO_ICMPV6,
|
|
.prot = &pingv6_prot,
|
|
.ops = &inet6_sockraw_ops,
|
|
.flags = INET_PROTOSW_REUSE,
|
|
};
|
|
|
|
|
|
/* Compatibility glue so we can support IPv6 when it's compiled as a module */
|
|
static int dummy_ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len,
|
|
int *addr_len)
|
|
{
|
|
return -EAFNOSUPPORT;
|
|
}
|
|
static void dummy_ip6_datagram_recv_ctl(struct sock *sk, struct msghdr *msg,
|
|
struct sk_buff *skb)
|
|
{
|
|
}
|
|
static int dummy_icmpv6_err_convert(u8 type, u8 code, int *err)
|
|
{
|
|
return -EAFNOSUPPORT;
|
|
}
|
|
static void dummy_ipv6_icmp_error(struct sock *sk, struct sk_buff *skb, int err,
|
|
__be16 port, u32 info, u8 *payload) {}
|
|
static int dummy_ipv6_chk_addr(struct net *net, const struct in6_addr *addr,
|
|
const struct net_device *dev, int strict)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
int ping_v6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
|
|
{
|
|
struct inet_sock *inet = inet_sk(sk);
|
|
struct ipv6_pinfo *np = inet6_sk(sk);
|
|
struct icmp6hdr user_icmph;
|
|
int addr_type;
|
|
struct in6_addr *daddr;
|
|
int oif = 0;
|
|
struct flowi6 fl6;
|
|
int err;
|
|
int hlimit;
|
|
struct dst_entry *dst;
|
|
struct rt6_info *rt;
|
|
struct pingfakehdr pfh;
|
|
|
|
pr_debug("ping_v6_sendmsg(sk=%p,sk->num=%u)\n", inet, inet->inet_num);
|
|
|
|
err = ping_common_sendmsg(AF_INET6, msg, len, &user_icmph,
|
|
sizeof(user_icmph));
|
|
if (err)
|
|
return err;
|
|
|
|
if (msg->msg_name) {
|
|
DECLARE_SOCKADDR(struct sockaddr_in6 *, u, msg->msg_name);
|
|
if (msg->msg_namelen < sizeof(*u))
|
|
return -EINVAL;
|
|
if (u->sin6_family != AF_INET6) {
|
|
return -EAFNOSUPPORT;
|
|
}
|
|
daddr = &(u->sin6_addr);
|
|
if (__ipv6_addr_needs_scope_id(ipv6_addr_type(daddr)))
|
|
oif = u->sin6_scope_id;
|
|
} else {
|
|
if (sk->sk_state != TCP_ESTABLISHED)
|
|
return -EDESTADDRREQ;
|
|
daddr = &sk->sk_v6_daddr;
|
|
}
|
|
|
|
if (!oif)
|
|
oif = sk->sk_bound_dev_if;
|
|
|
|
if (!oif)
|
|
oif = np->sticky_pktinfo.ipi6_ifindex;
|
|
|
|
if (!oif && ipv6_addr_is_multicast(daddr))
|
|
oif = np->mcast_oif;
|
|
else if (!oif)
|
|
oif = np->ucast_oif;
|
|
|
|
addr_type = ipv6_addr_type(daddr);
|
|
if ((__ipv6_addr_needs_scope_id(addr_type) && !oif) ||
|
|
(addr_type & IPV6_ADDR_MAPPED) ||
|
|
(oif && sk->sk_bound_dev_if && oif != sk->sk_bound_dev_if))
|
|
return -EINVAL;
|
|
|
|
/* TODO: use ip6_datagram_send_ctl to get options from cmsg */
|
|
|
|
memset(&fl6, 0, sizeof(fl6));
|
|
|
|
fl6.flowi6_proto = IPPROTO_ICMPV6;
|
|
fl6.saddr = np->saddr;
|
|
fl6.daddr = *daddr;
|
|
fl6.flowi6_oif = oif;
|
|
fl6.flowi6_mark = sk->sk_mark;
|
|
fl6.flowi6_uid = sk->sk_uid;
|
|
fl6.fl6_icmp_type = user_icmph.icmp6_type;
|
|
fl6.fl6_icmp_code = user_icmph.icmp6_code;
|
|
security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
|
|
|
|
dst = ip6_sk_dst_lookup_flow(sk, &fl6, daddr);
|
|
if (IS_ERR(dst))
|
|
return PTR_ERR(dst);
|
|
rt = (struct rt6_info *) dst;
|
|
|
|
np = inet6_sk(sk);
|
|
if (!np) {
|
|
err = -EBADF;
|
|
goto dst_err_out;
|
|
}
|
|
|
|
pfh.icmph.type = user_icmph.icmp6_type;
|
|
pfh.icmph.code = user_icmph.icmp6_code;
|
|
pfh.icmph.checksum = 0;
|
|
pfh.icmph.un.echo.id = inet->inet_sport;
|
|
pfh.icmph.un.echo.sequence = user_icmph.icmp6_sequence;
|
|
pfh.msg = msg;
|
|
pfh.wcheck = 0;
|
|
pfh.family = AF_INET6;
|
|
|
|
hlimit = ip6_sk_dst_hoplimit(np, &fl6, dst);
|
|
|
|
lock_sock(sk);
|
|
err = ip6_append_data(sk, ping_getfrag, &pfh, len,
|
|
0, hlimit,
|
|
np->tclass, NULL, &fl6, rt,
|
|
MSG_DONTWAIT, np->dontfrag);
|
|
|
|
if (err) {
|
|
ICMP6_INC_STATS(sock_net(sk), rt->rt6i_idev,
|
|
ICMP6_MIB_OUTERRORS);
|
|
ip6_flush_pending_frames(sk);
|
|
} else {
|
|
err = icmpv6_push_pending_frames(sk, &fl6,
|
|
(struct icmp6hdr *) &pfh.icmph,
|
|
len);
|
|
}
|
|
release_sock(sk);
|
|
|
|
dst_err_out:
|
|
dst_release(dst);
|
|
|
|
if (err)
|
|
return err;
|
|
|
|
return len;
|
|
}
|
|
|
|
#ifdef CONFIG_PROC_FS
|
|
static void *ping_v6_seq_start(struct seq_file *seq, loff_t *pos)
|
|
{
|
|
return ping_seq_start(seq, pos, AF_INET6);
|
|
}
|
|
|
|
static int ping_v6_seq_show(struct seq_file *seq, void *v)
|
|
{
|
|
if (v == SEQ_START_TOKEN) {
|
|
seq_puts(seq, IPV6_SEQ_DGRAM_HEADER);
|
|
} else {
|
|
int bucket = ((struct ping_iter_state *) seq->private)->bucket;
|
|
struct inet_sock *inet = inet_sk(v);
|
|
__u16 srcp = ntohs(inet->inet_sport);
|
|
__u16 destp = ntohs(inet->inet_dport);
|
|
ip6_dgram_sock_seq_show(seq, v, srcp, destp, bucket);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static struct ping_seq_afinfo ping_v6_seq_afinfo = {
|
|
.name = "icmp6",
|
|
.family = AF_INET6,
|
|
.seq_fops = &ping_seq_fops,
|
|
.seq_ops = {
|
|
.start = ping_v6_seq_start,
|
|
.show = ping_v6_seq_show,
|
|
.next = ping_seq_next,
|
|
.stop = ping_seq_stop,
|
|
},
|
|
};
|
|
|
|
static int __net_init ping_v6_proc_init_net(struct net *net)
|
|
{
|
|
return ping_proc_register(net, &ping_v6_seq_afinfo);
|
|
}
|
|
|
|
static void __net_init ping_v6_proc_exit_net(struct net *net)
|
|
{
|
|
return ping_proc_unregister(net, &ping_v6_seq_afinfo);
|
|
}
|
|
|
|
static struct pernet_operations ping_v6_net_ops = {
|
|
.init = ping_v6_proc_init_net,
|
|
.exit = ping_v6_proc_exit_net,
|
|
};
|
|
#endif
|
|
|
|
int __init pingv6_init(void)
|
|
{
|
|
#ifdef CONFIG_PROC_FS
|
|
int ret = register_pernet_subsys(&ping_v6_net_ops);
|
|
if (ret)
|
|
return ret;
|
|
#endif
|
|
pingv6_ops.ipv6_recv_error = ipv6_recv_error;
|
|
pingv6_ops.ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl;
|
|
pingv6_ops.ip6_datagram_recv_specific_ctl =
|
|
ip6_datagram_recv_specific_ctl;
|
|
pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
|
|
pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
|
|
pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
|
|
return inet6_register_protosw(&pingv6_protosw);
|
|
}
|
|
|
|
/* This never gets called because it's not possible to unload the ipv6 module,
|
|
* but just in case.
|
|
*/
|
|
void pingv6_exit(void)
|
|
{
|
|
pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
|
|
pingv6_ops.ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl;
|
|
pingv6_ops.ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl;
|
|
pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
|
|
pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
|
|
pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
|
|
#ifdef CONFIG_PROC_FS
|
|
unregister_pernet_subsys(&ping_v6_net_ops);
|
|
#endif
|
|
inet6_unregister_protosw(&pingv6_protosw);
|
|
}
|