diff options
author | Virendra Thakur <virendrak@kpit.com> | 2022-09-15 18:02:41 +0530 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-09-23 16:22:59 +0100 |
commit | 8b52687223c7b7ee890c49c51ef783c14832bcb0 (patch) | |
tree | b7b373aa626e5c1860ecee871d96ba3b64e959e5 | |
parent | 65cf3249fa189d5605fb4ee33c429ab79e3bc865 (diff) | |
download | poky-8b52687223c7b7ee890c49c51ef783c14832bcb0.tar.gz |
sqlite3: Fix CVE-2020-35525
Add patch to fix CVE-2020-35525
Reference:
http://security.debian.org/debian-security/pool/updates/main/s/sqlite3/sqlite3_3.27.2-3+deb10u2.debian.tar.xz
(From OE-Core rev: ced472cf1d195a1a856d24240dbd6ee91140a347)
Signed-off-by: Virendra Thakur <virendrak@kpit.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/sqlite/files/CVE-2020-35525.patch | 21 | ||||
-rw-r--r-- | meta/recipes-support/sqlite/sqlite3_3.31.1.bb | 1 |
2 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-support/sqlite/files/CVE-2020-35525.patch b/meta/recipes-support/sqlite/files/CVE-2020-35525.patch new file mode 100644 index 0000000000..27d81d42d9 --- /dev/null +++ b/meta/recipes-support/sqlite/files/CVE-2020-35525.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | From: drh <drh@noemail.net> | ||
2 | Date: Thu, 20 Feb 2020 14:08:51 +0000 | ||
3 | Subject: [PATCH] Early-out on the INTERSECT query processing following an | ||
4 | error. | ||
5 | |||
6 | Upstream-Status: Backport [http://security.debian.org/debian-security/pool/updates/main/s/sqlite3/sqlite3_3.27.2-3+deb10u2.debian.tar.xz] | ||
7 | CVE: CVE-2020-35525 | ||
8 | Signed-off-by: Virendra Thakur <virendrak@kpit.com> | ||
9 | --- | ||
10 | Index: sqlite-autoconf-3310100/sqlite3.c | ||
11 | =================================================================== | ||
12 | --- sqlite-autoconf-3310100.orig/sqlite3.c | ||
13 | +++ sqlite-autoconf-3310100/sqlite3.c | ||
14 | @@ -130767,6 +130767,7 @@ static int multiSelect( | ||
15 | /* Generate code to take the intersection of the two temporary | ||
16 | ** tables. | ||
17 | */ | ||
18 | + if( rc ) break; | ||
19 | assert( p->pEList ); | ||
20 | iBreak = sqlite3VdbeMakeLabel(pParse); | ||
21 | iCont = sqlite3VdbeMakeLabel(pParse); | ||
diff --git a/meta/recipes-support/sqlite/sqlite3_3.31.1.bb b/meta/recipes-support/sqlite/sqlite3_3.31.1.bb index 3440bf4913..48051593e4 100644 --- a/meta/recipes-support/sqlite/sqlite3_3.31.1.bb +++ b/meta/recipes-support/sqlite/sqlite3_3.31.1.bb | |||
@@ -14,6 +14,7 @@ SRC_URI = "http://www.sqlite.org/2020/sqlite-autoconf-${SQLITE_PV}.tar.gz \ | |||
14 | file://CVE-2020-13631.patch \ | 14 | file://CVE-2020-13631.patch \ |
15 | file://CVE-2020-13632.patch \ | 15 | file://CVE-2020-13632.patch \ |
16 | file://CVE-2022-35737.patch \ | 16 | file://CVE-2022-35737.patch \ |
17 | file://CVE-2020-35525.patch \ | ||
17 | " | 18 | " |
18 | SRC_URI[md5sum] = "2d0a553534c521504e3ac3ad3b90f125" | 19 | SRC_URI[md5sum] = "2d0a553534c521504e3ac3ad3b90f125" |
19 | SRC_URI[sha256sum] = "62284efebc05a76f909c580ffa5c008a7d22a1287285d68b7825a2b6b51949ae" | 20 | SRC_URI[sha256sum] = "62284efebc05a76f909c580ffa5c008a7d22a1287285d68b7825a2b6b51949ae" |