dcavalca / rpms / linuxptp

Forked from rpms/linuxptp 2 years ago
Clone
c547f6
Patches backported from the upstream repository.
c547f6
c547f6
commit acc045034dd0db9dd4c4aca4b26528f8fed2ae78
c547f6
Author: Miroslav Lichvar <mlichvar@redhat.com>
c547f6
Date:   Thu Feb 11 16:47:08 2021 +0100
c547f6
c547f6
    port: Ignore non-management messages on UDS port.
c547f6
    
c547f6
    Drop non-management messages on the UDS port early in the processing to
c547f6
    prevent them from changing the port or clock state.
c547f6
    
c547f6
    Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
c547f6
c547f6
diff --git a/port.c b/port.c
c547f6
index fa49663..3fd06b1 100644
c547f6
--- a/port.c
c547f6
+++ b/port.c
c547f6
@@ -56,6 +56,7 @@ enum syfu_event {
c547f6
 };
c547f6
 
c547f6
 static int port_is_ieee8021as(struct port *p);
c547f6
+static int port_is_uds(struct port *p);
c547f6
 static void port_nrate_initialize(struct port *p);
c547f6
 
c547f6
 static int announce_compare(struct ptp_message *m1, struct ptp_message *m2)
c547f6
@@ -691,6 +692,9 @@ static int port_ignore(struct port *p, struct ptp_message *m)
c547f6
 {
c547f6
 	struct ClockIdentity c1, c2;
c547f6
 
c547f6
+	if (port_is_uds(p) && msg_type(m) != MANAGEMENT) {
c547f6
+		return 1;
c547f6
+	}
c547f6
 	if (incapable_ignore(p, m)) {
c547f6
 		return 1;
c547f6
 	}
c547f6
@@ -771,6 +775,11 @@ static int port_is_ieee8021as(struct port *p)
c547f6
 	return p->follow_up_info ? 1 : 0;
c547f6
 }
c547f6
 
c547f6
+static int port_is_uds(struct port *p)
c547f6
+{
c547f6
+	return transport_type(p->trp) == TRANS_UDS;
c547f6
+}
c547f6
+
c547f6
 static void port_management_send_error(struct port *p, struct port *ingress,
c547f6
 				       struct ptp_message *msg, int error_id)
c547f6
 {
c547f6
c547f6
commit 72ec806fa62a87cb7e5444e27fa6bdcbfe4e27ca
c547f6
Author: Miroslav Lichvar <mlichvar@redhat.com>
c547f6
Date:   Thu Feb 11 16:47:09 2021 +0100
c547f6
c547f6
    clock: Don't allow COMMAND action on non-UDS port.
c547f6
    
c547f6
    No COMMAND actions are currently supported, but check the port early in
c547f6
    clock_manage() before reaching port_manage().
c547f6
    
c547f6
    Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
c547f6
c547f6
diff --git a/clock.c b/clock.c
c547f6
index a66d189..a6947bc 100644
c547f6
--- a/clock.c
c547f6
+++ b/clock.c
c547f6
@@ -1423,6 +1423,11 @@ int clock_manage(struct clock *c, struct port *p, struct ptp_message *msg)
c547f6
 			return changed;
c547f6
 		break;
c547f6
 	case COMMAND:
c547f6
+		if (p != c->uds_port) {
c547f6
+			/* Sorry, only allowed on the UDS port. */
c547f6
+			clock_management_send_error(p, msg, TLV_NOT_SUPPORTED);
c547f6
+			return changed;
c547f6
+		}
c547f6
 		break;
c547f6
 	default:
c547f6
 		return changed;
c547f6
c547f6
commit 2b45d80eadcb81c8bdf45baf98dabeebd912b1b0
c547f6
Author: Miroslav Lichvar <mlichvar@redhat.com>
c547f6
Date:   Thu Feb 11 16:47:10 2021 +0100
c547f6
c547f6
    clock: Rename UDS variables to read-write.
c547f6
    
c547f6
    In preparation for a new read-only UDS port, rename variables of the
c547f6
    current UDS port to make it clear it is read-write, as opposed to
c547f6
    read-only.
c547f6
    
c547f6
    Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
c547f6
c547f6
diff --git a/clock.c b/clock.c
c547f6
index a6947bc..d013b19 100644
c547f6
--- a/clock.c
c547f6
+++ b/clock.c
c547f6
@@ -95,7 +95,7 @@ struct clock {
c547f6
 	struct foreign_clock *best;
c547f6
 	struct ClockIdentity best_id;
c547f6
 	LIST_HEAD(ports_head, port) ports;
c547f6
-	struct port *uds_port;
c547f6
+	struct port *uds_rw_port;
c547f6
 	struct pollfd *pollfd;
c547f6
 	int pollfd_valid;
c547f6
 	int nports; /* does not include the UDS port */
c547f6
@@ -129,7 +129,7 @@ struct clock {
c547f6
 	struct clock_stats stats;
c547f6
 	int stats_interval;
c547f6
 	struct clockcheck *sanity_check;
c547f6
-	struct interface *udsif;
c547f6
+	struct interface *uds_rw_if;
c547f6
 	LIST_HEAD(clock_subscribers_head, clock_subscriber) subscribers;
c547f6
 	struct monitor *slave_event_monitor;
c547f6
 };
c547f6
@@ -245,7 +245,7 @@ void clock_send_notification(struct clock *c, struct ptp_message *msg,
c547f6
 {
c547f6
 	unsigned int event_pos = event / 8;
c547f6
 	uint8_t mask = 1 << (event % 8);
c547f6
-	struct port *uds = c->uds_port;
c547f6
+	struct port *uds = c->uds_rw_port;
c547f6
 	struct clock_subscriber *s;
c547f6
 
c547f6
 	LIST_FOREACH(s, &c->subscribers, list) {
c547f6
@@ -267,13 +267,13 @@ void clock_destroy(struct clock *c)
c547f6
 {
c547f6
 	struct port *p, *tmp;
c547f6
 
c547f6
-	interface_destroy(c->udsif);
c547f6
+	interface_destroy(c->uds_rw_if);
c547f6
 	clock_flush_subscriptions(c);
c547f6
 	LIST_FOREACH_SAFE(p, &c->ports, list, tmp) {
c547f6
 		clock_remove_port(c, p);
c547f6
 	}
c547f6
 	monitor_destroy(c->slave_event_monitor);
c547f6
-	port_close(c->uds_port);
c547f6
+	port_close(c->uds_rw_port);
c547f6
 	free(c->pollfd);
c547f6
 	if (c->clkid != CLOCK_REALTIME) {
c547f6
 		phc_close(c->clkid);
c547f6
@@ -442,7 +442,7 @@ static int clock_management_fill_response(struct clock *c, struct port *p,
c547f6
 		datalen = sizeof(*gsn);
c547f6
 		break;
c547f6
 	case TLV_SUBSCRIBE_EVENTS_NP:
c547f6
-		if (p != c->uds_port) {
c547f6
+		if (p != c->uds_rw_port) {
c547f6
 			/* Only the UDS port allowed. */
c547f6
 			break;
c547f6
 		}
c547f6
@@ -784,7 +784,7 @@ static int forwarding(struct clock *c, struct port *p)
c547f6
 	default:
c547f6
 		break;
c547f6
 	}
c547f6
-	if (p == c->uds_port && ps != PS_FAULTY) {
c547f6
+	if (p == c->uds_rw_port && ps != PS_FAULTY) {
c547f6
 		return 1;
c547f6
 	}
c547f6
 	return 0;
c547f6
@@ -1044,20 +1044,20 @@ struct clock *clock_create(enum clock_type type, struct config *config,
c547f6
 
c547f6
 	/* Configure the UDS. */
c547f6
 	uds_ifname = config_get_string(config, NULL, "uds_address");
c547f6
-	c->udsif = interface_create(uds_ifname);
c547f6
-	if (config_set_section_int(config, interface_name(c->udsif),
c547f6
+	c->uds_rw_if = interface_create(uds_ifname);
c547f6
+	if (config_set_section_int(config, interface_name(c->uds_rw_if),
c547f6
 				   "announceReceiptTimeout", 0)) {
c547f6
 		return NULL;
c547f6
 	}
c547f6
-	if (config_set_section_int(config, interface_name(c->udsif),
c547f6
+	if (config_set_section_int(config, interface_name(c->uds_rw_if),
c547f6
 				    "delay_mechanism", DM_AUTO)) {
c547f6
 		return NULL;
c547f6
 	}
c547f6
-	if (config_set_section_int(config, interface_name(c->udsif),
c547f6
+	if (config_set_section_int(config, interface_name(c->uds_rw_if),
c547f6
 				    "network_transport", TRANS_UDS)) {
c547f6
 		return NULL;
c547f6
 	}
c547f6
-	if (config_set_section_int(config, interface_name(c->udsif),
c547f6
+	if (config_set_section_int(config, interface_name(c->uds_rw_if),
c547f6
 				   "delay_filter_length", 1)) {
c547f6
 		return NULL;
c547f6
 	}
c547f6
@@ -1180,14 +1180,15 @@ struct clock *clock_create(enum clock_type type, struct config *config,
c547f6
 	}
c547f6
 
c547f6
 	/* Create the UDS interface. */
c547f6
-	c->uds_port = port_open(phc_device, phc_index, timestamping, 0, c->udsif, c);
c547f6
-	if (!c->uds_port) {
c547f6
+	c->uds_rw_port = port_open(phc_device, phc_index, timestamping, 0,
c547f6
+				   c->uds_rw_if, c);
c547f6
+	if (!c->uds_rw_port) {
c547f6
 		pr_err("failed to open the UDS port");
c547f6
 		return NULL;
c547f6
 	}
c547f6
 	clock_fda_changed(c);
c547f6
 
c547f6
-	c->slave_event_monitor = monitor_create(config, c->uds_port);
c547f6
+	c->slave_event_monitor = monitor_create(config, c->uds_rw_port);
c547f6
 	if (!c->slave_event_monitor) {
c547f6
 		pr_err("failed to create slave event monitor");
c547f6
 		return NULL;
c547f6
@@ -1206,7 +1207,7 @@ struct clock *clock_create(enum clock_type type, struct config *config,
c547f6
 	LIST_FOREACH(p, &c->ports, list) {
c547f6
 		port_dispatch(p, EV_INITIALIZE, 0);
c547f6
 	}
c547f6
-	port_dispatch(c->uds_port, EV_INITIALIZE, 0);
c547f6
+	port_dispatch(c->uds_rw_port, EV_INITIALIZE, 0);
c547f6
 
c547f6
 	return c;
c547f6
 }
c547f6
@@ -1314,7 +1315,7 @@ static void clock_check_pollfd(struct clock *c)
c547f6
 		clock_fill_pollfd(dest, p);
c547f6
 		dest += N_CLOCK_PFD;
c547f6
 	}
c547f6
-	clock_fill_pollfd(dest, c->uds_port);
c547f6
+	clock_fill_pollfd(dest, c->uds_rw_port);
c547f6
 	c->pollfd_valid = 1;
c547f6
 }
c547f6
 
c547f6
@@ -1331,7 +1332,7 @@ static int clock_do_forward_mgmt(struct clock *c,
c547f6
 		return 0;
c547f6
 
c547f6
 	/* Don't forward any requests to the UDS port. */
c547f6
-	if (out == c->uds_port) {
c547f6
+	if (out == c->uds_rw_port) {
c547f6
 		switch (management_action(msg)) {
c547f6
 		case GET:
c547f6
 		case SET:
c547f6
@@ -1362,7 +1363,7 @@ static void clock_forward_mgmt_msg(struct clock *c, struct port *p, struct ptp_m
c547f6
 				pr_err("port %d: management forward failed",
c547f6
 				       port_number(piter));
c547f6
 		}
c547f6
-		if (clock_do_forward_mgmt(c, p, c->uds_port, msg, &msg_ready))
c547f6
+		if (clock_do_forward_mgmt(c, p, c->uds_rw_port, msg, &msg_ready))
c547f6
 			pr_err("uds port: management forward failed");
c547f6
 		if (msg_ready) {
c547f6
 			msg_post_recv(msg, pdulen);
c547f6
@@ -1414,7 +1415,7 @@ int clock_manage(struct clock *c, struct port *p, struct ptp_message *msg)
c547f6
 			clock_management_send_error(p, msg, TLV_WRONG_LENGTH);
c547f6
 			return changed;
c547f6
 		}
c547f6
-		if (p != c->uds_port) {
c547f6
+		if (p != c->uds_rw_port) {
c547f6
 			/* Sorry, only allowed on the UDS port. */
c547f6
 			clock_management_send_error(p, msg, TLV_NOT_SUPPORTED);
c547f6
 			return changed;
c547f6
@@ -1423,7 +1424,7 @@ int clock_manage(struct clock *c, struct port *p, struct ptp_message *msg)
c547f6
 			return changed;
c547f6
 		break;
c547f6
 	case COMMAND:
c547f6
-		if (p != c->uds_port) {
c547f6
+		if (p != c->uds_rw_port) {
c547f6
 			/* Sorry, only allowed on the UDS port. */
c547f6
 			clock_management_send_error(p, msg, TLV_NOT_SUPPORTED);
c547f6
 			return changed;
c547f6
@@ -1435,7 +1436,7 @@ int clock_manage(struct clock *c, struct port *p, struct ptp_message *msg)
c547f6
 
c547f6
 	switch (mgt->id) {
c547f6
 	case TLV_PORT_PROPERTIES_NP:
c547f6
-		if (p != c->uds_port) {
c547f6
+		if (p != c->uds_rw_port) {
c547f6
 			/* Only the UDS port allowed. */
c547f6
 			clock_management_send_error(p, msg, TLV_NOT_SUPPORTED);
c547f6
 			return 0;
c547f6
@@ -1500,7 +1501,7 @@ int clock_manage(struct clock *c, struct port *p, struct ptp_message *msg)
c547f6
 
c547f6
 void clock_notify_event(struct clock *c, enum notification event)
c547f6
 {
c547f6
-	struct port *uds = c->uds_port;
c547f6
+	struct port *uds = c->uds_rw_port;
c547f6
 	struct PortIdentity pid = port_identity(uds);
c547f6
 	struct ptp_message *msg;
c547f6
 	int id;
c547f6
@@ -1604,7 +1605,7 @@ int clock_poll(struct clock *c)
c547f6
 	/* Check the UDS port. */
c547f6
 	for (i = 0; i < N_POLLFD; i++) {
c547f6
 		if (cur[i].revents & (POLLIN|POLLPRI)) {
c547f6
-			event = port_event(c->uds_port, i);
c547f6
+			event = port_event(c->uds_rw_port, i);
c547f6
 			if (EV_STATE_DECISION_EVENT == event) {
c547f6
 				c->sde = 1;
c547f6
 			}
c547f6
c547f6
commit 1f74a16502b55ce8eaed3d7488542e5469ac8263
c547f6
Author: Miroslav Lichvar <mlichvar@redhat.com>
c547f6
Date:   Thu Feb 11 16:47:11 2021 +0100
c547f6
c547f6
    clock: Add read-only UDS port for monitoring.
c547f6
    
c547f6
    Add a second UDS port to allow untrusted applications to monitor ptp4l.
c547f6
    On this "read-only" UDS port disable non-GET actions and forwarding.
c547f6
    The path can be configured with the uds_ro_address option (default is
c547f6
    /var/run/ptp4lro).
c547f6
    
c547f6
    Forwarding is disabled to limit the access to the local ptp4l instance.
c547f6
    
c547f6
    Subscriptions are not enabled to prevent the applications from making a
c547f6
    large number of subscriptions or interfere with applications that have
c547f6
    access to the read-write UDS port.
c547f6
    
c547f6
    Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
c547f6
c547f6
diff --git a/clock.c b/clock.c
c547f6
index d013b19..8592d29 100644
c547f6
--- a/clock.c
c547f6
+++ b/clock.c
c547f6
@@ -96,9 +96,10 @@ struct clock {
c547f6
 	struct ClockIdentity best_id;
c547f6
 	LIST_HEAD(ports_head, port) ports;
c547f6
 	struct port *uds_rw_port;
c547f6
+	struct port *uds_ro_port;
c547f6
 	struct pollfd *pollfd;
c547f6
 	int pollfd_valid;
c547f6
-	int nports; /* does not include the UDS port */
c547f6
+	int nports; /* does not include the two UDS ports */
c547f6
 	int last_port_number;
c547f6
 	int sde;
c547f6
 	int free_running;
c547f6
@@ -130,6 +131,7 @@ struct clock {
c547f6
 	int stats_interval;
c547f6
 	struct clockcheck *sanity_check;
c547f6
 	struct interface *uds_rw_if;
c547f6
+	struct interface *uds_ro_if;
c547f6
 	LIST_HEAD(clock_subscribers_head, clock_subscriber) subscribers;
c547f6
 	struct monitor *slave_event_monitor;
c547f6
 };
c547f6
@@ -268,12 +270,14 @@ void clock_destroy(struct clock *c)
c547f6
 	struct port *p, *tmp;
c547f6
 
c547f6
 	interface_destroy(c->uds_rw_if);
c547f6
+	interface_destroy(c->uds_ro_if);
c547f6
 	clock_flush_subscriptions(c);
c547f6
 	LIST_FOREACH_SAFE(p, &c->ports, list, tmp) {
c547f6
 		clock_remove_port(c, p);
c547f6
 	}
c547f6
 	monitor_destroy(c->slave_event_monitor);
c547f6
 	port_close(c->uds_rw_port);
c547f6
+	port_close(c->uds_ro_port);
c547f6
 	free(c->pollfd);
c547f6
 	if (c->clkid != CLOCK_REALTIME) {
c547f6
 		phc_close(c->clkid);
c547f6
@@ -443,7 +447,7 @@ static int clock_management_fill_response(struct clock *c, struct port *p,
c547f6
 		break;
c547f6
 	case TLV_SUBSCRIBE_EVENTS_NP:
c547f6
 		if (p != c->uds_rw_port) {
c547f6
-			/* Only the UDS port allowed. */
c547f6
+			/* Only the UDS-RW port allowed. */
c547f6
 			break;
c547f6
 		}
c547f6
 		sen = (struct subscribe_events_np *)tlv->data;
c547f6
@@ -774,6 +778,10 @@ static int clock_utc_correct(struct clock *c, tmv_t ingress)
c547f6
 static int forwarding(struct clock *c, struct port *p)
c547f6
 {
c547f6
 	enum port_state ps = port_state(p);
c547f6
+
c547f6
+	if (p == c->uds_ro_port)
c547f6
+		return 0;
c547f6
+
c547f6
 	switch (ps) {
c547f6
 	case PS_MASTER:
c547f6
 	case PS_GRAND_MASTER:
c547f6
@@ -818,7 +826,7 @@ static int clock_add_port(struct clock *c, const char *phc_device,
c547f6
 {
c547f6
 	struct port *p, *piter, *lastp = NULL;
c547f6
 
c547f6
-	if (clock_resize_pollfd(c, c->nports + 1)) {
c547f6
+	if (clock_resize_pollfd(c, c->nports + 2)) {
c547f6
 		return -1;
c547f6
 	}
c547f6
 	p = port_open(phc_device, phc_index, timestamping,
c547f6
@@ -1043,6 +1051,7 @@ struct clock *clock_create(enum clock_type type, struct config *config,
c547f6
 	}
c547f6
 
c547f6
 	/* Configure the UDS. */
c547f6
+
c547f6
 	uds_ifname = config_get_string(config, NULL, "uds_address");
c547f6
 	c->uds_rw_if = interface_create(uds_ifname);
c547f6
 	if (config_set_section_int(config, interface_name(c->uds_rw_if),
c547f6
@@ -1062,6 +1071,25 @@ struct clock *clock_create(enum clock_type type, struct config *config,
c547f6
 		return NULL;
c547f6
 	}
c547f6
 
c547f6
+	uds_ifname = config_get_string(config, NULL, "uds_ro_address");
c547f6
+	c->uds_ro_if = interface_create(uds_ifname);
c547f6
+	if (config_set_section_int(config, interface_name(c->uds_ro_if),
c547f6
+				   "announceReceiptTimeout", 0)) {
c547f6
+		return NULL;
c547f6
+	}
c547f6
+	if (config_set_section_int(config, interface_name(c->uds_ro_if),
c547f6
+				   "delay_mechanism", DM_AUTO)) {
c547f6
+		return NULL;
c547f6
+	}
c547f6
+	if (config_set_section_int(config, interface_name(c->uds_ro_if),
c547f6
+				   "network_transport", TRANS_UDS)) {
c547f6
+		return NULL;
c547f6
+	}
c547f6
+	if (config_set_section_int(config, interface_name(c->uds_ro_if),
c547f6
+				   "delay_filter_length", 1)) {
c547f6
+		return NULL;
c547f6
+	}
c547f6
+
c547f6
 	c->config = config;
c547f6
 	c->free_running = config_get_int(config, NULL, "free_running");
c547f6
 	c->freq_est_interval = config_get_int(config, NULL, "freq_est_interval");
c547f6
@@ -1179,11 +1207,18 @@ struct clock *clock_create(enum clock_type type, struct config *config,
c547f6
 		return NULL;
c547f6
 	}
c547f6
 
c547f6
-	/* Create the UDS interface. */
c547f6
+	/* Create the UDS interfaces. */
c547f6
+
c547f6
 	c->uds_rw_port = port_open(phc_device, phc_index, timestamping, 0,
c547f6
 				   c->uds_rw_if, c);
c547f6
 	if (!c->uds_rw_port) {
c547f6
-		pr_err("failed to open the UDS port");
c547f6
+		pr_err("failed to open the UDS-RW port");
c547f6
+		return NULL;
c547f6
+	}
c547f6
+	c->uds_ro_port = port_open(phc_device, phc_index, timestamping, 0,
c547f6
+				   c->uds_ro_if, c);
c547f6
+	if (!c->uds_ro_port) {
c547f6
+		pr_err("failed to open the UDS-RO port");
c547f6
 		return NULL;
c547f6
 	}
c547f6
 	clock_fda_changed(c);
c547f6
@@ -1208,6 +1243,7 @@ struct clock *clock_create(enum clock_type type, struct config *config,
c547f6
 		port_dispatch(p, EV_INITIALIZE, 0);
c547f6
 	}
c547f6
 	port_dispatch(c->uds_rw_port, EV_INITIALIZE, 0);
c547f6
+	port_dispatch(c->uds_ro_port, EV_INITIALIZE, 0);
c547f6
 
c547f6
 	return c;
c547f6
 }
c547f6
@@ -1278,9 +1314,9 @@ static int clock_resize_pollfd(struct clock *c, int new_nports)
c547f6
 {
c547f6
 	struct pollfd *new_pollfd;
c547f6
 
c547f6
-	/* Need to allocate one whole extra block of fds for UDS. */
c547f6
+	/* Need to allocate two whole extra blocks of fds for UDS ports. */
c547f6
 	new_pollfd = realloc(c->pollfd,
c547f6
-			     (new_nports + 1) * N_CLOCK_PFD *
c547f6
+			     (new_nports + 2) * N_CLOCK_PFD *
c547f6
 			     sizeof(struct pollfd));
c547f6
 	if (!new_pollfd) {
c547f6
 		return -1;
c547f6
@@ -1316,6 +1352,8 @@ static void clock_check_pollfd(struct clock *c)
c547f6
 		dest += N_CLOCK_PFD;
c547f6
 	}
c547f6
 	clock_fill_pollfd(dest, c->uds_rw_port);
c547f6
+	dest += N_CLOCK_PFD;
c547f6
+	clock_fill_pollfd(dest, c->uds_ro_port);
c547f6
 	c->pollfd_valid = 1;
c547f6
 }
c547f6
 
c547f6
@@ -1331,7 +1369,8 @@ static int clock_do_forward_mgmt(struct clock *c,
c547f6
 	if (in == out || !forwarding(c, out))
c547f6
 		return 0;
c547f6
 
c547f6
-	/* Don't forward any requests to the UDS port. */
c547f6
+	/* Don't forward any requests to the UDS-RW port
c547f6
+	   (the UDS-RO port doesn't allow any forwarding). */
c547f6
 	if (out == c->uds_rw_port) {
c547f6
 		switch (management_action(msg)) {
c547f6
 		case GET:
c547f6
@@ -1416,7 +1455,7 @@ int clock_manage(struct clock *c, struct port *p, struct ptp_message *msg)
c547f6
 			return changed;
c547f6
 		}
c547f6
 		if (p != c->uds_rw_port) {
c547f6
-			/* Sorry, only allowed on the UDS port. */
c547f6
+			/* Sorry, only allowed on the UDS-RW port. */
c547f6
 			clock_management_send_error(p, msg, TLV_NOT_SUPPORTED);
c547f6
 			return changed;
c547f6
 		}
c547f6
@@ -1425,7 +1464,7 @@ int clock_manage(struct clock *c, struct port *p, struct ptp_message *msg)
c547f6
 		break;
c547f6
 	case COMMAND:
c547f6
 		if (p != c->uds_rw_port) {
c547f6
-			/* Sorry, only allowed on the UDS port. */
c547f6
+			/* Sorry, only allowed on the UDS-RW port. */
c547f6
 			clock_management_send_error(p, msg, TLV_NOT_SUPPORTED);
c547f6
 			return changed;
c547f6
 		}
c547f6
@@ -1437,7 +1476,7 @@ int clock_manage(struct clock *c, struct port *p, struct ptp_message *msg)
c547f6
 	switch (mgt->id) {
c547f6
 	case TLV_PORT_PROPERTIES_NP:
c547f6
 		if (p != c->uds_rw_port) {
c547f6
-			/* Only the UDS port allowed. */
c547f6
+			/* Only the UDS-RW port allowed. */
c547f6
 			clock_management_send_error(p, msg, TLV_NOT_SUPPORTED);
c547f6
 			return 0;
c547f6
 		}
c547f6
@@ -1548,7 +1587,7 @@ int clock_poll(struct clock *c)
c547f6
 	struct port *p;
c547f6
 
c547f6
 	clock_check_pollfd(c);
c547f6
-	cnt = poll(c->pollfd, (c->nports + 1) * N_CLOCK_PFD, -1);
c547f6
+	cnt = poll(c->pollfd, (c->nports + 2) * N_CLOCK_PFD, -1);
c547f6
 	if (cnt < 0) {
c547f6
 		if (EINTR == errno) {
c547f6
 			return 0;
c547f6
@@ -1602,7 +1641,7 @@ int clock_poll(struct clock *c)
c547f6
 		cur += N_CLOCK_PFD;
c547f6
 	}
c547f6
 
c547f6
-	/* Check the UDS port. */
c547f6
+	/* Check the UDS ports. */
c547f6
 	for (i = 0; i < N_POLLFD; i++) {
c547f6
 		if (cur[i].revents & (POLLIN|POLLPRI)) {
c547f6
 			event = port_event(c->uds_rw_port, i);
c547f6
@@ -1611,6 +1650,13 @@ int clock_poll(struct clock *c)
c547f6
 			}
c547f6
 		}
c547f6
 	}
c547f6
+	cur += N_CLOCK_PFD;
c547f6
+	for (i = 0; i < N_POLLFD; i++) {
c547f6
+		if (cur[i].revents & (POLLIN|POLLPRI)) {
c547f6
+			event = port_event(c->uds_ro_port, i);
c547f6
+			/* sde is not expected on the UDS-RO port */
c547f6
+		}
c547f6
+	}
c547f6
 
c547f6
 	if (c->sde) {
c547f6
 		handle_state_decision_event(c);
c547f6
diff --git a/config.c b/config.c
c547f6
index d237de9..96a5351 100644
c547f6
--- a/config.c
c547f6
+++ b/config.c
c547f6
@@ -323,6 +323,7 @@ struct config_item config_tab[] = {
c547f6
 	PORT_ITEM_INT("udp_ttl", 1, 1, 255),
c547f6
 	PORT_ITEM_INT("udp6_scope", 0x0E, 0x00, 0x0F),
c547f6
 	GLOB_ITEM_STR("uds_address", "/var/run/ptp4l"),
c547f6
+	GLOB_ITEM_STR("uds_ro_address", "/var/run/ptp4lro"),
c547f6
 	PORT_ITEM_INT("unicast_listen", 0, 0, 1),
c547f6
 	PORT_ITEM_INT("unicast_master_table", 0, 0, INT_MAX),
c547f6
 	PORT_ITEM_INT("unicast_req_duration", 3600, 10, INT_MAX),
c547f6
diff --git a/configs/default.cfg b/configs/default.cfg
c547f6
index 8c19129..d5bab7d 100644
c547f6
--- a/configs/default.cfg
c547f6
+++ b/configs/default.cfg
c547f6
@@ -90,6 +90,7 @@ p2p_dst_mac		01:80:C2:00:00:0E
c547f6
 udp_ttl			1
c547f6
 udp6_scope		0x0E
c547f6
 uds_address		/var/run/ptp4l
c547f6
+uds_ro_address		/var/run/ptp4lro
c547f6
 #
c547f6
 # Default interface options
c547f6
 #
c547f6
diff --git a/ptp4l.8 b/ptp4l.8
c547f6
index b179b81..f9bd228 100644
c547f6
--- a/ptp4l.8
c547f6
+++ b/ptp4l.8
c547f6
@@ -615,6 +615,12 @@ is only relevant with IPv6 transport.  See RFC 4291.  The default is
c547f6
 Specifies the address of the UNIX domain socket for receiving local
c547f6
 management messages. The default is /var/run/ptp4l.
c547f6
 .TP
c547f6
+.B uds_ro_address
c547f6
+Specifies the address of the second UNIX domain socket for receiving local
c547f6
+management messages, which is restricted to GET actions and does not forward
c547f6
+messages to other ports. Access to this socket can be given to untrusted
c547f6
+applications for monitoring purposes. The default is /var/run/ptp4lro.
c547f6
+.TP
c547f6
 .B dscp_event
c547f6
 Defines the Differentiated Services Codepoint (DSCP) to be used for PTP
c547f6
 event messages. Must be a value between 0 and 63. There are several media
c547f6
c547f6
commit d4c5343237588d265c605f3772337bc88cabe787
c547f6
Author: Miroslav Lichvar <mlichvar@redhat.com>
c547f6
Date:   Thu Feb 11 16:47:12 2021 +0100
c547f6
c547f6
    timemaster: Set uds_ro_address for ptp4l instances.
c547f6
    
c547f6
    This prevents conflicts on the new UDS-RO port.
c547f6
    
c547f6
    Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
c547f6
c547f6
diff --git a/timemaster.c b/timemaster.c
c547f6
index 00db59f..02408d6 100644
c547f6
--- a/timemaster.c
c547f6
+++ b/timemaster.c
c547f6
@@ -712,7 +712,7 @@ static int add_ptp_source(struct ptp_domain *source,
c547f6
 			  char **ntp_config, struct script *script)
c547f6
 {
c547f6
 	struct config_file *config_file;
c547f6
-	char **command, *uds_path, **interfaces, *message_tag;
c547f6
+	char **command, *uds_path, *uds_path2, **interfaces, *message_tag;
c547f6
 	char ts_interface[IF_NAMESIZE];
c547f6
 	int i, j, num_interfaces, *phc, *phcs, hw_ts, sw_ts;
c547f6
 	struct sk_ts_info ts_info;
c547f6
@@ -809,6 +809,8 @@ static int add_ptp_source(struct ptp_domain *source,
c547f6
 
c547f6
 		uds_path = string_newf("%s/ptp4l.%d.socket",
c547f6
 				       config->rundir, *shm_segment);
c547f6
+		uds_path2 = string_newf("%s/ptp4lro.%d.socket",
c547f6
+					config->rundir, *shm_segment);
c547f6
 
c547f6
 		message_tag = string_newf("[%d", source->domain);
c547f6
 		for (j = 0; interfaces[j]; j++)
c547f6
@@ -832,8 +834,10 @@ static int add_ptp_source(struct ptp_domain *source,
c547f6
 			       "slaveOnly 1\n"
c547f6
 			       "domainNumber %d\n"
c547f6
 			       "uds_address %s\n"
c547f6
+			       "uds_ro_address %s\n"
c547f6
 			       "message_tag %s\n",
c547f6
-			       source->domain, uds_path, message_tag);
c547f6
+			       source->domain, uds_path, uds_path2,
c547f6
+			       message_tag);
c547f6
 
c547f6
 		if (phcs[i] >= 0) {
c547f6
 			/* HW time stamping */
c547f6
@@ -868,6 +872,7 @@ static int add_ptp_source(struct ptp_domain *source,
c547f6
 
c547f6
 		free(message_tag);
c547f6
 		free(uds_path);
c547f6
+		free(uds_path2);
c547f6
 		free(interfaces);
c547f6
 	}
c547f6