blob: 19523f4b89ae2674360712c9264220261eeadada [file] [log] [blame]
Patrick Williamsc124f4f2015-09-15 14:41:29 -05001From 2f55d6bd308ea61975558c2469ae349dba297e89 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Sat, 22 Feb 2014 14:35:59 +0800
4Subject: [PATCH] Fix CVE-2013-0211
5
6This patch comes from:https://github.com/libarchive/libarchive/commit/22531545514043e04633e1c015c7540b9de9dbe4
7
8Upstream-Status: Backport
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05009CVE: CVE-2013-0211
Patrick Williamsc124f4f2015-09-15 14:41:29 -050010
11Signed-off-by: Baogen shang <baogen.shang@windriver.com>
12
13Update the patch because of uprev on 20140222
14
15Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
16---
17 libarchive/archive_write.c | 4 ++++
18 1 file changed, 4 insertions(+)
19
20diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
21index a3d1a33..a323588 100644
22--- a/libarchive/archive_write.c
23+++ b/libarchive/archive_write.c
24@@ -671,8 +671,12 @@ static ssize_t
25 _archive_write_data(struct archive *_a, const void *buff, size_t s)
26 {
27 struct archive_write *a = (struct archive_write *)_a;
28+ const size_t max_write = INT_MAX;
29 archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
30 ARCHIVE_STATE_DATA, "archive_write_data");
31+ /* In particular, this catches attempts to pass negative values. */
32+ if (s > max_write)
33+ s = max_write;
34 archive_clear_error(&a->archive);
35 return ((a->format_write_data)(a, buff, s));
36 }
37--
381.8.2.1
39