b707fdb119
Support multiple domain numbers for each uds socket used in HA phc2sys. The ha_domainNumber option is an interface setting to configure the domain number for an uds socket. It ranges from 0 to 127. If the ha_domainNumber is not configured for a given interface, the global domainNumber setting is used. Test plan: PASS: Verify use of ha_domainNumber configuration in manual configuration. Failure path: domain number match PASS: Verify that phc2sys fails to start if domain number doesn't match ptp4l instance parameter. Regression: PASS: Verify use of global domain number in manual configuration. PASS: Verify auto configuration uses global domain number. Story: 2010723 Task: 48656 Change-Id: If71775f6ce02586573f005c3b3e805b5351a5a86 Signed-off-by: Andre Mauricio Zelak <andre.zelak@windriver.com>
92 lines
2.6 KiB
Diff
92 lines
2.6 KiB
Diff
From 5aacbe319db97907a15741005e2790bbf4c742a0 Mon Sep 17 00:00:00 2001
|
|
From: Andre Mauricio Zelak <andre.zelak@windriver.com>
|
|
Date: Mon, 12 Jun 2023 15:37:46 -0300
|
|
Subject: [PATCH 26/48] phc2sys: Fix null pointer de-reference in manual mode.
|
|
|
|
If both the -w and -O command line options are specified (or when
|
|
using -w when both source and destination clocks are PHCs), then
|
|
pointer to the PMC agent will be incorrectly freed.
|
|
|
|
Fix the segfault by introducing a method to "disable" the agent as was
|
|
done before the PMC agent code was introduced.
|
|
|
|
Unfortunately the resulting PMC agent API now has both create/destroy
|
|
and init/disable methods. This clunky arrangement can be cleaned up
|
|
later on, but it entails re-factoring the phc2sys program even more.
|
|
|
|
Signed-off-by: Richard Cochran <richardcochran@gmail.com>
|
|
Fixes: 8266987 ("pmc_agent: Hide the implementation.")
|
|
|
|
[commit 68fd0b010e9761e3dc580026eb6f2366c7c8e82d upstream]
|
|
Signed-off-by: Andre Mauricio Zelak <andre.zelak@windriver.com>
|
|
---
|
|
phc2sys.c | 7 ++-----
|
|
pmc_agent.c | 8 ++++++++
|
|
pmc_agent.h | 6 ++++++
|
|
3 files changed, 16 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/phc2sys.c b/phc2sys.c
|
|
index cbe80f2..3cafbb2 100644
|
|
--- a/phc2sys.c
|
|
+++ b/phc2sys.c
|
|
@@ -1340,8 +1340,7 @@ int main(int argc, char *argv[])
|
|
if (priv.forced_sync_offset ||
|
|
(src->clkid != CLOCK_REALTIME && dst->clkid != CLOCK_REALTIME) ||
|
|
src->clkid == CLOCK_INVALID) {
|
|
- pmc_agent_destroy(priv.node);
|
|
- priv.node = NULL;
|
|
+ pmc_agent_disable(priv.node);
|
|
}
|
|
}
|
|
|
|
@@ -1355,9 +1354,7 @@ int main(int argc, char *argv[])
|
|
}
|
|
|
|
end:
|
|
- if (priv.node) {
|
|
- pmc_agent_destroy(priv.node);
|
|
- }
|
|
+ pmc_agent_destroy(priv.node);
|
|
clock_cleanup(&priv);
|
|
port_cleanup(&priv);
|
|
config_destroy(cfg);
|
|
diff --git a/pmc_agent.c b/pmc_agent.c
|
|
index 22af306..833d1c1 100644
|
|
--- a/pmc_agent.c
|
|
+++ b/pmc_agent.c
|
|
@@ -366,6 +366,14 @@ void pmc_agent_destroy(struct pmc_agent *agent)
|
|
free(agent);
|
|
}
|
|
|
|
+void pmc_agent_disable(struct pmc_agent *agent)
|
|
+{
|
|
+ if (agent->pmc) {
|
|
+ pmc_destroy(agent->pmc);
|
|
+ }
|
|
+ agent->pmc = NULL;
|
|
+}
|
|
+
|
|
int pmc_agent_get_leap(struct pmc_agent *agent)
|
|
{
|
|
return agent->leap;
|
|
diff --git a/pmc_agent.h b/pmc_agent.h
|
|
index 483a21b..0ed10f8 100644
|
|
--- a/pmc_agent.h
|
|
+++ b/pmc_agent.h
|
|
@@ -55,6 +55,12 @@ struct pmc_agent *pmc_agent_create(void);
|
|
*/
|
|
void pmc_agent_destroy(struct pmc_agent *agent);
|
|
|
|
+/**
|
|
+ * Disconnects the PMC agent from the ptp4l service.
|
|
+ * @param agent Pointer to a PMC instance obtained via @ref pmc_agent_create().
|
|
+ */
|
|
+void pmc_agent_disable(struct pmc_agent *agent);
|
|
+
|
|
/**
|
|
* Gets the current leap adjustment.
|
|
* @param agent Pointer to a PMC instance obtained via @ref pmc_agent_create().
|
|
--
|
|
2.25.1
|
|
|