[2.0] Fix sqlite CVE-2023-7104 (#7251)

Co-authored-by: Henry Li <lihl@microsoft.com>

Author: henryli001

SPECS/sqlite/CVE-2023-7104.patch

@@ -0,0 +1,31 @@
+diff --git a/sqlite3.c b/sqlite3.c
+index b8f98c7..158d416 100644
+--- a/sqlite3.c
++++ b/sqlite3.c
+@@ -215603,15 +215603,19 @@ static int sessionReadRecord(
+         }
+       }
+       if( eType==SQLITE_INTEGER || eType==SQLITE_FLOAT ){
+-        sqlite3_int64 v = sessionGetI64(aVal);
+-        if( eType==SQLITE_INTEGER ){
+-          sqlite3VdbeMemSetInt64(apOut[i], v);
++        if( (pIn->nData-pIn->iNext)<8 ){
++          rc = SQLITE_CORRUPT_BKPT;
+         }else{
+-          double d;
+-          memcpy(&d, &v, 8);
+-          sqlite3VdbeMemSetDouble(apOut[i], d);
++          sqlite3_int64 v = sessionGetI64(aVal);
++          if( eType==SQLITE_INTEGER ){
++            sqlite3VdbeMemSetInt64(apOut[i], v);
++          }else{
++            double d;
++            memcpy(&d, &v, 8);
++            sqlite3VdbeMemSetDouble(apOut[i], d);
++          }
++          pIn->iNext += 8;
+         }
+-        pIn->iNext += 8;
+       }
+     }
+   }

SPECS/sqlite/sqlite.spec

@@ -2,7 +2,7 @@
 Summary:        A portable, high level programming interface to various calling conventions
 Name:           sqlite
 Version:        3.39.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        Public Domain
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -12,6 +12,7 @@ Source0:        https://www.sqlite.org/2022/%{name}-autoconf-%{sourcever}.tar.gz
 # CVE-2015-3717 applies to versions shipped in iOS and OS X
 Patch0:         CVE-2015-3717.nopatch
 Patch1:         CVE-2022-46908.patch
+Patch2:         CVE-2023-7104.patch
 Requires:       sqlite-libs = %{version}-%{release}
 Provides:       sqlite3
 
@@ -82,6 +83,9 @@ make %{?_smp_mflags} check
 %{_libdir}/libsqlite3.so.0.8.6
 
 %changelog
+* Tue Jan 09 2024 Henry Li <lihl@microsoft.com> - 3.39.2-3
+- Address CVE-2023-7104
+
 * Tue Dec 13 2022 Daniel McIlvaney <damcilva@microsoft.com> - 3.39.2-2
 - Address CVE-2022-46908
 

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

@@ -84,9 +84,9 @@ bison-3.7.6-2.cm2.aarch64.rpm
 popt-1.18-1.cm2.aarch64.rpm
 popt-devel-1.18-1.cm2.aarch64.rpm
 popt-lang-1.18-1.cm2.aarch64.rpm
-sqlite-3.39.2-2.cm2.aarch64.rpm
-sqlite-devel-3.39.2-2.cm2.aarch64.rpm
-sqlite-libs-3.39.2-2.cm2.aarch64.rpm
+sqlite-3.39.2-3.cm2.aarch64.rpm
+sqlite-devel-3.39.2-3.cm2.aarch64.rpm
+sqlite-libs-3.39.2-3.cm2.aarch64.rpm
 elfutils-0.186-2.cm2.aarch64.rpm
 elfutils-default-yama-scope-0.186-2.cm2.noarch.rpm
 elfutils-devel-0.186-2.cm2.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

@@ -84,9 +84,9 @@ bison-3.7.6-2.cm2.x86_64.rpm
 popt-1.18-1.cm2.x86_64.rpm
 popt-devel-1.18-1.cm2.x86_64.rpm
 popt-lang-1.18-1.cm2.x86_64.rpm
-sqlite-3.39.2-2.cm2.x86_64.rpm
-sqlite-devel-3.39.2-2.cm2.x86_64.rpm
-sqlite-libs-3.39.2-2.cm2.x86_64.rpm
+sqlite-3.39.2-3.cm2.x86_64.rpm
+sqlite-devel-3.39.2-3.cm2.x86_64.rpm
+sqlite-libs-3.39.2-3.cm2.x86_64.rpm
 elfutils-0.186-2.cm2.x86_64.rpm
 elfutils-default-yama-scope-0.186-2.cm2.noarch.rpm
 elfutils-devel-0.186-2.cm2.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -548,10 +548,10 @@ sed-lang-4.8-3.cm2.aarch64.rpm
 slang-2.3.2-4.cm2.aarch64.rpm
 slang-debuginfo-2.3.2-4.cm2.aarch64.rpm
 slang-devel-2.3.2-4.cm2.aarch64.rpm
-sqlite-3.39.2-2.cm2.aarch64.rpm
-sqlite-debuginfo-3.39.2-2.cm2.aarch64.rpm
-sqlite-devel-3.39.2-2.cm2.aarch64.rpm
-sqlite-libs-3.39.2-2.cm2.aarch64.rpm
+sqlite-3.39.2-3.cm2.aarch64.rpm
+sqlite-debuginfo-3.39.2-3.cm2.aarch64.rpm
+sqlite-devel-3.39.2-3.cm2.aarch64.rpm
+sqlite-libs-3.39.2-3.cm2.aarch64.rpm
 swig-4.0.2-3.cm2.aarch64.rpm
 swig-debuginfo-4.0.2-3.cm2.aarch64.rpm
 systemd-bootstrap-250.3-12.cm2.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -548,10 +548,10 @@ sed-lang-4.8-3.cm2.x86_64.rpm
 slang-2.3.2-4.cm2.x86_64.rpm
 slang-debuginfo-2.3.2-4.cm2.x86_64.rpm
 slang-devel-2.3.2-4.cm2.x86_64.rpm
-sqlite-3.39.2-2.cm2.x86_64.rpm
-sqlite-debuginfo-3.39.2-2.cm2.x86_64.rpm
-sqlite-devel-3.39.2-2.cm2.x86_64.rpm
-sqlite-libs-3.39.2-2.cm2.x86_64.rpm
+sqlite-3.39.2-3.cm2.x86_64.rpm
+sqlite-debuginfo-3.39.2-3.cm2.x86_64.rpm
+sqlite-devel-3.39.2-3.cm2.x86_64.rpm
+sqlite-libs-3.39.2-3.cm2.x86_64.rpm
 swig-4.0.2-3.cm2.x86_64.rpm
 swig-debuginfo-4.0.2-3.cm2.x86_64.rpm
 systemd-bootstrap-250.3-12.cm2.x86_64.rpm