espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-09-18 23:19:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

btshell: use strlcpy and strlcat to avoid buffer overflow

Browse Source
This commit is contained in:
Krzysztof Kopyściński
2021-03-02 09:14:23 +01:00
committed by Krzysztof Kopyściński
parent 06397ae99a
commit 6c15e8f652
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/btshell/src/cmd.c
+12 -6
View File
@@ -99,22 +99,26 @@ parse_dev_addr(const char *prefix, const struct kv_pair *addr_types,
char name[32];
int rc;
/* XXX string operations below are not quite safe, but do we care? */
if (!prefix) {
name[0] = '\0';
} else {
strcpy(name, prefix);
if (strlcpy(name, prefix, sizeof(name)) >= sizeof(name)) {
return EINVAL;
}
}
strcat(name, "addr");
if (strlcat(name, "addr", sizeof(name)) >= sizeof(name)) {
return EINVAL;
}
rc = parse_arg_addr(name, addr);
if (rc == ENOENT) {
/* not found */
return rc;
} else if (rc == EAGAIN) {
/* address found, but no type provided */
strcat(name, "_type");
if (strlcat(name, "_type", sizeof(name)) >= sizeof(name)) {
return EINVAL;
}
addr->type = parse_arg_kv(name, addr_types, &rc);
if (rc == ENOENT) {
addr->type = BLE_ADDR_PUBLIC;
@@ -126,7 +130,9 @@ parse_dev_addr(const char *prefix, const struct kv_pair *addr_types,
return rc;
} else {
/* full address found, but let's just make sure there is no type arg */
strcat(name, "_type");
if (strlcat(name, "_type", sizeof(name)) >= sizeof(name)) {
return EINVAL;
}
if (parse_arg_extract(name)) {
return E2BIG;
}