diff mbox

systemd: add security fix

Message ID fece5e5b122b3b81b63d6394163c462d4790b8b7.1498675471.git.baruch@tkos.co.il
State Accepted
Commit 6da327adb21d1cb0f1962b2cadae256ba217972a
Headers show

Commit Message

Baruch Siach June 28, 2017, 6:44 p.m. UTC
Add a fix for CVE-2017-9445: a specially crafted TCP payload might cause
memory corruption.

The other patch fixes an issue with the security fix.

Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 package/systemd/systemd.hash | 2 ++
 package/systemd/systemd.mk   | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

Comments

Peter Korsgaard June 28, 2017, 9:23 p.m. UTC | #1
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:

 > Add a fix for CVE-2017-9445: a specially crafted TCP payload might cause
 > memory corruption.

Great, it was still on my TODO list. I've extended the commit message
with the CVE description from MITRE to make it clear that this is an
issue in systemd-resolved and committed, thanks.
Peter Korsgaard July 2, 2017, 1:34 p.m. UTC | #2
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:

 > Add a fix for CVE-2017-9445: a specially crafted TCP payload might cause
 > memory corruption.

 > The other patch fixes an issue with the security fix.

 > Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
 > Cc: Yann E. MORIN <yann.morin.1998@free.fr>
 > Signed-off-by: Baruch Siach <baruch@tkos.co.il>

Committed to 2017.02.x and 2017.05.x, thanks.
diff mbox

Patch

diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash
index b5cb1ca0c572..77a680d177e8 100644
--- a/package/systemd/systemd.hash
+++ b/package/systemd/systemd.hash
@@ -1,3 +1,5 @@ 
 # sha256 locally computed
 sha256 8b3e99da3d4164b66581830a7f2436c0c8fe697b5fbdc3927bdb960646be0083  systemd-233.tar.gz
 sha256 eed8fef0045876e9efa0ba6725ed9ea93654bf24d67bb5aad467a341ad375883  a924f43f30f9c4acaf70618dd2a055f8b0f166be.patch
+sha256 43c75bd161a8ef0de5db607aaceed77220f2ba4903cf44e7e9db544980420a5e  db848813bae4d28c524b3b6a7dad135e426659ce.patch
+sha256 451f7c09332479ebe4ac01612f5f034df4524e16b5bc5d1c8ddcda14e9f3cd69  88795538726a5bbfd9efc13d441cb05e1d7fc139.patch
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 153d615340ba..a853434717bb 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -20,7 +20,9 @@  SYSTEMD_PROVIDES = udev
 SYSTEMD_AUTORECONF = YES
 
 SYSTEMD_PATCH = \
-	https://github.com/systemd/systemd/commit/a924f43f30f9c4acaf70618dd2a055f8b0f166be.patch
+	https://github.com/systemd/systemd/commit/a924f43f30f9c4acaf70618dd2a055f8b0f166be.patch \
+	https://github.com/systemd/systemd/commit/db848813bae4d28c524b3b6a7dad135e426659ce.patch \
+	https://github.com/systemd/systemd/commit/88795538726a5bbfd9efc13d441cb05e1d7fc139.patch
 
 # Make sure that systemd will always be built after busybox so that we have
 # a consistent init setup between two builds