Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce memset_s in sqlite3 #1286

Merged
merged 6 commits into from
Jul 24, 2024
Merged

Introduce memset_s in sqlite3 #1286

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
328f2bc
Add memset_s to fix buffer overflow for memset function in sqlite3
ShrutiJaiswal1494 Jul 11, 2024
492ac06
Use memset inside memset_s with buffer overflow checks
ShrutiJaiswal1494 Jul 11, 2024
61533d9
remove codeQL comment
lalitb Jul 12, 2024
3345f64
Create separate header for memset_s
ShrutiJaiswal1494 Jul 23, 2024
277790b
Update documentation for sqlite
ShrutiJaiswal1494 Jul 23, 2024
a893de6
Correct formatting
ShrutiJaiswal1494 Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 45 additions & 7 deletions sqlite/sqlite3_debug.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,41 @@
** language. The code for the "sqlite3" command-line shell is also in a
** separate file. This file contains only code for the core SQLite library.
*/

/*
** The memset_s implementation is added as a secure version of the traditional
** memset function. It includes safety checks to prevent buffer overflows.
** Please do not remove this method as it is required for the CodeQL sanity checks.
ShrutiJaiswal1494 marked this conversation as resolved.
Show resolved Hide resolved
*/
#include <errno.h>
#include <stddef.h>
#include <string.h>

#ifndef SIZE_MAX
#define SIZE_MAX ((size_t)-1)
#endif

#ifndef RSIZE_MAX
#define RSIZE_MAX (SIZE_MAX >> 1)
#endif

typedef size_t rsize_t;
typedef int errno_t;

errno_t memset_s(void *s, rsize_t smax, int c, rsize_t n) {
if (!s || smax > RSIZE_MAX) {
return EINVAL;
}
if (n > smax) {
// Set memory up to the buffer size and return an error
memset(s, c, smax);
return EINVAL;
}
// Perform the memory set operation for the requested size
memset(s, c, n);
return 0;
}

ShrutiJaiswal1494 marked this conversation as resolved.
Show resolved Hide resolved
#define SQLITE_CORE 1
#define SQLITE_AMALGAMATION 1
#ifndef SQLITE_PRIVATE
Expand Down Expand Up @@ -49629,7 +49664,8 @@ static SQLITE_NOINLINE PgHdr *pcacheFetchFinishWithInit(
assert( pPage!=0 );
pPgHdr = (PgHdr*)pPage->pExtra;
assert( pPgHdr->pPage==0 );
memset(&pPgHdr->pDirty, 0, sizeof(PgHdr) - offsetof(PgHdr,pDirty));
memset_s(&pPgHdr->pDirty, sizeof(PgHdr) - offsetof(PgHdr, pDirty), 0,
sizeof(PgHdr) - offsetof(PgHdr, pDirty));
ShrutiJaiswal1494 marked this conversation as resolved.
Show resolved Hide resolved
pPgHdr->pPage = pPage;
pPgHdr->pData = pPage->pBuf;
pPgHdr->pExtra = (void *)&pPgHdr[1];
Expand Down Expand Up @@ -78098,7 +78134,8 @@ SQLITE_PRIVATE Vdbe *sqlite3VdbeCreate(Parse *pParse){
Vdbe *p;
p = sqlite3DbMallocRawNN(db, sizeof(Vdbe) );
if( p==0 ) return 0;
memset(&p->aOp, 0, sizeof(Vdbe)-offsetof(Vdbe,aOp));
memset_s(&p->aOp, sizeof(Vdbe) - offsetof(Vdbe, aOp), 0,
sizeof(Vdbe) - offsetof(Vdbe, aOp));
p->db = db;
if( db->pVdbe ){
db->pVdbe->pPrev = p;
Expand Down Expand Up @@ -101926,7 +101963,8 @@ SQLITE_PRIVATE ExprList *sqlite3ExprListAppend(
pItem = &pList->a[pList->nExpr++];
assert( offsetof(struct ExprList_item,zEName)==sizeof(pItem->pExpr) );
assert( offsetof(struct ExprList_item,pExpr)==0 );
memset(&pItem->zEName,0,sizeof(*pItem)-offsetof(struct ExprList_item,zEName));
memset_s(&pItem->zEName, sizeof(*pItem) - offsetof(struct ExprList_item,zEName), 0,
sizeof(*pItem) - offsetof(struct ExprList_item,zEName));
pItem->pExpr = pExpr;
return pList;

Expand Down Expand Up @@ -144787,8 +144825,8 @@ static int whereClauseInsert(WhereClause *pWC, Expr *p, u16 wtFlags){
pTerm->wtFlags = wtFlags;
pTerm->pWC = pWC;
pTerm->iParent = -1;
memset(&pTerm->eOperator, 0,
sizeof(WhereTerm) - offsetof(WhereTerm,eOperator));
memset_s(&pTerm->eOperator, sizeof(WhereTerm) - offsetof(WhereTerm,eOperator), 0,
sizeof(WhereTerm) - offsetof(WhereTerm,eOperator));
return idx;
}

Expand Down Expand Up @@ -151130,8 +151168,8 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
pWInfo->wctrlFlags = wctrlFlags;
pWInfo->iLimit = iAuxArg;
pWInfo->savedNQueryLoop = pParse->nQueryLoop;
memset(&pWInfo->nOBSat, 0,
offsetof(WhereInfo,sWC) - offsetof(WhereInfo,nOBSat));
memset_s(&pWInfo->nOBSat, offsetof(WhereInfo, sWC) - offsetof(WhereInfo, nOBSat),
0, offsetof(WhereInfo, sWC) - offsetof(WhereInfo, nOBSat));
memset(&pWInfo->a[0], 0, sizeof(WhereLoop)+nTabList*sizeof(WhereLevel));
assert( pWInfo->eOnePass==ONEPASS_OFF ); /* ONEPASS defaults to OFF */
pMaskSet = &pWInfo->sMaskSet;
Expand Down
Loading