diff options
| author |   Li Zhou <li.zhou@windriver.com> | 2020-11-30 13:19:59 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2020-11-29 22:02:14 -0800 |
| commit | 885149082bbf2d9321439ccbe6e543e4c2c56ff2 (patch) | |
| tree | 07096539c270b3ced63a593b3a161055227c2c89 /meta-networking/recipes-daemons | |
| parent | 666a8b94a34c0248b02f37136ae052ca36e6b428 (diff) | |
| download | meta-openembedded-contrib-885149082bbf2d9321439ccbe6e543e4c2c56ff2.tar.gz | |
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)
Signed-off-by: Li Zhou <li.zhou@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-daemons')
| -rw-r--r-- | meta-networking/recipes-daemons/ptpd/ptpd/0001-ptpd-Solve-memory-leak-for-function-NTPDCrequest.patch | 40 | ||||
| -rw-r--r-- | meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb | 1 |
2 files changed, 41 insertions, 0 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_2.3.1.bb b/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb index cab0d9435f..227c9f9170 100644 --- a/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb +++ b/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb @@ -24,6 +24,7 @@ def get_sub(d): SRC_URI = "http://downloads.sourceforge.net/project/ptpd/ptpd/${@get_sub(d)}/ptpd-${PV}.tar.gz \ file://ptpd-use-pkgconfig.patch \ file://Fixed-100-CPU-using-issue-by-adding-minimum-POSIX-ti.patch \ + file://0001-ptpd-Solve-memory-leak-for-function-NTPDCrequest.patch \ file://ptpd.service \ file://ptpd.conf \ " |