diff options
Diffstat (limited to 'meta-networking/recipes-daemons/ptpd/ptpd')
3 files changed, 42 insertions, 3 deletions
diff --git a/meta-networking/recipes-daemons/ptpd/ptpd/0001-ptpd-Solve-memory-leak-for-function-NTPDCrequest.patch b/meta-networking/recipes-daemons/ptpd/ptpd/0001-ptpd-Solve-memory-leak-for-function-NTPDCrequest.patch new file mode 100644 index 0000000000..b2caeba2ca --- /dev/null +++ b/meta-networking/recipes-daemons/ptpd/ptpd/0001-ptpd-Solve-memory-leak-for-function-NTPDCrequest.patch @@ -0,0 +1,40 @@ +From 3886219c5c1fdca114dd480b46ce211762e30742 Mon Sep 17 00:00:00 2001 +From: Li Zhou <li.zhou@windriver.com> +Date: Tue, 30 Jun 2020 13:50:11 +0800 +Subject: [PATCH] ptpd: Solve memory leak for function NTPDCrequest + +Solve the memory leak in function NTPDCrequest detected by valgrind tool. + +Memory leak log example: +==619== 21 bytes in 1 blocks are still reachable in loss record 1 of 3 +==619== at 0x4A09DB0: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) +==619== by 0x43512E: NTPDCrequest (ntpdcontrol.c:255) +==619== by 0x43512E: NTPDCquery.isra.1 (ntpdcontrol.c:683) +==619== by 0x4359EE: ntpdInControl (ntpdcontrol.c:807) +==619== by 0x4364F5: ntpServiceUpdate (timingdomain.c:622) +==619== by 0x436935: timingDomainUpdate (timingdomain.c:756) +==619== by 0x4334A7: protocol (protocol.c:263) +==619== by 0x402BAE: main (ptpd.c:131) + +Upstream-Status: Pending + +Signed-off-by: Li Zhou <li.zhou@windriver.com> +--- + src/dep/ntpengine/ntpdcontrol.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/dep/ntpengine/ntpdcontrol.c b/src/dep/ntpengine/ntpdcontrol.c +index bfe0b5e..b1973cb 100644 +--- a/src/dep/ntpengine/ntpdcontrol.c ++++ b/src/dep/ntpengine/ntpdcontrol.c +@@ -271,6 +271,7 @@ NTPDCrequest( + + if (!auth) { + qpkt.auth_seq = AUTH_SEQ(0, 0); ++ free(key); + return ntpSend(control, (Octet *)&qpkt, req_pkt_size); + } + +-- +1.9.1 + diff --git a/meta-networking/recipes-daemons/ptpd/ptpd/Fixed-100-CPU-using-issue-by-adding-minimum-POSIX-ti.patch b/meta-networking/recipes-daemons/ptpd/ptpd/Fixed-100-CPU-using-issue-by-adding-minimum-POSIX-ti.patch index 1d2a5368c1..91028d82bc 100644 --- a/meta-networking/recipes-daemons/ptpd/ptpd/Fixed-100-CPU-using-issue-by-adding-minimum-POSIX-ti.patch +++ b/meta-networking/recipes-daemons/ptpd/ptpd/Fixed-100-CPU-using-issue-by-adding-minimum-POSIX-ti.patch @@ -8,8 +8,7 @@ Added minimum POSIX timer interval to prevent from timers firing to quickly for the process to handle, resulting in 100% CPU and endless signal queue. -Upstream-status: Backport -[From commit 1f0baae98a7b23e85f2bfd8f5de64795421c270e: +Upstream-Status: Backport [From commit 1f0baae98a7b23e85f2bfd8f5de64795421c270e: - critical: added minimum POSIX timer interval to prevent from timers firing to quickly for the process to handle, resulting in 100% CPU and endless signal queue] diff --git a/meta-networking/recipes-daemons/ptpd/ptpd/ptpd-use-pkgconfig.patch b/meta-networking/recipes-daemons/ptpd/ptpd/ptpd-use-pkgconfig.patch index e4578dda74..cb8c81385b 100644 --- a/meta-networking/recipes-daemons/ptpd/ptpd/ptpd-use-pkgconfig.patch +++ b/meta-networking/recipes-daemons/ptpd/ptpd/ptpd-use-pkgconfig.patch @@ -6,7 +6,7 @@ Subject: [PATCH] ptpd: use pkgconfig Yocto uses pkg-config for libpcap, rather than pcap-config, so use that instead as the source for libs and cflags. -Upstream-status: Inappropriate [ embedded specific ] +Upstream-Status: Inappropriate [ embedded specific ] Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> --- |