michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: Perform a runtime check if a driver is capable of an operation

Browse source 
Driver APIs might not implement all operations, making it possible for
a user thread to get the kernel to execute a function at 0x00000000.

Perform runtime checks in all the driver handlers, checking if they're
capable of performing the requested operation.

Fixes #6907.

Signed-off-by: Leandro Pereira <leandro.pereira@intel.com>
This commit is contained in:
Leandro Pereira 2018-04-04 13:50:32 -07:00 • committed by Anas Nashif
commit c200367b68
20 changed files with 224 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

44
drivers/serial/uart_handlers.c
View file

@ -7,18 +7,24 @@
#include <uart.h>
#include <syscall_handler.h>
#define UART_SIMPLE(name_) \
_SYSCALL_HANDLER1_SIMPLE(name_, K_OBJ_DRIVER_UART, struct device *)
#define UART_SIMPLE(op_) \
_SYSCALL_HANDLER(uart_ ## op_, dev) { \
_SYSCALL_DRIVER_UART(dev, op_); \
return _impl_uart_ ## op_((struct device *)dev); \
}
#define UART_SIMPLE_VOID(name_) \
_SYSCALL_HANDLER1_SIMPLE_VOID(name_, K_OBJ_DRIVER_UART, \
struct device *)
#define UART_SIMPLE_VOID(op_) \
_SYSCALL_HANDLER(uart_ ## op_, dev) { \
_SYSCALL_DRIVER_UART(dev, op_); \
_impl_uart_ ## op_((struct device *)dev); \
return 0; \
}
UART_SIMPLE(uart_err_check);
UART_SIMPLE(err_check)
_SYSCALL_HANDLER(uart_poll_in, dev, p_char)
{
_SYSCALL_OBJ(dev, K_OBJ_DRIVER_UART);
_SYSCALL_DRIVER_UART(dev, poll_in);
_SYSCALL_MEMORY_WRITE(p_char, sizeof(unsigned char));
return _impl_uart_poll_in((struct device *)dev,
(unsigned char *)p_char);
@ -26,31 +32,31 @@ _SYSCALL_HANDLER(uart_poll_in, dev, p_char)
_SYSCALL_HANDLER(uart_poll_out, dev, out_char)
{
_SYSCALL_OBJ(dev, K_OBJ_DRIVER_UART);
_SYSCALL_DRIVER_UART(dev, poll_out);
return _impl_uart_poll_out((struct device *)dev, out_char);
}
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
UART_SIMPLE_VOID(uart_irq_tx_enable);
UART_SIMPLE_VOID(uart_irq_tx_disable);
UART_SIMPLE_VOID(uart_irq_rx_enable);
UART_SIMPLE_VOID(uart_irq_rx_disable);
UART_SIMPLE_VOID(uart_irq_err_enable);
UART_SIMPLE_VOID(uart_irq_err_disable);
UART_SIMPLE(uart_irq_is_pending);
UART_SIMPLE(uart_irq_update);
UART_SIMPLE_VOID(irq_tx_enable)
UART_SIMPLE_VOID(irq_tx_disable)
UART_SIMPLE_VOID(irq_rx_enable)
UART_SIMPLE_VOID(irq_rx_disable)
UART_SIMPLE_VOID(irq_err_enable)
UART_SIMPLE_VOID(irq_err_disable)
UART_SIMPLE(irq_is_pending)
UART_SIMPLE(irq_update)
#endif /* CONFIG_UART_INTERRUPT_DRIVEN */
#ifdef CONFIG_UART_LINE_CTRL
_SYSCALL_HANDLER(uart_line_ctrl_set, dev, ctrl, val)
{
_SYSCALL_OBJ(dev, K_OBJ_DRIVER_UART);
_SYSCALL_DRIVER_UART(dev, line_ctrl_set);
return _impl_uart_line_ctrl_set((struct device *)dev, ctrl, val);
}
_SYSCALL_HANDLER(uart_line_ctrl_get, dev, ctrl, val);
{
_SYSCALL_OBJ(dev, K_OBJ_DRIVER_UART);
_SYSCALL_DRIVER_UART(dev, line_ctrl_get);
_SYSCALL_MEMORY_WRITE(val, sizeof(u32_t));
return _impl_uart_line_ctrl_get((struct device *)dev, ctrl,
(u32_t *)val);
@ -60,7 +66,7 @@ _SYSCALL_HANDLER(uart_line_ctrl_get, dev, ctrl, val);
#ifdef CONFIG_UART_DRV_CMD
_SYSCALL_HANDLER(uart_drv_cmd, dev, cmd, p)
{
_SYSCALL_OBJ(dev, K_OBJ_DRIVER_UART);
_SYSCALL_DRIVER_UART(dev, drv_cmd);
return _impl_uart_drv_cmd((struct device *)dev, cmd, p);
}
#endif /* CONFIG_UART_DRV_CMD */