Skip to content

bpo-31746: Prevent segfaults with uninitialised sqlite3.Connection objects - #27431

Merged
pablogsal merged 1 commit into
python:mainfrom
erlend-aasland:sqlite-uninitialised-connection
Jul 29, 2021
Merged

bpo-31746: Prevent segfaults with uninitialised sqlite3.Connection objects#27431
pablogsal merged 1 commit into
python:mainfrom
erlend-aasland:sqlite-uninitialised-connection

Conversation

@erlend-aasland

@erlend-aaslanderlend-aasland commented Jul 28, 2021•
edited
Loading

Copy link
Copy Markdown
Contributor
  • Only set sqlite3.Connection.initialized when the connection object
    is initialised
  • Check initialised flag in close()
  • Check initialised flag in isolation_level
  • Use SQLite API when enabling autocommit mode [1]
  • Add tests

[1] This may happen during connection init, so we cannot use
pysqlite_connection_commit, since it requires an initialised
connection object. Previously, this was not a problem, since the
initialised flag was incorrectly set before the connection object was
initialised.

https://bugs.python.org/issue31746

erlend-aasland
erlend-aasland commented Jul 28, 2021
View reviewed changes
Comment threadModules/_sqlite/connection.c
Comment on lines +373 to +378
if (!self->initialized) {
pysqlite_state *state = pysqlite_get_state(NULL);
PyErr_SetString(state->ProgrammingError,
"Base Connection.__init__ not called.");
return NULL;
}

@erlend-aaslanderlend-aaslandJul 28, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We cannot use pysqlite_check_connection here, since it also checks self->db. Calling close() twice should still be a no-op.

@erlend-aasland

erlend-aasland commented Jul 29, 2021

Copy link
Copy Markdown
ContributorAuthor

Backport to 3.9 as well?

@pablogsal
pablogsal merged commit 7e311e4 into python:mainJul 29, 2021
@miss-islington

miss-islington commented Jul 29, 2021

Copy link
Copy Markdown
Contributor

Thanks @erlend-aasland for the PR, and @pablogsal for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

@miss-islington

miss-islington commented Jul 29, 2021

Copy link
Copy Markdown
Contributor

Sorry, @erlend-aasland and @pablogsal, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 7e311e496b0e26b3d3c62fe9b0ed2a4677c37ee9 3.10

@miss-islington

miss-islington commented Jul 29, 2021

Copy link
Copy Markdown
Contributor

Thanks @erlend-aasland for the PR, and @pablogsal for merging it 🌮🎉.. I'm working now to backport this PR to: 3.9.
🐍🍒⛏🤖

@miss-islington

miss-islington commented Jul 29, 2021

Copy link
Copy Markdown
Contributor

Sorry @erlend-aasland and @pablogsal, I had trouble checking out the 3.9 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 7e311e496b0e26b3d3c62fe9b0ed2a4677c37ee9 3.9

@pablogsal

pablogsal commented Jul 29, 2021

Copy link
Copy Markdown
Member

Oh, seems that the backport party crashed :(

@erlend-aasland can you do them manually?

@erlend-aasland
erlend-aasland deleted the sqlite-uninitialised-connection branch July 29, 2021 19:46
@erlend-aasland

erlend-aasland commented Jul 29, 2021

Copy link
Copy Markdown
ContributorAuthor

Oh, seems that the backport party crashed :(

@erlend-aasland can you do them manually?

Yes, I was expecting it to fail. I'll fix it right away. Should we backport to 3.9 as well?

@pablogsal

pablogsal commented Jul 29, 2021

Copy link
Copy Markdown
Member

@erlend-aasland apparently we have a buildbot failure:

https://buildbot.python.org/all/#/builders/596/builds/703/

We may need to revert this meanwhile we understand what failed

erlend-aasland pushed a commit to erlend-aasland/cpython that referenced this pull request Jul 29, 2021
Erlend Egeberg Aasland
[3.9] bpo-31746: Prevent segfaults when sqlite3.Connection is uniniti…
6babf43
…alised (pythonGH-27431).
(cherry picked from commit 7e311e4)
Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
@erlend-aasland

erlend-aasland commented Jul 29, 2021

Copy link
Copy Markdown
ContributorAuthor

Yes, please revert it.

pablogsal added a commit that referenced this pull request Jul 29, 2021
@pablogsal
Revert "bpo-31746: Prevent segfaults when sqlite3.Connection is unini…
0dffd84
…tialised (GH-27431)"
This reverts commit 7e311e4.
@pablogsalpablogsal mentioned this pull request Jul 29, 2021
Closed
erlend-aasland pushed a commit to erlend-aasland/cpython that referenced this pull request Jul 29, 2021
Erlend E. Aasland
bpo-31746: Fix broken call inpythonGH-27431
ea7b889
@bedevere-bot

bedevere-bot commented Jul 29, 2021

Copy link
Copy Markdown

GH-27465 is a backport of this pull request to the 3.9 branch.

pablogsal pushed a commit that referenced this pull request Jul 29, 2021
Erlend Egeberg Aasland
bpo-31746: Fix broken call inGH-27431(GH-27464)
2d34664
pablogsal pushed a commit that referenced this pull request Jul 29, 2021
Erlend Egeberg Aasland
[3.9]bpo-31746: Prevent segfaults when sqlite3.Connection is uniniti…
0bc1765
…alised (GH-27431) (GH-27465)
(cherry picked from commit 7e311e4)
Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
@pablogsal

pablogsal commented Jul 29, 2021

Copy link
Copy Markdown
Member

We are missing the 3.10 backport still

@erlend-aasland

erlend-aasland commented Jul 30, 2021

Copy link
Copy Markdown
ContributorAuthor

We are missing the 3.10 backport still

Doh, I'll get to it after morning coffee :)

erlend-aasland pushed a commit to erlend-aasland/cpython that referenced this pull request Jul 30, 2021
Erlend Egeberg Aasland
[3.10] bpo-31746: Prevent segfaults when sqlite3.Connection is uninit…
e72a5d8
…ialised (pythonGH-27431).
(cherry picked from commit 7e311e4)
Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
@bedevere-bot

bedevere-bot commented Jul 30, 2021

Copy link
Copy Markdown

GH-27472 is a backport of this pull request to the 3.10 branch.

@bedevere-botbedevere-bot removed the needs backport to 3.10 only security fixes label Jul 30, 2021
@erlend-aaslanderlend-aasland mentioned this pull request Jul 30, 2021
Closed
erlend-aasland pushed a commit to erlend-aasland/cpython that referenced this pull request Jul 30, 2021
Erlend E. Aasland
Merge branch 'main' into sqlite-serialize
a22bb3d
Sync with main bco. pythonGH-27431
ambv pushed a commit that referenced this pull request Jul 30, 2021
Erlend Egeberg Aasland
[3.10]bpo-31746: Prevent segfaults when sqlite3.Connection is uninit…
0cb470e
…ialised (GH-27431). (GH-27472)
(cherry picked from commit 7e311e4)
Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
@smcvsmcv mentioned this pull request Jan 5, 2022
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pablogsalpablogsalpablogsal approved these changes
@berkerpeksagberkerpeksagAwaiting requested review from berkerpeksag

Assignees

@pablogsalpablogsal

Labels

awaiting mergeskip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@erlend-aasland@miss-islington@pablogsal@bedevere-bot@the-knights-who-say-ni