alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

vfs_uart: fix out-of-bounds read

Browse Source 
when open uart device "/2" on chips only have 2 UART peripherals
This commit is contained in:
morris 2023-06-19 10:38:44 +08:00
parent 96119acc8b
commit 93ce0714fd
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
components/vfs/vfs_uart.c
View File

@ -106,6 +106,14 @@ static vfs_uart_context_t* s_ctx[UART_NUM] = {
#endif #endif
}; };
static const char *s_uart_mount_points[UART_NUM] = {
"/0",
"/1",
#if UART_NUM > 2
"/2",
#endif
};
#ifdef CONFIG_VFS_SUPPORT_SELECT #ifdef CONFIG_VFS_SUPPORT_SELECT
typedef struct { typedef struct {
@ -126,21 +134,21 @@ static esp_err_t uart_end_select(void *end_select_args);
#endif // CONFIG_VFS_SUPPORT_SELECT #endif // CONFIG_VFS_SUPPORT_SELECT
static int uart_open(const char * path, int flags, int mode) static int uart_open(const char *path, int flags, int mode)
{ {
// this is fairly primitive, we should check if file is opened read only, // this is fairly primitive, we should check if file is opened read only,
// and error out if write is requested // and error out if write is requested
int fd = -1; int fd = -1;
if (strcmp(path, "/0") == 0) { for (int i = 0; i < UART_NUM; i++) {
fd = 0; if (strcmp(path, s_uart_mount_points[i]) == 0) {
} else if (strcmp(path, "/1") == 0) { fd = i;
fd = 1; break;
} else if (strcmp(path, "/2") == 0) { }
fd = 2; }
} else { if (fd == -1) {
errno = ENOENT; errno = ENOENT;
return fd; return -1;
} }
s_ctx[fd]->non_blocking = ((flags & O_NONBLOCK) == O_NONBLOCK); s_ctx[fd]->non_blocking = ((flags & O_NONBLOCK) == O_NONBLOCK);