diff options
| author | Dan McDonald <danmcd@omniti.com> | 2014-05-02 17:05:00 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@omniti.com> | 2014-05-05 11:13:58 -0400 |
| commit | 14b7b4606a1faf7fc4c0bbcc2946782d6538850e (patch) | |
| tree | fb72ee1707a980253f5ba26214c6ca7fd9e82c44 | |
| parent | d05b42383f649c1384ae2af878515cc2c6674ec6 (diff) | |
| download | illumos-joyent-14b7b4606a1faf7fc4c0bbcc2946782d6538850e.tar.gz | |
4838 Fix for 4596 has some inverted booleans
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Reviewed by: Sebastien Roy <sebastien.roy@delphix.com>
Approved by: Robert Mustacchi <rm@joyent.com>
| -rw-r--r-- | usr/src/uts/common/inet/ip/icmp.c | 4 | ||||
| -rw-r--r-- | usr/src/uts/common/inet/udp/udp.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr/src/uts/common/inet/ip/icmp.c b/usr/src/uts/common/inet/ip/icmp.c index 8da126f7dc..a4abdbd130 100644 --- a/usr/src/uts/common/inet/ip/icmp.c +++ b/usr/src/uts/common/inet/ip/icmp.c @@ -3463,7 +3463,7 @@ icmp_output_ancillary(conn_t *connp, sin_t *sin, sin6_t *sin6, mblk_t *mp, else ixa->ixa_flags &= ~IXAF_IS_IPV4; if (srcid != 0 && IN6_IS_ADDR_UNSPECIFIED(&v6src)) { - if (ip_srcid_find_id(srcid, &v6src, IPCL_ZONEID(connp), + if (!ip_srcid_find_id(srcid, &v6src, IPCL_ZONEID(connp), v4mapped, connp->conn_netstack)) { /* Mismatched v4mapped/v6 specified by srcid. */ mutex_exit(&connp->conn_lock); @@ -4455,7 +4455,7 @@ icmp_output_newdst(conn_t *connp, mblk_t *data_mp, sin_t *sin, sin6_t *sin6, else ixa->ixa_flags &= ~IXAF_IS_IPV4; if (srcid != 0 && IN6_IS_ADDR_UNSPECIFIED(&v6src)) { - if (ip_srcid_find_id(srcid, &v6src, IPCL_ZONEID(connp), + if (!ip_srcid_find_id(srcid, &v6src, IPCL_ZONEID(connp), v4mapped, connp->conn_netstack)) { /* Mismatched v4mapped/v6 specified by srcid. */ mutex_exit(&connp->conn_lock); diff --git a/usr/src/uts/common/inet/udp/udp.c b/usr/src/uts/common/inet/udp/udp.c index 4a6e835b67..c919563289 100644 --- a/usr/src/uts/common/inet/udp/udp.c +++ b/usr/src/uts/common/inet/udp/udp.c @@ -2733,7 +2733,7 @@ udp_output_ancillary(conn_t *connp, sin_t *sin, sin6_t *sin6, mblk_t *mp, else ixa->ixa_flags &= ~IXAF_IS_IPV4; if (srcid != 0 && IN6_IS_ADDR_UNSPECIFIED(&v6src)) { - if (ip_srcid_find_id(srcid, &v6src, IPCL_ZONEID(connp), + if (!ip_srcid_find_id(srcid, &v6src, IPCL_ZONEID(connp), v4mapped, connp->conn_netstack)) { /* Mismatch - v4mapped/v6 specified by srcid. */ mutex_exit(&connp->conn_lock); @@ -3754,7 +3754,7 @@ udp_output_newdst(conn_t *connp, mblk_t *data_mp, sin_t *sin, sin6_t *sin6, else ixa->ixa_flags &= ~IXAF_IS_IPV4; if (srcid != 0 && IN6_IS_ADDR_UNSPECIFIED(&v6src)) { - if (ip_srcid_find_id(srcid, &v6src, IPCL_ZONEID(connp), + if (!ip_srcid_find_id(srcid, &v6src, IPCL_ZONEID(connp), v4mapped, connp->conn_netstack)) { /* Mismatched v4mapped/v6 specified by srcid. */ mutex_exit(&connp->conn_lock); @@ -5571,7 +5571,7 @@ udp_do_connect(conn_t *connp, const struct sockaddr *sa, socklen_t len, srcid = sin6->__sin6_src_id; v4mapped = IN6_IS_ADDR_V4MAPPED(&v6dst); if (srcid != 0 && IN6_IS_ADDR_UNSPECIFIED(&v6src)) { - if (ip_srcid_find_id(srcid, &v6src, IPCL_ZONEID(connp), + if (!ip_srcid_find_id(srcid, &v6src, IPCL_ZONEID(connp), v4mapped, connp->conn_netstack)) { /* Mismatch v4mapped/v6 specified by srcid. */ return (EADDRNOTAVAIL); |