reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/poky/meta/recipes-support/sqlite/sqlite3.inc b/poky/meta/recipes-support/sqlite/sqlite3.inc
index 1834867..daf3db5 100644
--- a/poky/meta/recipes-support/sqlite/sqlite3.inc
+++ b/poky/meta/recipes-support/sqlite/sqlite3.inc
@@ -21,11 +21,19 @@
inherit autotools pkgconfig
-PACKAGECONFIG ?= ""
-PACKAGECONFIG_class-native = ""
+# enable those which are enabled by default in configure
+PACKAGECONFIG ?= "fts4 fts5 json1 rtree dyn_ext"
+PACKAGECONFIG_class-native ?= "fts4 fts5 json1 rtree dyn_ext"
PACKAGECONFIG[editline] = "--enable-editline,--disable-editline,libedit"
PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline ncurses"
+PACKAGECONFIG[fts3] = "--enable-fts3,--disable-fts3"
+PACKAGECONFIG[fts4] = "--enable-fts4,--disable-fts4"
+PACKAGECONFIG[fts5] = "--enable-fts5,--disable-fts5"
+PACKAGECONFIG[json1] = "--enable-json1,--disable-json1"
+PACKAGECONFIG[rtree] = "--enable-rtree,--disable-rtree"
+PACKAGECONFIG[session] = "--enable-session,--disable-session"
+PACKAGECONFIG[dyn_ext] = "--enable-dynamic-extensions,--disable-dynamic-extensions"
EXTRA_OECONF = " \
--enable-shared \
diff --git a/poky/meta/recipes-support/sqlite/sqlite3/CVE-2019-9936.patch b/poky/meta/recipes-support/sqlite/sqlite3/CVE-2019-9936.patch
new file mode 100644
index 0000000..1b907b9
--- /dev/null
+++ b/poky/meta/recipes-support/sqlite/sqlite3/CVE-2019-9936.patch
@@ -0,0 +1,28 @@
+Running fts5 prefix queries inside a transaction could trigger a heap-based
+buffer over-read in fts5HashEntrySort in sqlite3.c, which may lead to an
+information leak.
+
+CVE: CVE-2019-9936
+Upstream-Status: Backport [https://sqlite.org/src/vpatch?from=45c73deb440496e8&to=b3fa58dd7403dbd4]
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+---
+ sqlite3.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/sqlite3.c b/sqlite3.c
+index 4729f45..65527d8 100644
+--- a/sqlite3.c
++++ b/sqlite3.c
+@@ -207759,7 +207759,9 @@ static int fts5HashEntrySort(
+ for(iSlot=0; iSlot<pHash->nSlot; iSlot++){
+ Fts5HashEntry *pIter;
+ for(pIter=pHash->aSlot[iSlot]; pIter; pIter=pIter->pHashNext){
+- if( pTerm==0 || 0==memcmp(fts5EntryKey(pIter), pTerm, nTerm) ){
++ if( pTerm==0
++ || (pIter->nKey+1>=nTerm && 0==memcmp(fts5EntryKey(pIter), pTerm, nTerm))
++ ){
+ Fts5HashEntry *pEntry = pIter;
+ pEntry->pScanNext = 0;
+ for(i=0; ap[i]; i++){
+--
+2.20.1
diff --git a/poky/meta/recipes-support/sqlite/sqlite3/CVE-2019-9937.patch b/poky/meta/recipes-support/sqlite/sqlite3/CVE-2019-9937.patch
new file mode 100644
index 0000000..baa5666
--- /dev/null
+++ b/poky/meta/recipes-support/sqlite/sqlite3/CVE-2019-9937.patch
@@ -0,0 +1,187 @@
+Interleaving reads and writes in a single transaction with an fts5 virtual table
+will lead to a NULL Pointer Dereference in fts5ChunkIterate in sqlite3.c.
+
+CVE: CVE-2019-9937
+Upstream-Status: Backport [https://sqlite.org/src/vpatch?from=c2f50aa4e7bad882&to=45c73deb440496e8]
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+---
+ sqlite3.c | 83 ++++++++++++++++++++++++++++++++++++++-----------------
+ 1 file changed, 57 insertions(+), 26 deletions(-)
+
+diff --git a/sqlite3.c b/sqlite3.c
+index 65527d8..b1a8799 100644
+--- a/sqlite3.c
++++ b/sqlite3.c
+@@ -200668,8 +200668,9 @@ static void sqlite3Fts5HashClear(Fts5Hash*);
+
+ static int sqlite3Fts5HashQuery(
+ Fts5Hash*, /* Hash table to query */
++ int nPre,
+ const char *pTerm, int nTerm, /* Query term */
+- const u8 **ppDoclist, /* OUT: Pointer to doclist for pTerm */
++ void **ppObj, /* OUT: Pointer to doclist for pTerm */
+ int *pnDoclist /* OUT: Size of doclist in bytes */
+ );
+
+@@ -207501,19 +207502,25 @@ static int fts5HashResize(Fts5Hash *pHash){
+ return SQLITE_OK;
+ }
+
+-static void fts5HashAddPoslistSize(Fts5Hash *pHash, Fts5HashEntry *p){
++static int fts5HashAddPoslistSize(
++ Fts5Hash *pHash,
++ Fts5HashEntry *p,
++ Fts5HashEntry *p2
++){
++ int nRet = 0;
+ if( p->iSzPoslist ){
+- u8 *pPtr = (u8*)p;
++ u8 *pPtr = p2 ? (u8*)p2 : (u8*)p;
++ int nData = p->nData;
+ if( pHash->eDetail==FTS5_DETAIL_NONE ){
+- assert( p->nData==p->iSzPoslist );
++ assert( nData==p->iSzPosList );
+ if( p->bDel ){
+- pPtr[p->nData++] = 0x00;
++ pPtr[nData++] = 0x00;
+ if( p->bContent ){
+- pPtr[p->nData++] = 0x00;
++ pPtr[nData++] = 0x00;
+ }
+ }
+ }else{
+- int nSz = (p->nData - p->iSzPoslist - 1); /* Size in bytes */
++ int nSz = (nData - p->iSzPoslist - 1); /* Size in bytes */
+ int nPos = nSz*2 + p->bDel; /* Value of nPos field */
+
+ assert( p->bDel==0 || p->bDel==1 );
+@@ -207523,14 +207530,19 @@ static void fts5HashAddPoslistSize(Fts5Hash *pHash, Fts5HashEntry *p){
+ int nByte = sqlite3Fts5GetVarintLen((u32)nPos);
+ memmove(&pPtr[p->iSzPoslist + nByte], &pPtr[p->iSzPoslist + 1], nSz);
+ sqlite3Fts5PutVarint(&pPtr[p->iSzPoslist], nPos);
+- p->nData += (nByte-1);
++ nData += (nByte-1);
+ }
+ }
+
+- p->iSzPoslist = 0;
+- p->bDel = 0;
+- p->bContent = 0;
++ nRet = nData - p->nData;
++ if( p2 == 0 ){
++ p->iSzPoslist = 0;
++ p->bDel = 0;
++ p->bContent = 0;
++ p->nData = nData;
++ }
+ }
++ return nRet;
+ }
+
+ /*
+@@ -207642,7 +207654,7 @@ static int sqlite3Fts5HashWrite(
+ /* If this is a new rowid, append the 4-byte size field for the previous
+ ** entry, and the new rowid for this entry. */
+ if( iRowid!=p->iRowid ){
+- fts5HashAddPoslistSize(pHash, p);
++ fts5HashAddPoslistSize(pHash, p, 0);
+ p->nData += sqlite3Fts5PutVarint(&pPtr[p->nData], iRowid - p->iRowid);
+ p->iRowid = iRowid;
+ bNew = 1;
+@@ -207789,8 +207801,9 @@ static int fts5HashEntrySort(
+ */
+ static int sqlite3Fts5HashQuery(
+ Fts5Hash *pHash, /* Hash table to query */
++ int nPre,
+ const char *pTerm, int nTerm, /* Query term */
+- const u8 **ppDoclist, /* OUT: Pointer to doclist for pTerm */
++ void **ppOut, /* OUT: Pointer to new object */
+ int *pnDoclist /* OUT: Size of doclist in bytes */
+ ){
+ unsigned int iHash = fts5HashKey(pHash->nSlot, (const u8*)pTerm, nTerm);
+@@ -207804,11 +207817,20 @@ static int sqlite3Fts5HashQuery(
+ }
+
+ if( p ){
+- fts5HashAddPoslistSize(pHash, p);
+- *ppDoclist = (const u8*)&zKey[nTerm+1];
+- *pnDoclist = p->nData - (sizeof(Fts5HashEntry) + nTerm + 1);
++ int nHashPre = sizeof(Fts5HashEntry) + nTerm + 1;
++ int nList = p->nData - nHashPre;
++ u8 *pRet = (u8*)(*ppOut = sqlite3_malloc64(nPre + nList + 10));
++ if ( pRet ){
++ Fts5HashEntry *pFaux = (Fts5HashEntry*)&pRet[nPre-nHashPre];
++ memcpy(&pRet[nPre], &((u8*)p)[nHashPre], nList);
++ nList += fts5HashAddPoslistSize(pHash, p, pFaux);
++ *pnDoclist = nList;
++ }else{
++ *pnDoclist = 0;
++ return SQLITE_NOMEM;
++ }
+ }else{
+- *ppDoclist = 0;
++ *ppOut = 0;
+ *pnDoclist = 0;
+ }
+
+@@ -207841,7 +207863,7 @@ static void sqlite3Fts5HashScanEntry(
+ if( (p = pHash->pScan) ){
+ char *zKey = fts5EntryKey(p);
+ int nTerm = (int)strlen(zKey);
+- fts5HashAddPoslistSize(pHash, p);
++ fts5HashAddPoslistSize(pHash, p, 0);
+ *pzTerm = zKey;
+ *ppDoclist = (const u8*)&zKey[nTerm+1];
+ *pnDoclist = p->nData - (sizeof(Fts5HashEntry) + nTerm + 1);
+@@ -210311,31 +210333,40 @@ static void fts5SegIterHashInit(
+ int flags, /* Mask of FTS5INDEX_XXX flags */
+ Fts5SegIter *pIter /* Object to populate */
+ ){
+- const u8 *pList = 0;
+ int nList = 0;
+ const u8 *z = 0;
+ int n = 0;
++ Fts5Data *pLeaf = 0;
+
+ assert( p->pHash );
+ assert( p->rc==SQLITE_OK );
+
+ if( pTerm==0 || (flags & FTS5INDEX_QUERY_SCAN) ){
++ const u8 *pList = 0;
++
+ p->rc = sqlite3Fts5HashScanInit(p->pHash, (const char*)pTerm, nTerm);
+ sqlite3Fts5HashScanEntry(p->pHash, (const char**)&z, &pList, &nList);
+ n = (z ? (int)strlen((const char*)z) : 0);
++ if ( pList ){
++ pLeaf = fts5IdxMalloc(p, sizeof(Fts5Data));
++ if ( pLeaf ){
++ pLeaf->p = pList;
++ }
++ }
+ }else{
+- pIter->flags |= FTS5_SEGITER_ONETERM;
+- sqlite3Fts5HashQuery(p->pHash, (const char*)pTerm, nTerm, &pList, &nList);
++ p->rc = sqlite3Fts5HashQuery(p->pHash, sizeof(Fts5Data),
++ (const char*)pTerm, nTerm, (void**)&pLeaf, &nList
++ );
++ if( pLeaf ){
++ pLeaf->p = (u8*)&pLeaf[1];
++ }
+ z = pTerm;
+ n = nTerm;
++ pIter->flags |= FTS5_SEGITER_ONETERM;
+ }
+
+- if( pList ){
+- Fts5Data *pLeaf;
++ if( pLeaf ){
+ sqlite3Fts5BufferSet(&p->rc, &pIter->term, n, z);
+- pLeaf = fts5IdxMalloc(p, sizeof(Fts5Data));
+- if( pLeaf==0 ) return;
+- pLeaf->p = (u8*)pList;
+ pLeaf->nn = pLeaf->szLeaf = nList;
+ pIter->pLeaf = pLeaf;
+ pIter->iLeafOffset = fts5GetVarint(pLeaf->p, (u64*)&pIter->iRowid);
+--
+2.20.1
diff --git a/poky/meta/recipes-support/sqlite/sqlite3_3.23.1.bb b/poky/meta/recipes-support/sqlite/sqlite3_3.23.1.bb
deleted file mode 100644
index 3755761..0000000
--- a/poky/meta/recipes-support/sqlite/sqlite3_3.23.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require sqlite3.inc
-
-LICENSE = "PD"
-LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66"
-
-SRC_URI = "\
- http://www.sqlite.org/2018/sqlite-autoconf-${SQLITE_PV}.tar.gz \
- "
-SRC_URI[md5sum] = "99a51b40a66872872a91c92f6d0134fa"
-SRC_URI[sha256sum] = "92842b283e5e744eff5da29ed3c69391de7368fccc4d0ee6bf62490ce555ef25"
diff --git a/poky/meta/recipes-support/sqlite/sqlite3_3.27.2.bb b/poky/meta/recipes-support/sqlite/sqlite3_3.27.2.bb
new file mode 100644
index 0000000..4bdb04f
--- /dev/null
+++ b/poky/meta/recipes-support/sqlite/sqlite3_3.27.2.bb
@@ -0,0 +1,13 @@
+require sqlite3.inc
+
+LICENSE = "PD"
+LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66"
+
+SRC_URI = "\
+ http://www.sqlite.org/2019/sqlite-autoconf-${SQLITE_PV}.tar.gz \
+ file://CVE-2019-9936.patch \
+ file://CVE-2019-9937.patch \
+ "
+
+SRC_URI[md5sum] = "1f72631ce6e8efa5b4a6e55a43b3bdc0"
+SRC_URI[sha256sum] = "50c39e85ea28b5ecfdb3f9e860afe9ba606381e21836b2849efca6a0bfe6ef6e"