kopia lustrzana https://github.com/espressif/esp-idf
bugfix (nvs): Fixed issues found by Coverity
* Fixed potential memory leak * Fixed wrong strncpy usage * Fixed potential out of bounds accesspull/10827/head
rodzic
9c35eeecbd
commit
e414dce1ff
|
@ -1,16 +1,8 @@
|
|||
// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
#ifndef ESP_NVS_H
|
||||
#define ESP_NVS_H
|
||||
|
||||
|
@ -105,7 +97,7 @@ typedef enum {
|
|||
*/
|
||||
typedef struct {
|
||||
char namespace_name[16]; /*!< Namespace to which key-value belong */
|
||||
char key[16]; /*!< Key of stored key-value pair */
|
||||
char key[NVS_KEY_NAME_MAX_SIZE]; /*!< Key of stored key-value pair */
|
||||
nvs_type_t type; /*!< Type of stored key-value pair */
|
||||
} nvs_entry_info_t;
|
||||
|
||||
|
|
|
@ -1,16 +1,8 @@
|
|||
// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
#include "nvs_page.hpp"
|
||||
#if defined(LINUX_TARGET)
|
||||
#include "crc.h"
|
||||
|
@ -204,6 +196,10 @@ esp_err_t Page::writeItem(uint8_t nsIndex, ItemType datatype, const char* key, c
|
|||
return ESP_ERR_NVS_VALUE_TOO_LONG;
|
||||
}
|
||||
|
||||
if ((!isVariableLengthType(datatype)) && dataSize > 8) {
|
||||
return ESP_ERR_INVALID_ARG;
|
||||
}
|
||||
|
||||
size_t totalSize = ENTRY_SIZE;
|
||||
size_t entriesCount = 1;
|
||||
if (isVariableLengthType(datatype)) {
|
||||
|
@ -248,7 +244,8 @@ esp_err_t Page::writeItem(uint8_t nsIndex, ItemType datatype, const char* key, c
|
|||
return err;
|
||||
}
|
||||
|
||||
size_t left = dataSize / ENTRY_SIZE * ENTRY_SIZE;
|
||||
size_t rest = dataSize % ENTRY_SIZE;
|
||||
size_t left = dataSize - rest;
|
||||
if (left > 0) {
|
||||
err = writeEntryData(static_cast<const uint8_t*>(data), left);
|
||||
if (err != ESP_OK) {
|
||||
|
@ -256,7 +253,7 @@ esp_err_t Page::writeItem(uint8_t nsIndex, ItemType datatype, const char* key, c
|
|||
}
|
||||
}
|
||||
|
||||
size_t tail = dataSize - left;
|
||||
size_t tail = rest;
|
||||
if (tail > 0) {
|
||||
std::fill_n(item.rawData, ENTRY_SIZE, 0xff);
|
||||
memcpy(item.rawData, static_cast<const uint8_t*>(data) + left, tail);
|
||||
|
|
|
@ -1,16 +1,8 @@
|
|||
// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
#include "nvs_storage.hpp"
|
||||
|
||||
#ifndef ESP_PLATFORM
|
||||
|
@ -419,11 +411,6 @@ esp_err_t Storage::createOrOpenNamespace(const char* nsName, bool canCreate, uin
|
|||
return ESP_ERR_NVS_NOT_ENOUGH_SPACE;
|
||||
}
|
||||
|
||||
NamespaceEntry* entry = new (std::nothrow) NamespaceEntry;
|
||||
if (!entry) {
|
||||
return ESP_ERR_NO_MEM;
|
||||
}
|
||||
|
||||
auto err = writeItem(Page::NS_INDEX, ItemType::U8, nsName, &ns, sizeof(ns));
|
||||
if (err != ESP_OK) {
|
||||
return err;
|
||||
|
@ -431,6 +418,11 @@ esp_err_t Storage::createOrOpenNamespace(const char* nsName, bool canCreate, uin
|
|||
mNamespaceUsage.set(ns, true);
|
||||
nsIndex = ns;
|
||||
|
||||
NamespaceEntry* entry = new (std::nothrow) NamespaceEntry;
|
||||
if (!entry) {
|
||||
return ESP_ERR_NO_MEM;
|
||||
}
|
||||
|
||||
entry->mIndex = ns;
|
||||
strncpy(entry->mName, nsName, sizeof(entry->mName) - 1);
|
||||
entry->mName[sizeof(entry->mName) - 1] = 0;
|
||||
|
@ -735,11 +727,13 @@ esp_err_t Storage::calcEntriesInNamespace(uint8_t nsIndex, size_t& usedEntries)
|
|||
void Storage::fillEntryInfo(Item &item, nvs_entry_info_t &info)
|
||||
{
|
||||
info.type = static_cast<nvs_type_t>(item.datatype);
|
||||
strncpy(info.key, item.key, sizeof(info.key));
|
||||
strncpy(info.key, item.key, sizeof(info.key) - 1);
|
||||
info.key[sizeof(info.key) - 1] = '\0';
|
||||
|
||||
for (auto &name : mNamespaces) {
|
||||
if(item.nsIndex == name.mIndex) {
|
||||
strncpy(info.namespace_name, name.mName, sizeof(info.namespace_name));
|
||||
strncpy(info.namespace_name, name.mName, sizeof(info.namespace_name) - 1);
|
||||
info.namespace_name[sizeof(info.namespace_name) -1] = '\0';
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
Ładowanie…
Reference in New Issue