svn commit: r303868 - in user/alc/PQ_LAUNDRY/sys: conf contrib/dev/ath/ath_hal/ar9300 dev/cxgbe dev/hyperv/netvsc kern netinet netinet6 sys
Mark Johnston
markj at FreeBSD.org
Tue Aug 9 04:59:58 UTC 2016
Author: markj
Date: Tue Aug 9 04:59:55 2016
New Revision: 303868
URL: https://svnweb.freebsd.org/changeset/base/303868
Log:
MFH r303867
Added:
user/alc/PQ_LAUNDRY/sys/netinet/in_jail.c
- copied unchanged from r303867, head/sys/netinet/in_jail.c
user/alc/PQ_LAUNDRY/sys/netinet6/in6_jail.c
- copied unchanged from r303867, head/sys/netinet6/in6_jail.c
Modified:
user/alc/PQ_LAUNDRY/sys/conf/files
user/alc/PQ_LAUNDRY/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_xmit.c
user/alc/PQ_LAUNDRY/sys/dev/cxgbe/adapter.h
user/alc/PQ_LAUNDRY/sys/dev/cxgbe/t4_sge.c
user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_net_vsc.c
user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_net_vsc.h
user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_rndis_filter.c
user/alc/PQ_LAUNDRY/sys/kern/kern_jail.c
user/alc/PQ_LAUNDRY/sys/kern/uipc_usrreq.c
user/alc/PQ_LAUNDRY/sys/sys/jail.h
user/alc/PQ_LAUNDRY/sys/sys/unpcb.h
Directory Properties:
user/alc/PQ_LAUNDRY/ (props changed)
Modified: user/alc/PQ_LAUNDRY/sys/conf/files
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/conf/files Tue Aug 9 04:50:20 2016 (r303867)
+++ user/alc/PQ_LAUNDRY/sys/conf/files Tue Aug 9 04:59:55 2016 (r303868)
@@ -3748,6 +3748,7 @@ netinet/in_fib.c optional inet
netinet/in_gif.c optional gif inet | netgraph_gif inet
netinet/ip_gre.c optional gre inet
netinet/ip_id.c optional inet
+netinet/in_jail.c optional inet
netinet/in_mcast.c optional inet
netinet/in_pcb.c optional inet | inet6
netinet/in_pcbgroup.c optional inet pcbgroup | inet6 pcbgroup
@@ -3816,6 +3817,7 @@ netinet6/in6_cksum.c optional inet6
netinet6/in6_fib.c optional inet6
netinet6/in6_gif.c optional gif inet6 | netgraph_gif inet6
netinet6/in6_ifattach.c optional inet6
+netinet6/in6_jail.c optional inet6
netinet6/in6_mcast.c optional inet6
netinet6/in6_pcb.c optional inet6
netinet6/in6_pcbgroup.c optional inet6 pcbgroup
Modified: user/alc/PQ_LAUNDRY/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_xmit.c
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_xmit.c Tue Aug 9 04:50:20 2016 (r303867)
+++ user/alc/PQ_LAUNDRY/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_xmit.c Tue Aug 9 04:59:55 2016 (r303868)
@@ -447,6 +447,8 @@ ar9300_reset_tx_queue(struct ath_hal *ah
*/
if (value < 10)
value = 10;
+ if (value < 0)
+ value = 10;
HALDEBUG(ah, HAL_DEBUG_TXQUEUE,
"%s: defaulting to rdytime = %d uS\n",
__func__, value);
Modified: user/alc/PQ_LAUNDRY/sys/dev/cxgbe/adapter.h
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/dev/cxgbe/adapter.h Tue Aug 9 04:50:20 2016 (r303867)
+++ user/alc/PQ_LAUNDRY/sys/dev/cxgbe/adapter.h Tue Aug 9 04:59:55 2016 (r303868)
@@ -195,6 +195,7 @@ enum {
ADAP_SYSCTL_CTX = (1 << 4),
/* TOM_INIT_DONE= (1 << 5), No longer used */
BUF_PACKING_OK = (1 << 6),
+ IS_VF = (1 << 7),
CXGBE_BUSY = (1 << 9),
Modified: user/alc/PQ_LAUNDRY/sys/dev/cxgbe/t4_sge.c
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/dev/cxgbe/t4_sge.c Tue Aug 9 04:50:20 2016 (r303867)
+++ user/alc/PQ_LAUNDRY/sys/dev/cxgbe/t4_sge.c Tue Aug 9 04:59:55 2016 (r303868)
@@ -590,7 +590,7 @@ t4_tweak_chip_settings(struct adapter *s
/*
* SGE wants the buffer to be at least 64B and then a multiple of 16. If
- * padding is is use the buffer's start and end need to be aligned to the pad
+ * padding is in use, the buffer's start and end need to be aligned to the pad
* boundary as well. We'll just make sure that the size is a multiple of the
* boundary here, it is up to the buffer allocation code to make sure the start
* of the buffer is aligned as well.
Modified: user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_net_vsc.c
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_net_vsc.c Tue Aug 9 04:50:20 2016 (r303867)
+++ user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_net_vsc.c Tue Aug 9 04:59:55 2016 (r303868)
@@ -799,7 +799,8 @@ hv_nv_on_send_completion(netvsc_dev *net
* Returns 0 on success, non-zero on failure.
*/
int
-hv_nv_on_send(struct vmbus_channel *chan, netvsc_packet *pkt)
+hv_nv_on_send(struct vmbus_channel *chan,
+ netvsc_packet *pkt, struct vmbus_gpa *gpa, int gpa_cnt)
{
nvsp_msg send_msg;
int ret;
@@ -818,8 +819,8 @@ hv_nv_on_send(struct vmbus_channel *chan
send_msg.msgs.vers_1_msgs.send_rndis_pkt.send_buf_section_size =
pkt->send_buf_section_size;
- if (pkt->gpa_cnt) {
- ret = vmbus_chan_send_sglist(chan, pkt->gpa, pkt->gpa_cnt,
+ if (gpa_cnt) {
+ ret = vmbus_chan_send_sglist(chan, gpa, gpa_cnt,
&send_msg, sizeof(nvsp_msg), (uint64_t)(uintptr_t)pkt);
} else {
ret = vmbus_chan_send(chan,
Modified: user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_net_vsc.h
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_net_vsc.h Tue Aug 9 04:50:20 2016 (r303867)
+++ user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_net_vsc.h Tue Aug 9 04:59:55 2016 (r303868)
@@ -1137,8 +1137,6 @@ typedef struct netvsc_packet_ {
void *rndis_mesg;
uint32_t tot_data_buf_len;
void *data;
- uint32_t gpa_cnt;
- struct vmbus_gpa gpa[NETVSC_PACKET_MAXPAGE];
} netvsc_packet;
typedef struct {
@@ -1216,6 +1214,9 @@ struct hn_tx_ring {
bus_dma_tag_t hn_tx_data_dtag;
uint64_t hn_csum_assist;
+ int hn_gpa_cnt;
+ struct vmbus_gpa hn_gpa[NETVSC_PACKET_MAXPAGE];
+
u_long hn_no_txdescs;
u_long hn_send_failed;
u_long hn_txdma_failed;
@@ -1275,7 +1276,8 @@ netvsc_dev *hv_nv_on_device_add(struct h
void *additional_info, struct hn_rx_ring *rxr);
int hv_nv_on_device_remove(struct hn_softc *sc,
boolean_t destroy_channel);
-int hv_nv_on_send(struct vmbus_channel *chan, netvsc_packet *pkt);
+int hv_nv_on_send(struct vmbus_channel *chan, netvsc_packet *pkt,
+ struct vmbus_gpa *gpa, int gpa_cnt);
int hv_nv_get_next_send_section(netvsc_dev *net_dev);
void hv_nv_subchan_attach(struct vmbus_channel *chan,
struct hn_rx_ring *rxr);
Modified: user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Tue Aug 9 04:50:20 2016 (r303867)
+++ user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Tue Aug 9 04:59:55 2016 (r303868)
@@ -993,7 +993,7 @@ hn_encap(struct hn_tx_ring *txr, struct
packet->send_buf_section_idx = send_buf_section_idx;
packet->send_buf_section_size =
packet->tot_data_buf_len;
- packet->gpa_cnt = 0;
+ txr->hn_gpa_cnt = 0;
txr->hn_tx_chimney++;
goto done;
}
@@ -1019,19 +1019,19 @@ hn_encap(struct hn_tx_ring *txr, struct
}
*m_head0 = m_head;
- packet->gpa_cnt = nsegs + HV_RF_NUM_TX_RESERVED_PAGE_BUFS;
+ txr->hn_gpa_cnt = nsegs + HV_RF_NUM_TX_RESERVED_PAGE_BUFS;
/* send packet with page buffer */
- packet->gpa[0].gpa_page = atop(txd->rndis_msg_paddr);
- packet->gpa[0].gpa_ofs = txd->rndis_msg_paddr & PAGE_MASK;
- packet->gpa[0].gpa_len = rndis_msg_size;
+ txr->hn_gpa[0].gpa_page = atop(txd->rndis_msg_paddr);
+ txr->hn_gpa[0].gpa_ofs = txd->rndis_msg_paddr & PAGE_MASK;
+ txr->hn_gpa[0].gpa_len = rndis_msg_size;
/*
* Fill the page buffers with mbuf info starting at index
* HV_RF_NUM_TX_RESERVED_PAGE_BUFS.
*/
for (i = 0; i < nsegs; ++i) {
- struct vmbus_gpa *gpa = &packet->gpa[
+ struct vmbus_gpa *gpa = &txr->hn_gpa[
i + HV_RF_NUM_TX_RESERVED_PAGE_BUFS];
gpa->gpa_page = atop(segs[i].ds_addr);
@@ -1068,7 +1068,8 @@ again:
* Make sure that txd is not freed before ETHER_BPF_MTAP.
*/
hn_txdesc_hold(txd);
- error = hv_nv_on_send(txr->hn_chan, &txd->netvsc_pkt);
+ error = hv_nv_on_send(txr->hn_chan, &txd->netvsc_pkt,
+ txr->hn_gpa, txr->hn_gpa_cnt);
if (!error) {
ETHER_BPF_MTAP(ifp, txd->m);
if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
Modified: user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_rndis_filter.c
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_rndis_filter.c Tue Aug 9 04:50:20 2016 (r303867)
+++ user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_rndis_filter.c Tue Aug 9 04:59:55 2016 (r303868)
@@ -238,33 +238,31 @@ static int
hv_rf_send_request(rndis_device *device, rndis_request *request,
uint32_t message_type)
{
- int ret;
netvsc_packet *packet;
netvsc_dev *net_dev = device->net_dev;
int send_buf_section_idx;
+ struct vmbus_gpa gpa[2];
+ int gpa_cnt;
/* Set up the packet to send it */
packet = &request->pkt;
packet->is_data_pkt = FALSE;
packet->tot_data_buf_len = request->request_msg.msg_len;
- packet->gpa_cnt = 1;
- packet->gpa[0].gpa_page =
- hv_get_phys_addr(&request->request_msg) >> PAGE_SHIFT;
- packet->gpa[0].gpa_len = request->request_msg.msg_len;
- packet->gpa[0].gpa_ofs =
- (unsigned long)&request->request_msg & (PAGE_SIZE - 1);
-
- if (packet->gpa[0].gpa_ofs + packet->gpa[0].gpa_len > PAGE_SIZE) {
- packet->gpa_cnt = 2;
- packet->gpa[0].gpa_len = PAGE_SIZE - packet->gpa[0].gpa_ofs;
- packet->gpa[1].gpa_page =
- hv_get_phys_addr((char*)&request->request_msg +
- packet->gpa[0].gpa_len) >> PAGE_SHIFT;
- packet->gpa[1].gpa_ofs = 0;
- packet->gpa[1].gpa_len = request->request_msg.msg_len -
- packet->gpa[0].gpa_len;
+ gpa_cnt = 1;
+ gpa[0].gpa_page = hv_get_phys_addr(&request->request_msg) >> PAGE_SHIFT;
+ gpa[0].gpa_len = request->request_msg.msg_len;
+ gpa[0].gpa_ofs = (unsigned long)&request->request_msg & (PAGE_SIZE - 1);
+
+ if (gpa[0].gpa_ofs + gpa[0].gpa_len > PAGE_SIZE) {
+ gpa_cnt = 2;
+ gpa[0].gpa_len = PAGE_SIZE - gpa[0].gpa_ofs;
+ gpa[1].gpa_page =
+ hv_get_phys_addr((char*)&request->request_msg +
+ gpa[0].gpa_len) >> PAGE_SHIFT;
+ gpa[1].gpa_ofs = 0;
+ gpa[1].gpa_len = request->request_msg.msg_len - gpa[0].gpa_len;
}
packet->compl.send.send_completion_context = request; /* packet */
@@ -286,7 +284,7 @@ hv_rf_send_request(rndis_device *device,
memcpy(dest, &request->request_msg, request->request_msg.msg_len);
packet->send_buf_section_idx = send_buf_section_idx;
packet->send_buf_section_size = packet->tot_data_buf_len;
- packet->gpa_cnt = 0;
+ gpa_cnt = 0;
goto sendit;
}
/* Failed to allocate chimney send buffer; move on */
@@ -295,9 +293,8 @@ hv_rf_send_request(rndis_device *device,
packet->send_buf_section_size = 0;
sendit:
- ret = hv_nv_on_send(device->net_dev->sc->hn_prichan, packet);
-
- return (ret);
+ return hv_nv_on_send(device->net_dev->sc->hn_prichan, packet,
+ gpa, gpa_cnt);
}
/*
Modified: user/alc/PQ_LAUNDRY/sys/kern/kern_jail.c
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/kern/kern_jail.c Tue Aug 9 04:50:20 2016 (r303867)
+++ user/alc/PQ_LAUNDRY/sys/kern/kern_jail.c Tue Aug 9 04:59:55 2016 (r303868)
@@ -130,14 +130,6 @@ static void prison_racct_attach(struct p
static void prison_racct_modify(struct prison *pr);
static void prison_racct_detach(struct prison *pr);
#endif
-#ifdef INET
-static int _prison_check_ip4(const struct prison *, const struct in_addr *);
-static int prison_restrict_ip4(struct prison *pr, struct in_addr *newip4);
-#endif
-#ifdef INET6
-static int _prison_check_ip6(struct prison *pr, struct in6_addr *ia6);
-static int prison_restrict_ip6(struct prison *pr, struct in6_addr *newip6);
-#endif
/* Flags for prison_deref */
#define PD_DEREF 0x01
@@ -252,54 +244,6 @@ prison0_init(void)
strlcpy(prison0.pr_osrelease, osrelease, sizeof(prison0.pr_osrelease));
}
-#ifdef INET
-static int
-qcmp_v4(const void *ip1, const void *ip2)
-{
- in_addr_t iaa, iab;
-
- /*
- * We need to compare in HBO here to get the list sorted as expected
- * by the result of the code. Sorting NBO addresses gives you
- * interesting results. If you do not understand, do not try.
- */
- iaa = ntohl(((const struct in_addr *)ip1)->s_addr);
- iab = ntohl(((const struct in_addr *)ip2)->s_addr);
-
- /*
- * Do not simply return the difference of the two numbers, the int is
- * not wide enough.
- */
- if (iaa > iab)
- return (1);
- else if (iaa < iab)
- return (-1);
- else
- return (0);
-}
-#endif
-
-#ifdef INET6
-static int
-qcmp_v6(const void *ip1, const void *ip2)
-{
- const struct in6_addr *ia6a, *ia6b;
- int i, rc;
-
- ia6a = (const struct in6_addr *)ip1;
- ia6b = (const struct in6_addr *)ip2;
-
- rc = 0;
- for (i = 0; rc == 0 && i < sizeof(struct in6_addr); i++) {
- if (ia6a->s6_addr[i] > ia6b->s6_addr[i])
- rc = 1;
- else if (ia6a->s6_addr[i] < ia6b->s6_addr[i])
- rc = -1;
- }
- return (rc);
-}
-#endif
-
/*
* struct jail_args {
* struct jail *jail;
@@ -845,7 +789,8 @@ kern_jail_set(struct thread *td, struct
* address to connect from.
*/
if (ip4s > 1)
- qsort(ip4 + 1, ip4s - 1, sizeof(*ip4), qcmp_v4);
+ qsort(ip4 + 1, ip4s - 1, sizeof(*ip4),
+ prison_qcmp_v4);
/*
* Check for duplicate addresses and do some simple
* zero and broadcast checks. If users give other bogus
@@ -893,7 +838,8 @@ kern_jail_set(struct thread *td, struct
ip6 = malloc(ip6s * sizeof(*ip6), M_PRISON, M_WAITOK);
bcopy(op, ip6, ip6s * sizeof(*ip6));
if (ip6s > 1)
- qsort(ip6 + 1, ip6s - 1, sizeof(*ip6), qcmp_v6);
+ qsort(ip6 + 1, ip6s - 1, sizeof(*ip6),
+ prison_qcmp_v6);
for (ii = 0; ii < ip6s; ii++) {
if (IN6_IS_ADDR_UNSPECIFIED(&ip6[ii])) {
error = EINVAL;
@@ -1486,7 +1432,8 @@ kern_jail_set(struct thread *td, struct
(ip4s == 1 && tpr->pr_ip4s == 1))
continue;
for (ii = 0; ii < ip4s; ii++) {
- if (_prison_check_ip4(tpr, &ip4[ii]) == 0) {
+ if (prison_check_ip4_locked(tpr, &ip4[ii]) ==
+ 0) {
error = EADDRINUSE;
vfs_opterror(opts,
"IPv4 addresses clash");
@@ -1552,7 +1499,8 @@ kern_jail_set(struct thread *td, struct
(ip6s == 1 && tpr->pr_ip6s == 1))
continue;
for (ii = 0; ii < ip6s; ii++) {
- if (_prison_check_ip6(tpr, &ip6[ii]) == 0) {
+ if (prison_check_ip6_locked(tpr, &ip6[ii]) ==
+ 0) {
error = EADDRINUSE;
vfs_opterror(opts,
"IPv6 addresses clash");
@@ -2770,684 +2718,6 @@ prison_proc_free(struct prison *pr)
mtx_unlock(&pr->pr_mtx);
}
-
-#ifdef INET
-/*
- * Restrict a prison's IP address list with its parent's, possibly replacing
- * it. Return true if the replacement buffer was used (or would have been).
- */
-static int
-prison_restrict_ip4(struct prison *pr, struct in_addr *newip4)
-{
- int ii, ij, used;
- struct prison *ppr;
-
- ppr = pr->pr_parent;
- if (!(pr->pr_flags & PR_IP4_USER)) {
- /* This has no user settings, so just copy the parent's list. */
- if (pr->pr_ip4s < ppr->pr_ip4s) {
- /*
- * There's no room for the parent's list. Use the
- * new list buffer, which is assumed to be big enough
- * (if it was passed). If there's no buffer, try to
- * allocate one.
- */
- used = 1;
- if (newip4 == NULL) {
- newip4 = malloc(ppr->pr_ip4s * sizeof(*newip4),
- M_PRISON, M_NOWAIT);
- if (newip4 != NULL)
- used = 0;
- }
- if (newip4 != NULL) {
- bcopy(ppr->pr_ip4, newip4,
- ppr->pr_ip4s * sizeof(*newip4));
- free(pr->pr_ip4, M_PRISON);
- pr->pr_ip4 = newip4;
- pr->pr_ip4s = ppr->pr_ip4s;
- }
- return (used);
- }
- pr->pr_ip4s = ppr->pr_ip4s;
- if (pr->pr_ip4s > 0)
- bcopy(ppr->pr_ip4, pr->pr_ip4,
- pr->pr_ip4s * sizeof(*newip4));
- else if (pr->pr_ip4 != NULL) {
- free(pr->pr_ip4, M_PRISON);
- pr->pr_ip4 = NULL;
- }
- } else if (pr->pr_ip4s > 0) {
- /* Remove addresses that aren't in the parent. */
- for (ij = 0; ij < ppr->pr_ip4s; ij++)
- if (pr->pr_ip4[0].s_addr == ppr->pr_ip4[ij].s_addr)
- break;
- if (ij < ppr->pr_ip4s)
- ii = 1;
- else {
- bcopy(pr->pr_ip4 + 1, pr->pr_ip4,
- --pr->pr_ip4s * sizeof(*pr->pr_ip4));
- ii = 0;
- }
- for (ij = 1; ii < pr->pr_ip4s; ) {
- if (pr->pr_ip4[ii].s_addr == ppr->pr_ip4[0].s_addr) {
- ii++;
- continue;
- }
- switch (ij >= ppr->pr_ip4s ? -1 :
- qcmp_v4(&pr->pr_ip4[ii], &ppr->pr_ip4[ij])) {
- case -1:
- bcopy(pr->pr_ip4 + ii + 1, pr->pr_ip4 + ii,
- (--pr->pr_ip4s - ii) * sizeof(*pr->pr_ip4));
- break;
- case 0:
- ii++;
- ij++;
- break;
- case 1:
- ij++;
- break;
- }
- }
- if (pr->pr_ip4s == 0) {
- free(pr->pr_ip4, M_PRISON);
- pr->pr_ip4 = NULL;
- }
- }
- return (0);
-}
-
-/*
- * Pass back primary IPv4 address of this jail.
- *
- * If not restricted return success but do not alter the address. Caller has
- * to make sure to initialize it correctly (e.g. INADDR_ANY).
- *
- * Returns 0 on success, EAFNOSUPPORT if the jail doesn't allow IPv4.
- * Address returned in NBO.
- */
-int
-prison_get_ip4(struct ucred *cred, struct in_addr *ia)
-{
- struct prison *pr;
-
- KASSERT(cred != NULL, ("%s: cred is NULL", __func__));
- KASSERT(ia != NULL, ("%s: ia is NULL", __func__));
-
- pr = cred->cr_prison;
- if (!(pr->pr_flags & PR_IP4))
- return (0);
- mtx_lock(&pr->pr_mtx);
- if (!(pr->pr_flags & PR_IP4)) {
- mtx_unlock(&pr->pr_mtx);
- return (0);
- }
- if (pr->pr_ip4 == NULL) {
- mtx_unlock(&pr->pr_mtx);
- return (EAFNOSUPPORT);
- }
-
- ia->s_addr = pr->pr_ip4[0].s_addr;
- mtx_unlock(&pr->pr_mtx);
- return (0);
-}
-
-/*
- * Return 1 if we should do proper source address selection or are not jailed.
- * We will return 0 if we should bypass source address selection in favour
- * of the primary jail IPv4 address. Only in this case *ia will be updated and
- * returned in NBO.
- * Return EAFNOSUPPORT, in case this jail does not allow IPv4.
- */
-int
-prison_saddrsel_ip4(struct ucred *cred, struct in_addr *ia)
-{
- struct prison *pr;
- struct in_addr lia;
- int error;
-
- KASSERT(cred != NULL, ("%s: cred is NULL", __func__));
- KASSERT(ia != NULL, ("%s: ia is NULL", __func__));
-
- if (!jailed(cred))
- return (1);
-
- pr = cred->cr_prison;
- if (pr->pr_flags & PR_IP4_SADDRSEL)
- return (1);
-
- lia.s_addr = INADDR_ANY;
- error = prison_get_ip4(cred, &lia);
- if (error)
- return (error);
- if (lia.s_addr == INADDR_ANY)
- return (1);
-
- ia->s_addr = lia.s_addr;
- return (0);
-}
-
-/*
- * Return true if pr1 and pr2 have the same IPv4 address restrictions.
- */
-int
-prison_equal_ip4(struct prison *pr1, struct prison *pr2)
-{
-
- if (pr1 == pr2)
- return (1);
-
- /*
- * No need to lock since the PR_IP4_USER flag can't be altered for
- * existing prisons.
- */
- while (pr1 != &prison0 &&
-#ifdef VIMAGE
- !(pr1->pr_flags & PR_VNET) &&
-#endif
- !(pr1->pr_flags & PR_IP4_USER))
- pr1 = pr1->pr_parent;
- while (pr2 != &prison0 &&
-#ifdef VIMAGE
- !(pr2->pr_flags & PR_VNET) &&
-#endif
- !(pr2->pr_flags & PR_IP4_USER))
- pr2 = pr2->pr_parent;
- return (pr1 == pr2);
-}
-
-/*
- * Make sure our (source) address is set to something meaningful to this
- * jail.
- *
- * Returns 0 if jail doesn't restrict IPv4 or if address belongs to jail,
- * EADDRNOTAVAIL if the address doesn't belong, or EAFNOSUPPORT if the jail
- * doesn't allow IPv4. Address passed in in NBO and returned in NBO.
- */
-int
-prison_local_ip4(struct ucred *cred, struct in_addr *ia)
-{
- struct prison *pr;
- struct in_addr ia0;
- int error;
-
- KASSERT(cred != NULL, ("%s: cred is NULL", __func__));
- KASSERT(ia != NULL, ("%s: ia is NULL", __func__));
-
- pr = cred->cr_prison;
- if (!(pr->pr_flags & PR_IP4))
- return (0);
- mtx_lock(&pr->pr_mtx);
- if (!(pr->pr_flags & PR_IP4)) {
- mtx_unlock(&pr->pr_mtx);
- return (0);
- }
- if (pr->pr_ip4 == NULL) {
- mtx_unlock(&pr->pr_mtx);
- return (EAFNOSUPPORT);
- }
-
- ia0.s_addr = ntohl(ia->s_addr);
- if (ia0.s_addr == INADDR_LOOPBACK) {
- ia->s_addr = pr->pr_ip4[0].s_addr;
- mtx_unlock(&pr->pr_mtx);
- return (0);
- }
-
- if (ia0.s_addr == INADDR_ANY) {
- /*
- * In case there is only 1 IPv4 address, bind directly.
- */
- if (pr->pr_ip4s == 1)
- ia->s_addr = pr->pr_ip4[0].s_addr;
- mtx_unlock(&pr->pr_mtx);
- return (0);
- }
-
- error = _prison_check_ip4(pr, ia);
- mtx_unlock(&pr->pr_mtx);
- return (error);
-}
-
-/*
- * Rewrite destination address in case we will connect to loopback address.
- *
- * Returns 0 on success, EAFNOSUPPORT if the jail doesn't allow IPv4.
- * Address passed in in NBO and returned in NBO.
- */
-int
-prison_remote_ip4(struct ucred *cred, struct in_addr *ia)
-{
- struct prison *pr;
-
- KASSERT(cred != NULL, ("%s: cred is NULL", __func__));
- KASSERT(ia != NULL, ("%s: ia is NULL", __func__));
-
- pr = cred->cr_prison;
- if (!(pr->pr_flags & PR_IP4))
- return (0);
- mtx_lock(&pr->pr_mtx);
- if (!(pr->pr_flags & PR_IP4)) {
- mtx_unlock(&pr->pr_mtx);
- return (0);
- }
- if (pr->pr_ip4 == NULL) {
- mtx_unlock(&pr->pr_mtx);
- return (EAFNOSUPPORT);
- }
-
- if (ntohl(ia->s_addr) == INADDR_LOOPBACK) {
- ia->s_addr = pr->pr_ip4[0].s_addr;
- mtx_unlock(&pr->pr_mtx);
- return (0);
- }
-
- /*
- * Return success because nothing had to be changed.
- */
- mtx_unlock(&pr->pr_mtx);
- return (0);
-}
-
-/*
- * Check if given address belongs to the jail referenced by cred/prison.
- *
- * Returns 0 if jail doesn't restrict IPv4 or if address belongs to jail,
- * EADDRNOTAVAIL if the address doesn't belong, or EAFNOSUPPORT if the jail
- * doesn't allow IPv4. Address passed in in NBO.
- */
-static int
-_prison_check_ip4(const struct prison *pr, const struct in_addr *ia)
-{
- int i, a, z, d;
-
- /*
- * Check the primary IP.
- */
- if (pr->pr_ip4[0].s_addr == ia->s_addr)
- return (0);
-
- /*
- * All the other IPs are sorted so we can do a binary search.
- */
- a = 0;
- z = pr->pr_ip4s - 2;
- while (a <= z) {
- i = (a + z) / 2;
- d = qcmp_v4(&pr->pr_ip4[i+1], ia);
- if (d > 0)
- z = i - 1;
- else if (d < 0)
- a = i + 1;
- else
- return (0);
- }
-
- return (EADDRNOTAVAIL);
-}
-
-int
-prison_check_ip4(const struct ucred *cred, const struct in_addr *ia)
-{
- struct prison *pr;
- int error;
-
- KASSERT(cred != NULL, ("%s: cred is NULL", __func__));
- KASSERT(ia != NULL, ("%s: ia is NULL", __func__));
-
- pr = cred->cr_prison;
- if (!(pr->pr_flags & PR_IP4))
- return (0);
- mtx_lock(&pr->pr_mtx);
- if (!(pr->pr_flags & PR_IP4)) {
- mtx_unlock(&pr->pr_mtx);
- return (0);
- }
- if (pr->pr_ip4 == NULL) {
- mtx_unlock(&pr->pr_mtx);
- return (EAFNOSUPPORT);
- }
-
- error = _prison_check_ip4(pr, ia);
- mtx_unlock(&pr->pr_mtx);
- return (error);
-}
-#endif
-
-#ifdef INET6
-static int
-prison_restrict_ip6(struct prison *pr, struct in6_addr *newip6)
-{
- int ii, ij, used;
- struct prison *ppr;
-
- ppr = pr->pr_parent;
- if (!(pr->pr_flags & PR_IP6_USER)) {
- /* This has no user settings, so just copy the parent's list. */
- if (pr->pr_ip6s < ppr->pr_ip6s) {
- /*
- * There's no room for the parent's list. Use the
- * new list buffer, which is assumed to be big enough
- * (if it was passed). If there's no buffer, try to
- * allocate one.
- */
- used = 1;
- if (newip6 == NULL) {
- newip6 = malloc(ppr->pr_ip6s * sizeof(*newip6),
- M_PRISON, M_NOWAIT);
- if (newip6 != NULL)
- used = 0;
- }
- if (newip6 != NULL) {
- bcopy(ppr->pr_ip6, newip6,
- ppr->pr_ip6s * sizeof(*newip6));
- free(pr->pr_ip6, M_PRISON);
- pr->pr_ip6 = newip6;
- pr->pr_ip6s = ppr->pr_ip6s;
- }
- return (used);
- }
- pr->pr_ip6s = ppr->pr_ip6s;
- if (pr->pr_ip6s > 0)
- bcopy(ppr->pr_ip6, pr->pr_ip6,
- pr->pr_ip6s * sizeof(*newip6));
- else if (pr->pr_ip6 != NULL) {
- free(pr->pr_ip6, M_PRISON);
- pr->pr_ip6 = NULL;
- }
- } else if (pr->pr_ip6s > 0) {
- /* Remove addresses that aren't in the parent. */
- for (ij = 0; ij < ppr->pr_ip6s; ij++)
- if (IN6_ARE_ADDR_EQUAL(&pr->pr_ip6[0],
- &ppr->pr_ip6[ij]))
- break;
- if (ij < ppr->pr_ip6s)
- ii = 1;
- else {
- bcopy(pr->pr_ip6 + 1, pr->pr_ip6,
- --pr->pr_ip6s * sizeof(*pr->pr_ip6));
- ii = 0;
- }
- for (ij = 1; ii < pr->pr_ip6s; ) {
- if (IN6_ARE_ADDR_EQUAL(&pr->pr_ip6[ii],
- &ppr->pr_ip6[0])) {
- ii++;
- continue;
- }
- switch (ij >= ppr->pr_ip6s ? -1 :
- qcmp_v6(&pr->pr_ip6[ii], &ppr->pr_ip6[ij])) {
- case -1:
- bcopy(pr->pr_ip6 + ii + 1, pr->pr_ip6 + ii,
- (--pr->pr_ip6s - ii) * sizeof(*pr->pr_ip6));
- break;
- case 0:
- ii++;
- ij++;
- break;
- case 1:
- ij++;
- break;
- }
- }
- if (pr->pr_ip6s == 0) {
- free(pr->pr_ip6, M_PRISON);
- pr->pr_ip6 = NULL;
- }
- }
- return 0;
-}
-
-/*
- * Pass back primary IPv6 address for this jail.
- *
- * If not restricted return success but do not alter the address. Caller has
- * to make sure to initialize it correctly (e.g. IN6ADDR_ANY_INIT).
- *
- * Returns 0 on success, EAFNOSUPPORT if the jail doesn't allow IPv6.
- */
-int
-prison_get_ip6(struct ucred *cred, struct in6_addr *ia6)
-{
- struct prison *pr;
-
- KASSERT(cred != NULL, ("%s: cred is NULL", __func__));
- KASSERT(ia6 != NULL, ("%s: ia6 is NULL", __func__));
-
- pr = cred->cr_prison;
- if (!(pr->pr_flags & PR_IP6))
- return (0);
- mtx_lock(&pr->pr_mtx);
- if (!(pr->pr_flags & PR_IP6)) {
- mtx_unlock(&pr->pr_mtx);
- return (0);
- }
- if (pr->pr_ip6 == NULL) {
- mtx_unlock(&pr->pr_mtx);
- return (EAFNOSUPPORT);
- }
-
- bcopy(&pr->pr_ip6[0], ia6, sizeof(struct in6_addr));
- mtx_unlock(&pr->pr_mtx);
- return (0);
-}
-
-/*
- * Return 1 if we should do proper source address selection or are not jailed.
- * We will return 0 if we should bypass source address selection in favour
- * of the primary jail IPv6 address. Only in this case *ia will be updated and
- * returned in NBO.
- * Return EAFNOSUPPORT, in case this jail does not allow IPv6.
- */
-int
-prison_saddrsel_ip6(struct ucred *cred, struct in6_addr *ia6)
-{
- struct prison *pr;
- struct in6_addr lia6;
- int error;
-
- KASSERT(cred != NULL, ("%s: cred is NULL", __func__));
- KASSERT(ia6 != NULL, ("%s: ia6 is NULL", __func__));
-
- if (!jailed(cred))
- return (1);
-
- pr = cred->cr_prison;
- if (pr->pr_flags & PR_IP6_SADDRSEL)
- return (1);
-
- lia6 = in6addr_any;
- error = prison_get_ip6(cred, &lia6);
- if (error)
- return (error);
- if (IN6_IS_ADDR_UNSPECIFIED(&lia6))
- return (1);
-
- bcopy(&lia6, ia6, sizeof(struct in6_addr));
- return (0);
-}
-
-/*
- * Return true if pr1 and pr2 have the same IPv6 address restrictions.
- */
-int
-prison_equal_ip6(struct prison *pr1, struct prison *pr2)
-{
-
- if (pr1 == pr2)
- return (1);
-
- while (pr1 != &prison0 &&
-#ifdef VIMAGE
- !(pr1->pr_flags & PR_VNET) &&
-#endif
- !(pr1->pr_flags & PR_IP6_USER))
- pr1 = pr1->pr_parent;
- while (pr2 != &prison0 &&
-#ifdef VIMAGE
- !(pr2->pr_flags & PR_VNET) &&
-#endif
- !(pr2->pr_flags & PR_IP6_USER))
- pr2 = pr2->pr_parent;
- return (pr1 == pr2);
-}
-
-/*
- * Make sure our (source) address is set to something meaningful to this jail.
- *
- * v6only should be set based on (inp->inp_flags & IN6P_IPV6_V6ONLY != 0)
- * when needed while binding.
- *
- * Returns 0 if jail doesn't restrict IPv6 or if address belongs to jail,
- * EADDRNOTAVAIL if the address doesn't belong, or EAFNOSUPPORT if the jail
- * doesn't allow IPv6.
- */
-int
-prison_local_ip6(struct ucred *cred, struct in6_addr *ia6, int v6only)
-{
- struct prison *pr;
- int error;
-
- KASSERT(cred != NULL, ("%s: cred is NULL", __func__));
- KASSERT(ia6 != NULL, ("%s: ia6 is NULL", __func__));
-
- pr = cred->cr_prison;
- if (!(pr->pr_flags & PR_IP6))
- return (0);
- mtx_lock(&pr->pr_mtx);
- if (!(pr->pr_flags & PR_IP6)) {
- mtx_unlock(&pr->pr_mtx);
- return (0);
- }
- if (pr->pr_ip6 == NULL) {
- mtx_unlock(&pr->pr_mtx);
- return (EAFNOSUPPORT);
- }
-
- if (IN6_IS_ADDR_LOOPBACK(ia6)) {
- bcopy(&pr->pr_ip6[0], ia6, sizeof(struct in6_addr));
- mtx_unlock(&pr->pr_mtx);
- return (0);
- }
-
- if (IN6_IS_ADDR_UNSPECIFIED(ia6)) {
- /*
- * In case there is only 1 IPv6 address, and v6only is true,
- * then bind directly.
- */
- if (v6only != 0 && pr->pr_ip6s == 1)
- bcopy(&pr->pr_ip6[0], ia6, sizeof(struct in6_addr));
- mtx_unlock(&pr->pr_mtx);
- return (0);
- }
-
- error = _prison_check_ip6(pr, ia6);
- mtx_unlock(&pr->pr_mtx);
- return (error);
-}
-
-/*
- * Rewrite destination address in case we will connect to loopback address.
- *
- * Returns 0 on success, EAFNOSUPPORT if the jail doesn't allow IPv6.
- */
-int
-prison_remote_ip6(struct ucred *cred, struct in6_addr *ia6)
-{
- struct prison *pr;
-
- KASSERT(cred != NULL, ("%s: cred is NULL", __func__));
- KASSERT(ia6 != NULL, ("%s: ia6 is NULL", __func__));
-
- pr = cred->cr_prison;
- if (!(pr->pr_flags & PR_IP6))
- return (0);
- mtx_lock(&pr->pr_mtx);
- if (!(pr->pr_flags & PR_IP6)) {
- mtx_unlock(&pr->pr_mtx);
- return (0);
- }
- if (pr->pr_ip6 == NULL) {
- mtx_unlock(&pr->pr_mtx);
- return (EAFNOSUPPORT);
- }
-
- if (IN6_IS_ADDR_LOOPBACK(ia6)) {
- bcopy(&pr->pr_ip6[0], ia6, sizeof(struct in6_addr));
- mtx_unlock(&pr->pr_mtx);
- return (0);
- }
-
- /*
- * Return success because nothing had to be changed.
- */
- mtx_unlock(&pr->pr_mtx);
- return (0);
-}
-
-/*
- * Check if given address belongs to the jail referenced by cred/prison.
- *
- * Returns 0 if jail doesn't restrict IPv6 or if address belongs to jail,
- * EADDRNOTAVAIL if the address doesn't belong, or EAFNOSUPPORT if the jail
- * doesn't allow IPv6.
- */
-static int
-_prison_check_ip6(struct prison *pr, struct in6_addr *ia6)
-{
- int i, a, z, d;
-
- /*
- * Check the primary IP.
- */
- if (IN6_ARE_ADDR_EQUAL(&pr->pr_ip6[0], ia6))
- return (0);
-
- /*
- * All the other IPs are sorted so we can do a binary search.
- */
- a = 0;
- z = pr->pr_ip6s - 2;
- while (a <= z) {
- i = (a + z) / 2;
- d = qcmp_v6(&pr->pr_ip6[i+1], ia6);
- if (d > 0)
- z = i - 1;
- else if (d < 0)
- a = i + 1;
- else
- return (0);
- }
-
- return (EADDRNOTAVAIL);
-}
-
-int
-prison_check_ip6(struct ucred *cred, struct in6_addr *ia6)
-{
- struct prison *pr;
- int error;
-
- KASSERT(cred != NULL, ("%s: cred is NULL", __func__));
- KASSERT(ia6 != NULL, ("%s: ia6 is NULL", __func__));
-
- pr = cred->cr_prison;
- if (!(pr->pr_flags & PR_IP6))
- return (0);
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list