From 03c85e5becaff99353e0e8cbbd03fa10593d4221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=82=96=E5=9C=A8?= Date: Wed, 23 Oct 2024 13:50:12 +0800 Subject: [PATCH] fix memory leak in cryptsetup-generator.c --- ...-memory-leak-in-cryptsetup-generator.patch | 25 +++++++++++++++++++ systemd.spec | 6 ++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 backport-fix-memory-leak-in-cryptsetup-generator.patch diff --git a/backport-fix-memory-leak-in-cryptsetup-generator.patch b/backport-fix-memory-leak-in-cryptsetup-generator.patch new file mode 100644 index 0000000..14421ce --- /dev/null +++ b/backport-fix-memory-leak-in-cryptsetup-generator.patch @@ -0,0 +1,25 @@ +From 7ce0104da894efd4d43f25ae1f0e3454d085d9c8 Mon Sep 17 00:00:00 2001 +From: Daan De Meyer +Date: Fri, 31 May 2024 11:33:12 +0200 +Subject: [PATCH 7020/9500] cryptsetup-generator: Fix memory leak + +--- + src/cryptsetup/cryptsetup-generator.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c +index 904e4cd..1446ea3 100644 +--- a/src/cryptsetup/cryptsetup-generator.c ++++ b/src/cryptsetup/cryptsetup-generator.c +@@ -578,6 +578,8 @@ static crypto_device* crypt_device_free(crypto_device *d) { + free(d->uuid); + free(d->keyfile); + free(d->keydev); ++ free(d->headerdev); ++ free(d->datadev); + free(d->name); + free(d->options); + return mfree(d); +-- +2.33.0 + diff --git a/systemd.spec b/systemd.spec index b114f4c..c12797e 100644 --- a/systemd.spec +++ b/systemd.spec @@ -25,7 +25,7 @@ Name: systemd Url: https://systemd.io/ Version: 255 -Release: 29 +Release: 30 License: MIT and LGPLv2+ and GPLv2+ Summary: System and Service Manager @@ -130,6 +130,7 @@ Patch9058: journal-don-t-enable-systemd-journald-audit.socket.patch Patch9801: Systemd-Add-sw64-architecture.patch Patch9802: backport-repart-fix-memory-leak.patch +Patch9803: backport-fix-memory-leak-in-cryptsetup-generator.patch BuildRequires: gcc, gcc-c++ BuildRequires: libcap-devel, libmount-devel, pam-devel, libselinux-devel @@ -1666,6 +1667,9 @@ fi %{_unitdir}/veritysetup.target %changelog +* Tue Dec 10 2024 zhangyao - 255-30 +- DESC:fix memory leak in src/cryptsetup/cryptsetup-generator.c + * Mon Dec 09 2024 zhangyao - 255-29 - Add dbus requires for systemd-logind.service -- Gitee