From: Alexander Dahl <post@lespocky.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH v2 2/2] file: add patch with upstream commit 0641e56 to fix CVE-2014-3587
Date: Fri, 12 Sep 2014 10:02:52 +0200 [thread overview]
Message-ID: <1410508972-2576-2-git-send-email-post@lespocky.de> (raw)
In-Reply-To: <1410508972-2576-1-git-send-email-post@lespocky.de>
Signed-off-by: Alexander Dahl <post@lespocky.de>
---
...p-around-Remi-Collet-at-redhat-cherry-pic.patch | 26 ++++++++++++++++++++
patches/file-5.19/series | 5 ++++
2 files changed, 31 insertions(+)
create mode 100644 patches/file-5.19/0001-Prevent-wrap-around-Remi-Collet-at-redhat-cherry-pic.patch
create mode 100644 patches/file-5.19/series
diff --git a/patches/file-5.19/0001-Prevent-wrap-around-Remi-Collet-at-redhat-cherry-pic.patch b/patches/file-5.19/0001-Prevent-wrap-around-Remi-Collet-at-redhat-cherry-pic.patch
new file mode 100644
index 0000000..bcb141f
--- /dev/null
+++ b/patches/file-5.19/0001-Prevent-wrap-around-Remi-Collet-at-redhat-cherry-pic.patch
@@ -0,0 +1,26 @@
+From: Christos Zoulas <christos@zoulas.com>
+Date: Thu, 7 Aug 2014 09:38:35 +0000
+Subject: [PATCH] Prevent wrap around (Remi Collet at redhat) (cherry picked
+ from commit 0641e56be1af003aa02c7c6b0184466540637233)
+
+Conflicts:
+ src/cdf.c
+---
+ src/cdf.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/cdf.c b/src/cdf.c
+index 106fc7a..bc94cb9 100644
+--- a/src/cdf.c
++++ b/src/cdf.c
+@@ -824,6 +824,10 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h,
+ q = (const uint8_t *)(const void *)
+ ((const char *)(const void *)p + ofs
+ - 2 * sizeof(uint32_t));
++ if (q < p) {
++ DPRINTF(("Wrapped around %p < %p\n", q, p));
++ goto out;
++ }
+ if (q > e) {
+ DPRINTF(("Ran of the end %p > %p\n", q, e));
+ goto out;
diff --git a/patches/file-5.19/series b/patches/file-5.19/series
new file mode 100644
index 0000000..eacd4da
--- /dev/null
+++ b/patches/file-5.19/series
@@ -0,0 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+#tag:upstream --start-number 1
+0001-Prevent-wrap-around-Remi-Collet-at-redhat-cherry-pic.patch
+# 5d28e91bad86a7562482bbcb752de1f1 - git-ptx-patches magic
--
1.7.10.4
--
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2014-09-12 8:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-05 5:27 [ptxdist] [PATCH] file: upgrade to 5.19 Alexander Dahl
2014-09-12 8:02 ` [ptxdist] [PATCH v2 1/2] " Alexander Dahl
2014-09-12 8:02 ` Alexander Dahl [this message]
2014-09-16 9:24 ` [ptxdist] [PATCH v2 2/2] file: add patch with upstream commit 0641e56 to fix CVE-2014-3587 Michael Olbrich
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=1410508972-2576-2-git-send-email-post@lespocky.de \
--to=post@lespocky.de \
--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