mirror of
https://git.yoctoproject.org/poky
synced 2026-03-08 08:19:40 +01:00
bc3d85398a
Upstream-Status: Backport from c52e9d97d4
(From OE-Core rev: b4a2f74ba0b40abcdf56c4b58cae5f7ce145d511)
Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
116 lines
4.8 KiB
Diff
116 lines
4.8 KiB
Diff
From c52e9d97d485a3eb168e3f8f3674a7bc4b419703 Mon Sep 17 00:00:00 2001
|
|
From: drh <>
|
|
Date: Fri, 27 Jun 2025 19:02:21 +0000
|
|
Subject: [PATCH] Raise an error right away if the number of aggregate terms in
|
|
a query exceeds the maximum number of columns.
|
|
|
|
FossilOrigin-Name: 5508b56fd24016c13981ec280ecdd833007c9d8dd595edb295b984c2b487b5c8
|
|
|
|
Upstream-Status: Backport [https://github.com/sqlite/sqlite/commit/c52e9d97d485a3eb168e3f8f3674a7bc4b419703]
|
|
CVE: CVE-2025-6965
|
|
Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
|
|
---
|
|
sqlite3.c | 31 +++++++++++++++++++++++++++----
|
|
1 file changed, 27 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/sqlite3.c b/sqlite3.c
|
|
index 27bea6f..19d0438 100644
|
|
--- a/sqlite3.c
|
|
+++ b/sqlite3.c
|
|
@@ -14354,6 +14354,14 @@ typedef INT16_TYPE LogEst;
|
|
#define LARGEST_UINT64 (0xffffffff|(((u64)0xffffffff)<<32))
|
|
#define SMALLEST_INT64 (((i64)-1) - LARGEST_INT64)
|
|
|
|
+/*
|
|
+** Macro SMXV(n) return the maximum value that can be held in variable n,
|
|
+** assuming n is a signed integer type. UMXV(n) is similar for unsigned
|
|
+** integer types.
|
|
+*/
|
|
+#define SMXV(n) ((((i64)1)<<(sizeof(n)*8-1))-1)
|
|
+#define UMXV(n) ((((i64)1)<<(sizeof(n)*8))-1)
|
|
+
|
|
/*
|
|
** Round up a number to the next larger multiple of 8. This is used
|
|
** to force 8-byte alignment on 64-bit architectures.
|
|
@@ -17939,7 +17947,7 @@ struct AggInfo {
|
|
** than the source table */
|
|
int sortingIdx; /* Cursor number of the sorting index */
|
|
int sortingIdxPTab; /* Cursor number of pseudo-table */
|
|
- int nSortingColumn; /* Number of columns in the sorting index */
|
|
+ u32 nSortingColumn; /* Number of columns in the sorting index */
|
|
int mnReg, mxReg; /* Range of registers allocated for aCol and aFunc */
|
|
ExprList *pGroupBy; /* The group by clause */
|
|
struct AggInfo_col { /* For each column used in source tables */
|
|
@@ -17947,8 +17955,8 @@ struct AggInfo {
|
|
Expr *pCExpr; /* The original expression */
|
|
int iTable; /* Cursor number of the source table */
|
|
int iMem; /* Memory location that acts as accumulator */
|
|
- i16 iColumn; /* Column number within the source table */
|
|
- i16 iSorterColumn; /* Column number in the sorting index */
|
|
+ int iColumn; /* Column number within the source table */
|
|
+ int iSorterColumn; /* Column number in the sorting index */
|
|
} *aCol;
|
|
int nColumn; /* Number of used entries in aCol[] */
|
|
int nAccumulator; /* Number of columns that show through to the output.
|
|
@@ -108641,6 +108649,9 @@ static int analyzeAggregate(Walker *pWalker, Expr *pExpr){
|
|
** is not an entry there already.
|
|
*/
|
|
int k;
|
|
+ int mxTerm = pParse->db->aLimit[SQLITE_LIMIT_COLUMN];
|
|
+
|
|
+ assert( mxTerm <= SMXV(i16) );
|
|
pCol = pAggInfo->aCol;
|
|
for(k=0; k<pAggInfo->nColumn; k++, pCol++){
|
|
if( pCol->iTable==pExpr->iTable &&
|
|
@@ -108648,6 +108659,10 @@ static int analyzeAggregate(Walker *pWalker, Expr *pExpr){
|
|
break;
|
|
}
|
|
}
|
|
+ if( k>mxTerm ){
|
|
+ sqlite3ErrorMsg(pParse, "more than %d aggregate terms", mxTerm);
|
|
+ k = mxTerm;
|
|
+ }
|
|
if( (k>=pAggInfo->nColumn)
|
|
&& (k = addAggInfoColumn(pParse->db, pAggInfo))>=0
|
|
){
|
|
@@ -108685,6 +108700,7 @@ static int analyzeAggregate(Walker *pWalker, Expr *pExpr){
|
|
ExprSetVVAProperty(pExpr, EP_NoReduce);
|
|
pExpr->pAggInfo = pAggInfo;
|
|
pExpr->op = TK_AGG_COLUMN;
|
|
+ assert( k <= SMXV(pExpr->iAgg) );
|
|
pExpr->iAgg = (i16)k;
|
|
break;
|
|
} /* endif pExpr->iTable==pItem->iCursor */
|
|
@@ -108700,13 +108716,19 @@ static int analyzeAggregate(Walker *pWalker, Expr *pExpr){
|
|
** function that is already in the pAggInfo structure
|
|
*/
|
|
struct AggInfo_func *pItem = pAggInfo->aFunc;
|
|
+ int mxTerm = pParse->db->aLimit[SQLITE_LIMIT_COLUMN];
|
|
+ assert( mxTerm <= SMXV(i16) );
|
|
for(i=0; i<pAggInfo->nFunc; i++, pItem++){
|
|
if( pItem->pFExpr==pExpr ) break;
|
|
if( sqlite3ExprCompare(0, pItem->pFExpr, pExpr, -1)==0 ){
|
|
break;
|
|
}
|
|
}
|
|
- if( i>=pAggInfo->nFunc ){
|
|
+ if( i>mxTerm ){
|
|
+ sqlite3ErrorMsg(pParse, "more than %d aggregate terms", mxTerm);
|
|
+ i = mxTerm;
|
|
+ assert( i<pAggInfo->nFunc );
|
|
+ }else if( i>=pAggInfo->nFunc ){
|
|
/* pExpr is original. Make a new entry in pAggInfo->aFunc[]
|
|
*/
|
|
u8 enc = ENC(pParse->db);
|
|
@@ -108731,6 +108753,7 @@ static int analyzeAggregate(Walker *pWalker, Expr *pExpr){
|
|
*/
|
|
assert( !ExprHasProperty(pExpr, EP_TokenOnly|EP_Reduced) );
|
|
ExprSetVVAProperty(pExpr, EP_NoReduce);
|
|
+ assert( i <= SMXV(pExpr->iAgg) );
|
|
pExpr->iAgg = (i16)i;
|
|
pExpr->pAggInfo = pAggInfo;
|
|
return WRC_Prune;
|
|
--
|
|
2.25.1
|
|
|