Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/netinet/ip_input.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/ip_input.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.32 retrieving revision 1.48 diff -u -p -r1.32 -r1.48 --- src/sys/netinet/ip_input.c 1996/08/14 03:46:44 1.32 +++ src/sys/netinet/ip_input.c 1997/02/26 04:09:32 1.48 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_input.c,v 1.32 1996/08/14 03:46:44 thorpej Exp $ */ +/* $NetBSD: ip_input.c,v 1.48 1997/02/26 04:09:32 mrg Exp $ */ /* * Copyright (c) 1982, 1986, 1988, 1993 @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -51,7 +52,9 @@ #include #include +#include #include +#include #include #include @@ -61,6 +64,9 @@ #include #include +/* XXX should really put this in libkern.h */ +#define offsetof(type, member) ((size_t)(&((type *)0)->member)) + #ifndef IPFORWARDING #ifdef GATEWAY #define IPFORWARDING 1 /* forward IP packets not for us */ @@ -72,7 +78,10 @@ #define IPSENDREDIRECTS 1 #endif #ifndef IPFORWSRCRT -#define IPFORWSRCRT 1 /* allow source-routed packets */ +#define IPFORWSRCRT 1 /* forward source-routed packets */ +#endif +#ifndef IPALLOWSRCRT +#define IPALLOWSRCRT 1 /* allow source-routed packets */ #endif /* * Note: DIRECTED_BROADCAST is handled this way so that previous @@ -90,6 +99,7 @@ int ipsendredirects = IPSENDREDIRECTS; int ip_defttl = IPDEFTTL; int ip_forwsrcrt = IPFORWSRCRT; int ip_directedbcast = IPDIRECTEDBCAST; +int ip_allowsrcrt = IPALLOWSRCRT; #ifdef DIAGNOSTIC int ipprintfs = 0; #endif @@ -117,6 +127,7 @@ static struct ip_srcrt { } ip_srcrt; static void save_rte __P((u_char *, struct in_addr)); + /* * IP initialization: fill in IP protocol switch table. * All protocols not implemented in kernel go to raw IP protocol handler. @@ -153,12 +164,17 @@ struct route ipforward_rt; void ipintr() { - register struct ip *ip; + register struct ip *ip = NULL; register struct mbuf *m; register struct ipq *fp; register struct in_ifaddr *ia; struct ipqent *ipqe; - int hlen, mff, s; + int hlen = 0, mff, len, s; +#ifdef PFIL_HOOKS + struct packet_filter_hook *pfh; + struct mbuf *m0; + int rv; +#endif /* PFIL_HOOKS */ next: /* @@ -212,12 +228,9 @@ next: * Convert fields to host representation. */ NTOHS(ip->ip_len); - if (ip->ip_len < hlen) { - ipstat.ips_badlen++; - goto bad; - } NTOHS(ip->ip_id); NTOHS(ip->ip_off); + len = ip->ip_len; /* * Check that the amount of data in the buffers @@ -225,18 +238,32 @@ next: * Trim mbufs if longer than we expect. * Drop packet if shorter than we expect. */ - if (m->m_pkthdr.len < ip->ip_len) { + if (m->m_pkthdr.len < len) { ipstat.ips_tooshort++; goto bad; } - if (m->m_pkthdr.len > ip->ip_len) { + if (m->m_pkthdr.len > len) { if (m->m_len == m->m_pkthdr.len) { - m->m_len = ip->ip_len; - m->m_pkthdr.len = ip->ip_len; + m->m_len = len; + m->m_pkthdr.len = len; } else - m_adj(m, ip->ip_len - m->m_pkthdr.len); + m_adj(m, len - m->m_pkthdr.len); } +#ifdef PFIL_HOOKS + /* + * Run through list of hooks for input packets. + */ + m0 = m; + for (pfh = pfil_hook_get(PFIL_IN); pfh; pfh = pfh->pfil_link.le_next) + if (pfh->pfil_func) { + rv = pfh->pfil_func(ip, hlen, m->m_pkthdr.rcvif, 0, &m0); + ip = mtod(m = m0, struct ip *); + if (rv) + goto next; + } +#endif /* PFIL_HOOKS */ + /* * Process options and, if not destined for us, * ship it on. ip_dooptions returns 1 when an @@ -251,13 +278,13 @@ next: * Check our list of addresses, to see if the packet is for us. */ for (ia = in_ifaddr.tqh_first; ia; ia = ia->ia_list.tqe_next) { - if (ip->ip_dst.s_addr == ia->ia_addr.sin_addr.s_addr) + if (in_hosteq(ip->ip_dst, ia->ia_addr.sin_addr)) goto ours; if (((ip_directedbcast == 0) || (ip_directedbcast && ia->ia_ifp == m->m_pkthdr.rcvif)) && (ia->ia_ifp->if_flags & IFF_BROADCAST)) { - if (ip->ip_dst.s_addr == ia->ia_broadaddr.sin_addr.s_addr || - ip->ip_dst.s_addr == ia->ia_netbroadcast.s_addr || + if (in_hosteq(ip->ip_dst, ia->ia_broadaddr.sin_addr) || + in_hosteq(ip->ip_dst, ia->ia_netbroadcast) || /* * Look for all-0's host part (old broadcast addr), * either for subnet or net. @@ -324,7 +351,7 @@ next: goto ours; } if (ip->ip_dst.s_addr == INADDR_BROADCAST || - ip->ip_dst.s_addr == INADDR_ANY) + in_nullhost(ip->ip_dst)) goto ours; /* @@ -345,7 +372,7 @@ ours: * if the packet was previously fragmented, * but it's not worth the time; just let them time out.) */ - if (ip->ip_off &~ IP_DF) { + if (ip->ip_off & ~(IP_DF|IP_RF)) { if (m->m_flags & M_EXT) { /* XXX */ if ((m = m_pullup(m, sizeof (struct ip))) == 0) { ipstat.ips_toosmall++; @@ -359,8 +386,8 @@ ours: */ for (fp = ipq.lh_first; fp != NULL; fp = fp->ipq_q.le_next) if (ip->ip_id == fp->ipq_id && - ip->ip_src.s_addr == fp->ipq_src.s_addr && - ip->ip_dst.s_addr == fp->ipq_dst.s_addr && + in_hosteq(ip->ip_src, fp->ipq_src) && + in_hosteq(ip->ip_dst, fp->ipq_dst) && ip->ip_p == fp->ipq_p) goto found; fp = 0; @@ -531,10 +558,16 @@ insert: return (0); /* - * Reassembly is complete; concatenate fragments. + * Reassembly is complete. Check for a bogus message size and + * concatenate fragments. */ q = fp->ipq_fragq.lh_first; ip = q->ipqe_ip; + if ((next + (ip->ip_hl << 2)) > IP_MAXPACKET) { + ipstat.ips_toolong++; + ip_freef(fp); + return (0); + } m = dtom(q->ipqe_ip); t = m->m_next; m->m_next = 0; @@ -682,6 +715,11 @@ ip_dooptions(m) */ case IPOPT_LSRR: case IPOPT_SSRR: + if (ip_allowsrcrt == 0) { + type = ICMP_UNREACH; + code = ICMP_UNREACH_NET_PROHIB; + goto bad; + } if ((off = cp[IPOPT_OFFSET]) < IPOPT_MINOFF) { code = &cp[IPOPT_OFFSET] - (u_char *)ip; goto bad; @@ -841,7 +879,7 @@ ip_rtaddr(dst) sin = satosin(&ipforward_rt.ro_dst); - if (ipforward_rt.ro_rt == 0 || dst.s_addr != sin->sin_addr.s_addr) { + if (ipforward_rt.ro_rt == 0 || !in_hosteq(dst, sin->sin_addr)) { if (ipforward_rt.ro_rt) { RTFREE(ipforward_rt.ro_rt); ipforward_rt.ro_rt = 0; @@ -1016,7 +1054,7 @@ ip_forward(m, srcrt) #ifdef DIAGNOSTIC if (ipprintfs) printf("forward: src %x dst %x ttl %x\n", - ip->ip_src.s_addr, ip->ip_dst.s_addr, ip->ip_ttl); + ip->ip_src.s_addr, ip->ip_dst.s_addr, ip->ip_ttl); #endif if (m->m_flags & M_BCAST || in_canforward(ip->ip_dst) == 0) { ipstat.ips_cantforward++; @@ -1032,13 +1070,13 @@ ip_forward(m, srcrt) sin = satosin(&ipforward_rt.ro_dst); if ((rt = ipforward_rt.ro_rt) == 0 || - ip->ip_dst.s_addr != sin->sin_addr.s_addr) { + !in_hosteq(ip->ip_dst, sin->sin_addr)) { if (ipforward_rt.ro_rt) { RTFREE(ipforward_rt.ro_rt); ipforward_rt.ro_rt = 0; } sin->sin_family = AF_INET; - sin->sin_len = sizeof(*sin); + sin->sin_len = sizeof(struct sockaddr_in); sin->sin_addr = ip->ip_dst; rtalloc(&ipforward_rt); @@ -1050,10 +1088,10 @@ ip_forward(m, srcrt) } /* - * Save at most 64 bytes of the packet in case + * Save at most 68 bytes of the packet in case * we need to generate an ICMP message to the src. */ - mcopy = m_copy(m, 0, imin((int)ip->ip_len, 64)); + mcopy = m_copy(m, 0, imin((int)ip->ip_len, 68)); /* * If forwarding packet using same interface that it came in on, @@ -1065,7 +1103,7 @@ ip_forward(m, srcrt) */ if (rt->rt_ifp == m->m_pkthdr.rcvif && (rt->rt_flags & (RTF_DYNAMIC|RTF_MODIFIED)) == 0 && - satosin(rt_key(rt))->sin_addr.s_addr != 0 && + !in_nullhost(satosin(rt_key(rt))->sin_addr) && ipsendredirects && !srcrt) { if (rt->rt_ifa && (ip->ip_src.s_addr & ifatoia(rt->rt_ifa)->ia_subnetmask) == @@ -1079,7 +1117,7 @@ ip_forward(m, srcrt) code = ICMP_REDIRECT_HOST; #ifdef DIAGNOSTIC if (ipprintfs) - printf("redirect (%d) to %x\n", code, (u_int32_t)dest); + printf("redirect (%d) to %x\n", code, (u_int32_t)dest); #endif } } @@ -1133,6 +1171,66 @@ ip_forward(m, srcrt) icmp_error(mcopy, type, code, dest, destifp); } +void +ip_savecontrol(inp, mp, ip, m) + register struct inpcb *inp; + register struct mbuf **mp; + register struct ip *ip; + register struct mbuf *m; +{ + + if (inp->inp_socket->so_options & SO_TIMESTAMP) { + struct timeval tv; + + microtime(&tv); + *mp = sbcreatecontrol((caddr_t) &tv, sizeof(tv), + SCM_TIMESTAMP, SOL_SOCKET); + if (*mp) + mp = &(*mp)->m_next; + } + if (inp->inp_flags & INP_RECVDSTADDR) { + *mp = sbcreatecontrol((caddr_t) &ip->ip_dst, + sizeof(struct in_addr), IP_RECVDSTADDR, IPPROTO_IP); + if (*mp) + mp = &(*mp)->m_next; + } +#ifdef notyet + /* + * XXX + * Moving these out of udp_input() made them even more broken + * than they already were. + * - fenner@parc.xerox.com + */ + /* options were tossed already */ + if (inp->inp_flags & INP_RECVOPTS) { + *mp = sbcreatecontrol((caddr_t) opts_deleted_above, + sizeof(struct in_addr), IP_RECVOPTS, IPPROTO_IP); + if (*mp) + mp = &(*mp)->m_next; + } + /* ip_srcroute doesn't do what we want here, need to fix */ + if (inp->inp_flags & INP_RECVRETOPTS) { + *mp = sbcreatecontrol((caddr_t) ip_srcroute(), + sizeof(struct in_addr), IP_RECVRETOPTS, IPPROTO_IP); + if (*mp) + mp = &(*mp)->m_next; + } +#endif + if (inp->inp_flags & INP_RECVIF) { + struct sockaddr_dl sdl; + + sdl.sdl_len = offsetof(struct sockaddr_dl, sdl_data[0]); + sdl.sdl_family = AF_LINK; + sdl.sdl_index = m->m_pkthdr.rcvif ? + m->m_pkthdr.rcvif->if_index : 0; + sdl.sdl_nlen = sdl.sdl_alen = sdl.sdl_slen = 0; + *mp = sbcreatecontrol((caddr_t) &sdl, sdl.sdl_len, + IP_RECVIF, IPPROTO_IP); + if (*mp) + mp = &(*mp)->m_next; + } +} + int ip_sysctl(name, namelen, oldp, oldlenp, newp, newlen) int *name; @@ -1159,16 +1257,19 @@ ip_sysctl(name, namelen, oldp, oldlenp, return (sysctl_int(oldp, oldlenp, newp, newlen, &ip_mtu)); #endif case IPCTL_FORWSRCRT: - /* - * Don't allow this to change in a secure environment. - */ + /* Don't allow this to change in a secure environment. */ if (securelevel > 0) - return (EPERM); - return (sysctl_int(oldp, oldlenp, newp, newlen, - &ip_forwsrcrt)); + return (sysctl_rdint(oldp, oldlenp, newp, + ip_forwsrcrt)); + else + return (sysctl_int(oldp, oldlenp, newp, newlen, + &ip_forwsrcrt)); case IPCTL_DIRECTEDBCAST: return (sysctl_int(oldp, oldlenp, newp, newlen, &ip_directedbcast)); + case IPCTL_ALLOWSRCRT: + return (sysctl_int(oldp, oldlenp, newp, newlen, + &ip_allowsrcrt)); default: return (EOPNOTSUPP); }