From: Clemens Gruber <clemens.gruber@pqgruber.com>
To: ptxdist@pengutronix.de
Cc: Clemens Gruber <clemens.gruber@pqgruber.com>
Subject: [ptxdist] [PATCH] systemd: add upstream patch for CVE-2018-15688
Date: Mon, 19 Nov 2018 16:03:55 +0100 [thread overview]
Message-ID: <20181119150355.30233-3-clemens.gruber@pqgruber.com> (raw)
In-Reply-To: <20181119150355.30233-1-clemens.gruber@pqgruber.com>
The patch fixes the aforementioned bug in the systemd DHCP6 client.
Details: https://nvd.nist.gov/vuln/detail/CVE-2018-15688
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
...we-have-enough-space-for-the-DHCP6-o.patch | 22 +++++++++++++++++++
patches/systemd-239/series | 3 ++-
2 files changed, 24 insertions(+), 1 deletion(-)
create mode 100644 patches/systemd-239/0002-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch
diff --git a/patches/systemd-239/0002-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch b/patches/systemd-239/0002-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch
new file mode 100644
index 000000000..f1858b23d
--- /dev/null
+++ b/patches/systemd-239/0002-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch
@@ -0,0 +1,22 @@
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 19 Oct 2018 12:12:33 +0200
+Subject: [PATCH] dhcp6: make sure we have enough space for the DHCP6 option
+ header
+
+---
+ src/libsystemd-network/dhcp6-option.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libsystemd-network/dhcp6-option.c b/src/libsystemd-network/dhcp6-option.c
+index 18196b12573c..09794972991f 100644
+--- a/src/libsystemd-network/dhcp6-option.c
++++ b/src/libsystemd-network/dhcp6-option.c
+@@ -103,7 +103,7 @@ int dhcp6_option_append_ia(uint8_t **buf, size_t *buflen, DHCP6IA *ia) {
+ return -EINVAL;
+ }
+
+- if (*buflen < len)
++ if (*buflen < offsetof(DHCP6Option, data) + len)
+ return -ENOBUFS;
+
+ ia_hdr = *buf;
diff --git a/patches/systemd-239/series b/patches/systemd-239/series
index c75fbeb9a..bdfa3c1e8 100644
--- a/patches/systemd-239/series
+++ b/patches/systemd-239/series
@@ -1,4 +1,5 @@
# generated by git-ptx-patches
#tag:base --start-number 1
0001-build-sys-Detect-whether-struct-statx-is-defined-in-.patch
-# 54d194f090a373e4c969c7c584a671c4 - git-ptx-patches magic
+0002-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch
+# 69d3a3089d693a020a7338b3e119044a - git-ptx-patches magic
--
2.19.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
prev parent reply other threads:[~2018-11-19 15:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-19 15:03 [ptxdist] [PATCH] nginx: version bump 1.14.0 -> 1.14.1 Clemens Gruber
2018-11-19 15:03 ` [ptxdist] [PATCH] libgpiod: version bump 1.1.1 -> 1.2 Clemens Gruber
2018-11-19 15:03 ` Clemens Gruber [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181119150355.30233-3-clemens.gruber@pqgruber.com \
--to=clemens.gruber@pqgruber.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox