Skip to content

Fixed possible double deletion of SecurityManager database object #12145

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

Closed
wants to merge 2 commits into from
Closed

Fixed possible double deletion of SecurityManager database object #12145

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fad4bfb
Fixed possible double deletion of SecurityManager database object
AGlass0fMilk Dec 19, 2019
ffb174a
Fixed redundant NULL check and tabs ➡ spaces
AGlass0fMilk Jan 2, 2020
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
19 changes: 10 additions & 9 deletions features/FEATURE_BLE/source/generic/GenericSecurityManager.tpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,10 @@ ble_error_t GenericSecurityManager<TPalSecurityManager, SigningMonitor>::setData

template<template<class> class TPalSecurityManager, template<class> class SigningMonitor>
ble_error_t GenericSecurityManager<TPalSecurityManager, SigningMonitor>::reset_(void) {
delete _db;

delete _db; // Close the database
_db = NULL;

_pal.reset();
SecurityManager::reset_();

Expand Down Expand Up @@ -210,8 +213,8 @@ ble_error_t GenericSecurityManager<TPalSecurityManager, SigningMonitor>::request

initiator_distribution.set_signing(
cb->signing_override_default ?
cb->signing_requested :
_default_key_distribution.get_signing()
cb->signing_requested :
_default_key_distribution.get_signing()
);

/* if requested the initiator may send all the default keys for later
Expand Down Expand Up @@ -833,8 +836,6 @@ template<template<class> class TPalSecurityManager, template<class> class Signin
ble_error_t GenericSecurityManager<TPalSecurityManager, SigningMonitor>::init_database(
const char *db_path
) {
delete _db;

FILE* db_file = FileSecurityDb::open_db_file(db_path);

if (db_file) {
Expand Down Expand Up @@ -1132,8 +1133,8 @@ void GenericSecurityManager<TPalSecurityManager, SigningMonitor>::on_connected_(

#if BLE_FEATURE_SIGNING
const bool signing = cb->signing_override_default ?
cb->signing_requested :
_default_key_distribution.get_signing();
cb->signing_requested :
_default_key_distribution.get_signing();

if (signing && flags->csrk_stored) {
_db->get_entry_peer_csrk(
Expand Down Expand Up @@ -1326,8 +1327,8 @@ void GenericSecurityManager<TPalSecurityManager, SigningMonitor>::on_signed_writ
}

const bool signing = cb->signing_override_default ?
cb->signing_requested :
_default_key_distribution.get_signing();
cb->signing_requested :
_default_key_distribution.get_signing();

if (signing) {
cb->csrk_failures++;
Expand Down