patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

drivers: modem: quectel-bg9x: fix potential null pointer dereference

Browse source 
reorganize code so that null pointer check is done prior to accessing
element.

Signed-off-by: Jacob Siverskog <jacob@teenage.engineering>
This commit is contained in:
Jacob Siverskog 2021-02-15 20:05:44 +01:00 committed by Jukka Rissanen
parent c2339db996
commit 4b5a2b989e
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/modem/quectel-bg9x.c
View file

@ -135,7 +135,7 @@ static int on_cmd_sockread_common(int socket_fd,
struct modem_socket *sock = NULL;
struct socket_read_data *sock_data;
int ret, i;
int socket_data_length = find_len(data->rx_buf->data);
int socket_data_length;
int bytes_to_skip;
if (!len) {
@ -149,6 +149,8 @@ static int on_cmd_sockread_common(int socket_fd,
return -EINVAL;
}
socket_data_length = find_len(data->rx_buf->data);
/* No (or not enough) data available on the socket. */
bytes_to_skip = digits(socket_data_length) + 2 + 4;
if (socket_data_length <= 0) {