diff options
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/sqlite/files/CVE-2020-13630.patch | 32 | ||||
-rw-r--r-- | meta/recipes-support/sqlite/sqlite3_3.31.1.bb | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-support/sqlite/files/CVE-2020-13630.patch b/meta/recipes-support/sqlite/files/CVE-2020-13630.patch new file mode 100644 index 0000000000..31916a1939 --- /dev/null +++ b/meta/recipes-support/sqlite/files/CVE-2020-13630.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From becd68ba0dac41904aa817d96a67fb4685734b41 Mon Sep 17 00:00:00 2001 | ||
2 | From: dan <dan@noemail.net> | ||
3 | Date: Sat, 16 May 2020 17:26:58 +0000 | ||
4 | Subject: [PATCH] Fix a use-after-free bug in the fts3 snippet() function. | ||
5 | |||
6 | FossilOrigin-Name: 0d69f76f0865f9626078bee087a22fb826407279e78cf9d5382e1c985c9f64a9 | ||
7 | |||
8 | Upstream-Status: Backport | ||
9 | CVE: CVE-2020-13630 | ||
10 | |||
11 | Reference to upstream patch: | ||
12 | https://github.com/sqlite/sqlite/commit/becd68ba0dac41904aa817d96a67fb4685734b41 | ||
13 | |||
14 | Patch converted to amalgamation format | ||
15 | |||
16 | Signed-off-by: Steve Sakoman <steve@sakoman.com> | ||
17 | --- | ||
18 | sqlite3.c | 3 ++- | ||
19 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/sqlite3.c b/sqlite3.c | ||
22 | index 02892f8..e72fabb 100644 | ||
23 | --- a/sqlite3.c | ||
24 | +++ b/sqlite3.c | ||
25 | @@ -170257,6 +170257,7 @@ static void fts3EvalNextRow( | ||
26 | fts3EvalNextRow(pCsr, pLeft, pRc); | ||
27 | } | ||
28 | } | ||
29 | + pRight->bEof = pLeft->bEof = 1; | ||
30 | } | ||
31 | } | ||
32 | break; | ||
diff --git a/meta/recipes-support/sqlite/sqlite3_3.31.1.bb b/meta/recipes-support/sqlite/sqlite3_3.31.1.bb index 4ef1da703b..ace9423e8d 100644 --- a/meta/recipes-support/sqlite/sqlite3_3.31.1.bb +++ b/meta/recipes-support/sqlite/sqlite3_3.31.1.bb | |||
@@ -10,6 +10,7 @@ SRC_URI = "http://www.sqlite.org/2020/sqlite-autoconf-${SQLITE_PV}.tar.gz \ | |||
10 | file://CVE-2020-15358.patch \ | 10 | file://CVE-2020-15358.patch \ |
11 | file://CVE-2020-13434.patch \ | 11 | file://CVE-2020-13434.patch \ |
12 | file://CVE-2020-13435.patch \ | 12 | file://CVE-2020-13435.patch \ |
13 | file://CVE-2020-13630.patch \ | ||
13 | " | 14 | " |
14 | SRC_URI[md5sum] = "2d0a553534c521504e3ac3ad3b90f125" | 15 | SRC_URI[md5sum] = "2d0a553534c521504e3ac3ad3b90f125" |
15 | SRC_URI[sha256sum] = "62284efebc05a76f909c580ffa5c008a7d22a1287285d68b7825a2b6b51949ae" | 16 | SRC_URI[sha256sum] = "62284efebc05a76f909c580ffa5c008a7d22a1287285d68b7825a2b6b51949ae" |