michaelh/zephyr
1
0
Fork 0
Code Releases Activity

modbus: 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-03-23 17:44:59 +01:00 • committed by Jukka Rissanen
commit 2954dcf4ed
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
subsys/modbus/modbus_serial.c
View file

@ -404,13 +404,15 @@ static void cb_handler_tx(struct modbus_context *ctx)
static void uart_cb_handler(const struct device *dev, void *app_data) static void uart_cb_handler(const struct device *dev, void *app_data)
{ {
struct modbus_context *ctx = (struct modbus_context *)app_data; struct modbus_context *ctx = (struct modbus_context *)app_data;
struct modbus_serial_config *cfg = ctx->cfg; struct modbus_serial_config *cfg;
if (ctx == NULL) { if (ctx == NULL) {
LOG_ERR("Modbus hardware is not properly initialized"); LOG_ERR("Modbus hardware is not properly initialized");
return; return;
} }
cfg = ctx->cfg;
while (uart_irq_update(cfg->dev) && uart_irq_is_pending(cfg->dev)) { while (uart_irq_update(cfg->dev) && uart_irq_is_pending(cfg->dev)) {
if (uart_irq_rx_ready(cfg->dev)) { if (uart_irq_rx_ready(cfg->dev)) {