OrgZephyr/zephyr
OrgZephyr
/
zephyr
mirror of https://github.com/zephyrproject-rtos/zephyr.git
1
0
Fork 0
Code Issues Releases Wiki Activity
zephyr/drivers/i2c/i2c_handlers.c

76 lines
2.2 KiB
C
Raw Normal View History

drivers: i2c: add system call handlers i2c actually only has two entry points into the driver, i2c_configure and i2c_transfer. All the other APIs are derived from these. All derived APIs now just call i2c_transfer() with appropriate args. The handler for i2c_transfer() needs to examine the message array and validate all the buffers involved depending on whether we are reading or writing to them. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2017-10-24 01:05:09 +08:00
/*
* Copyright (c) 2017 Intel Corporation
*
* SPDX-License-Identifier: Apache-2.0
*/
cleanup: include/: move i2c.h to drivers/i2c.h move i2c.h to drivers/i2c.h and create a shim for backward-compatibility. No functional changes to the headers. A warning in the shim can be controlled with CONFIG_COMPAT_INCLUDES. Related to #16539 Signed-off-by: Anas Nashif <anas.nashif@intel.com>
2019-06-26 03:53:54 +08:00
#include <drivers/i2c.h>
drivers: i2c: Fix TOCTOU while transferring I2C messages All the mesages are checked with _SYSCALL_MEMORY() prior to calling the actual implementation function. However, a race condition might happen between the check and the call to _impl_i2c_transfer() itself. Copy the msgs vector to a locally allocated array and pass it to the transfer implementation. Signed-off-by: Leandro Pereira <leandro.pereira@intel.com>
2018-04-05 07:15:06 +08:00
#include <string.h>
#include <syscall_handler.h>
drivers: i2c: add system call handlers i2c actually only has two entry points into the driver, i2c_configure and i2c_transfer. All the other APIs are derived from these. All derived APIs now just call i2c_transfer() with appropriate args. The handler for i2c_transfer() needs to examine the message array and validate all the buffers involved depending on whether we are reading or writing to them. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2017-10-24 01:05:09 +08:00
kernel: Port remaining buildable syscalls to new API These calls are buildable on common sanitycheck platforms, but are not invoked at runtime in any tests accessible to CI. The changes are mostly mechanical, so the risk is low, but this commit is separated from the main API change to allow for more careful review. Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
2019-08-14 01:27:12 +08:00
static inline int z_vrfy_i2c_configure(struct device *dev, u32_t dev_config)
drivers: i2c: add system call handlers i2c actually only has two entry points into the driver, i2c_configure and i2c_transfer. All the other APIs are derived from these. All derived APIs now just call i2c_transfer() with appropriate args. The handler for i2c_transfer() needs to examine the message array and validate all the buffers involved depending on whether we are reading or writing to them. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2017-10-24 01:05:09 +08:00
{
syscalls: remove policy from handler checks The various macros to do checks in system call handlers all implictly would generate a kernel oops if a check failed. This is undesirable for a few reasons: * System call handlers that acquire resources in the handler have no good recourse for cleanup if a check fails. * In some cases we may want to propagate a return value back to the caller instead of just killing the calling thread, even though the base API doesn't do these checks. These macros now all return a value, if nonzero is returned the check failed. K_OOPS() now wraps these calls to generate a kernel oops. At the moment, the policy for all APIs has not changed. They still all oops upon a failed check/ The macros now use the Z_ notation for private APIs. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2018-05-05 06:57:57 +08:00
Z_OOPS(Z_SYSCALL_DRIVER_I2C(dev, configure));
all: Update reserved function names Update reserved function names starting with one underscore, replacing them as follows: '_k_' with 'z_' '_K_' with 'Z_' '_handler_' with 'z_handl_' '_Cstart' with 'z_cstart' '_Swap' with 'z_swap' This renaming is done on both global and those static function names in kernel/include and include/. Other static function names in kernel/ are renamed by removing the leading underscore. Other function names not starting with any prefix listed above are renamed starting with a 'z_' or 'Z_' prefix. Function names starting with two or three leading underscores are not automatcally renamed since these names will collide with the variants with two or three leading underscores. Various generator scripts have also been updated as well as perf, linker and usb files. These are drivers/serial/uart_handlers.c include/linker/kobject-text.ld kernel/include/syscall_handler.h scripts/gen_kobject_list.py scripts/gen_syscall_header.py Signed-off-by: Patrik Flykt <patrik.flykt@intel.com>
2019-03-09 05:19:05 +08:00
return z_impl_i2c_configure((struct device *)dev, dev_config);
drivers: i2c: add system call handlers i2c actually only has two entry points into the driver, i2c_configure and i2c_transfer. All the other APIs are derived from these. All derived APIs now just call i2c_transfer() with appropriate args. The handler for i2c_transfer() needs to examine the message array and validate all the buffers involved depending on whether we are reading or writing to them. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2017-10-24 01:05:09 +08:00
}
kernel: Port remaining buildable syscalls to new API These calls are buildable on common sanitycheck platforms, but are not invoked at runtime in any tests accessible to CI. The changes are mostly mechanical, so the risk is low, but this commit is separated from the main API change to allow for more careful review. Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
2019-08-14 01:27:12 +08:00
#include <syscalls/i2c_configure_mrsh.c>
drivers: i2c: add system call handlers i2c actually only has two entry points into the driver, i2c_configure and i2c_transfer. All the other APIs are derived from these. All derived APIs now just call i2c_transfer() with appropriate args. The handler for i2c_transfer() needs to examine the message array and validate all the buffers involved depending on whether we are reading or writing to them. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2017-10-24 01:05:09 +08:00
drivers: i2c: Fix TOCTOU while transferring I2C messages All the mesages are checked with _SYSCALL_MEMORY() prior to calling the actual implementation function. However, a race condition might happen between the check and the call to _impl_i2c_transfer() itself. Copy the msgs vector to a locally allocated array and pass it to the transfer implementation. Signed-off-by: Leandro Pereira <leandro.pereira@intel.com>
2018-04-05 07:15:06 +08:00
static u32_t copy_msgs_and_transfer(struct device *dev,
const struct i2c_msg *msgs,
u8_t num_msgs,
kernel: Port remaining buildable syscalls to new API These calls are buildable on common sanitycheck platforms, but are not invoked at runtime in any tests accessible to CI. The changes are mostly mechanical, so the risk is low, but this commit is separated from the main API change to allow for more careful review. Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
2019-08-14 01:27:12 +08:00
u16_t addr)
drivers: i2c: add system call handlers i2c actually only has two entry points into the driver, i2c_configure and i2c_transfer. All the other APIs are derived from these. All derived APIs now just call i2c_transfer() with appropriate args. The handler for i2c_transfer() needs to examine the message array and validate all the buffers involved depending on whether we are reading or writing to them. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2017-10-24 01:05:09 +08:00
{
drivers: i2c: Fix TOCTOU while transferring I2C messages All the mesages are checked with _SYSCALL_MEMORY() prior to calling the actual implementation function. However, a race condition might happen between the check and the call to _impl_i2c_transfer() itself. Copy the msgs vector to a locally allocated array and pass it to the transfer implementation. Signed-off-by: Leandro Pereira <leandro.pereira@intel.com>
2018-04-05 07:15:06 +08:00
struct i2c_msg copy[num_msgs];
u8_t i;
drivers: i2c: add system call handlers i2c actually only has two entry points into the driver, i2c_configure and i2c_transfer. All the other APIs are derived from these. All derived APIs now just call i2c_transfer() with appropriate args. The handler for i2c_transfer() needs to examine the message array and validate all the buffers involved depending on whether we are reading or writing to them. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2017-10-24 01:05:09 +08:00
drivers: i2c: Fix TOCTOU while transferring I2C messages All the mesages are checked with _SYSCALL_MEMORY() prior to calling the actual implementation function. However, a race condition might happen between the check and the call to _impl_i2c_transfer() itself. Copy the msgs vector to a locally allocated array and pass it to the transfer implementation. Signed-off-by: Leandro Pereira <leandro.pereira@intel.com>
2018-04-05 07:15:06 +08:00
/* Use a local copy to avoid switcheroo attacks. */
memcpy(copy, msgs, num_msgs * sizeof(*msgs));
drivers: i2c: add system call handlers i2c actually only has two entry points into the driver, i2c_configure and i2c_transfer. All the other APIs are derived from these. All derived APIs now just call i2c_transfer() with appropriate args. The handler for i2c_transfer() needs to examine the message array and validate all the buffers involved depending on whether we are reading or writing to them. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2017-10-24 01:05:09 +08:00
/* Validate the buffers in each message struct. Read options require
* that the target buffer be writable
*/
drivers: Add 'U' to unsigned variable assignments Add 'U' to a value when assigning it to an unsigned variable. MISRA-C rule 7.2 Signed-off-by: Patrik Flykt <patrik.flykt@intel.com>
2018-11-30 03:12:22 +08:00
for (i = 0U; i < num_msgs; i++) {
syscalls: remove policy from handler checks The various macros to do checks in system call handlers all implictly would generate a kernel oops if a check failed. This is undesirable for a few reasons: * System call handlers that acquire resources in the handler have no good recourse for cleanup if a check fails. * In some cases we may want to propagate a return value back to the caller instead of just killing the calling thread, even though the base API doesn't do these checks. These macros now all return a value, if nonzero is returned the check failed. K_OOPS() now wraps these calls to generate a kernel oops. At the moment, the policy for all APIs has not changed. They still all oops upon a failed check/ The macros now use the Z_ notation for private APIs. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2018-05-05 06:57:57 +08:00
Z_OOPS(Z_SYSCALL_MEMORY(copy[i].buf, copy[i].len,
copy[i].flags & I2C_MSG_READ));
drivers: i2c: add system call handlers i2c actually only has two entry points into the driver, i2c_configure and i2c_transfer. All the other APIs are derived from these. All derived APIs now just call i2c_transfer() with appropriate args. The handler for i2c_transfer() needs to examine the message array and validate all the buffers involved depending on whether we are reading or writing to them. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2017-10-24 01:05:09 +08:00
}
all: Update reserved function names Update reserved function names starting with one underscore, replacing them as follows: '_k_' with 'z_' '_K_' with 'Z_' '_handler_' with 'z_handl_' '_Cstart' with 'z_cstart' '_Swap' with 'z_swap' This renaming is done on both global and those static function names in kernel/include and include/. Other static function names in kernel/ are renamed by removing the leading underscore. Other function names not starting with any prefix listed above are renamed starting with a 'z_' or 'Z_' prefix. Function names starting with two or three leading underscores are not automatcally renamed since these names will collide with the variants with two or three leading underscores. Various generator scripts have also been updated as well as perf, linker and usb files. These are drivers/serial/uart_handlers.c include/linker/kobject-text.ld kernel/include/syscall_handler.h scripts/gen_kobject_list.py scripts/gen_syscall_header.py Signed-off-by: Patrik Flykt <patrik.flykt@intel.com>
2019-03-09 05:19:05 +08:00
return z_impl_i2c_transfer(dev, copy, num_msgs, addr);
drivers: i2c: Fix TOCTOU while transferring I2C messages All the mesages are checked with _SYSCALL_MEMORY() prior to calling the actual implementation function. However, a race condition might happen between the check and the call to _impl_i2c_transfer() itself. Copy the msgs vector to a locally allocated array and pass it to the transfer implementation. Signed-off-by: Leandro Pereira <leandro.pereira@intel.com>
2018-04-05 07:15:06 +08:00
}
kernel: Port remaining buildable syscalls to new API These calls are buildable on common sanitycheck platforms, but are not invoked at runtime in any tests accessible to CI. The changes are mostly mechanical, so the risk is low, but this commit is separated from the main API change to allow for more careful review. Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
2019-08-14 01:27:12 +08:00
static inline int z_vrfy_i2c_transfer(struct device *dev,
struct i2c_msg *msgs, u8_t num_msgs,
u16_t addr)
drivers: i2c: Fix TOCTOU while transferring I2C messages All the mesages are checked with _SYSCALL_MEMORY() prior to calling the actual implementation function. However, a race condition might happen between the check and the call to _impl_i2c_transfer() itself. Copy the msgs vector to a locally allocated array and pass it to the transfer implementation. Signed-off-by: Leandro Pereira <leandro.pereira@intel.com>
2018-04-05 07:15:06 +08:00
{
syscalls: remove policy from handler checks The various macros to do checks in system call handlers all implictly would generate a kernel oops if a check failed. This is undesirable for a few reasons: * System call handlers that acquire resources in the handler have no good recourse for cleanup if a check fails. * In some cases we may want to propagate a return value back to the caller instead of just killing the calling thread, even though the base API doesn't do these checks. These macros now all return a value, if nonzero is returned the check failed. K_OOPS() now wraps these calls to generate a kernel oops. At the moment, the policy for all APIs has not changed. They still all oops upon a failed check/ The macros now use the Z_ notation for private APIs. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2018-05-05 06:57:57 +08:00
Z_OOPS(Z_SYSCALL_OBJ(dev, K_OBJ_DRIVER_I2C));
drivers: i2c: Fix TOCTOU while transferring I2C messages All the mesages are checked with _SYSCALL_MEMORY() prior to calling the actual implementation function. However, a race condition might happen between the check and the call to _impl_i2c_transfer() itself. Copy the msgs vector to a locally allocated array and pass it to the transfer implementation. Signed-off-by: Leandro Pereira <leandro.pereira@intel.com>
2018-04-05 07:15:06 +08:00
/* copy_msgs_and_transfer() will allocate a copy on the stack using
* VLA, so ensure this won't blow the stack. Most functions defined
* in i2c.h use only a handful of messages, so up to 32 messages
* should be more than sufficient.
*/
syscalls: remove policy from handler checks The various macros to do checks in system call handlers all implictly would generate a kernel oops if a check failed. This is undesirable for a few reasons: * System call handlers that acquire resources in the handler have no good recourse for cleanup if a check fails. * In some cases we may want to propagate a return value back to the caller instead of just killing the calling thread, even though the base API doesn't do these checks. These macros now all return a value, if nonzero is returned the check failed. K_OOPS() now wraps these calls to generate a kernel oops. At the moment, the policy for all APIs has not changed. They still all oops upon a failed check/ The macros now use the Z_ notation for private APIs. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2018-05-05 06:57:57 +08:00
Z_OOPS(Z_SYSCALL_VERIFY(num_msgs >= 1 && num_msgs < 32));
drivers: i2c: Fix TOCTOU while transferring I2C messages All the mesages are checked with _SYSCALL_MEMORY() prior to calling the actual implementation function. However, a race condition might happen between the check and the call to _impl_i2c_transfer() itself. Copy the msgs vector to a locally allocated array and pass it to the transfer implementation. Signed-off-by: Leandro Pereira <leandro.pereira@intel.com>
2018-04-05 07:15:06 +08:00
/* We need to be able to read the overall array of messages */
syscalls: remove policy from handler checks The various macros to do checks in system call handlers all implictly would generate a kernel oops if a check failed. This is undesirable for a few reasons: * System call handlers that acquire resources in the handler have no good recourse for cleanup if a check fails. * In some cases we may want to propagate a return value back to the caller instead of just killing the calling thread, even though the base API doesn't do these checks. These macros now all return a value, if nonzero is returned the check failed. K_OOPS() now wraps these calls to generate a kernel oops. At the moment, the policy for all APIs has not changed. They still all oops upon a failed check/ The macros now use the Z_ notation for private APIs. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2018-05-05 06:57:57 +08:00
Z_OOPS(Z_SYSCALL_MEMORY_ARRAY_READ(msgs, num_msgs,
sizeof(struct i2c_msg)));
drivers: i2c: Fix TOCTOU while transferring I2C messages All the mesages are checked with _SYSCALL_MEMORY() prior to calling the actual implementation function. However, a race condition might happen between the check and the call to _impl_i2c_transfer() itself. Copy the msgs vector to a locally allocated array and pass it to the transfer implementation. Signed-off-by: Leandro Pereira <leandro.pereira@intel.com>
2018-04-05 07:15:06 +08:00
return copy_msgs_and_transfer((struct device *)dev,
(struct i2c_msg *)msgs,
kernel: Port remaining buildable syscalls to new API These calls are buildable on common sanitycheck platforms, but are not invoked at runtime in any tests accessible to CI. The changes are mostly mechanical, so the risk is low, but this commit is separated from the main API change to allow for more careful review. Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
2019-08-14 01:27:12 +08:00
(u8_t)num_msgs, (u16_t)addr);
drivers: i2c: add system call handlers i2c actually only has two entry points into the driver, i2c_configure and i2c_transfer. All the other APIs are derived from these. All derived APIs now just call i2c_transfer() with appropriate args. The handler for i2c_transfer() needs to examine the message array and validate all the buffers involved depending on whether we are reading or writing to them. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2017-10-24 01:05:09 +08:00
}
kernel: Port remaining buildable syscalls to new API These calls are buildable on common sanitycheck platforms, but are not invoked at runtime in any tests accessible to CI. The changes are mostly mechanical, so the risk is low, but this commit is separated from the main API change to allow for more careful review. Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
2019-08-14 01:27:12 +08:00
#include <syscalls/i2c_transfer_mrsh.c>
i2c: Add new I2C Slave syscalls This patchs adds new I2C Syscalls for : - I2C controllers slave support - I2C Slave drivers support I2C Controllers slave support adds 2 new ops to : - register new slave driver - unregister slave driver Slave funcs consists on all the I2C phases : - read or write request once address matches - read or write done once the byte has been received/sent - stop when the trasmit stops I2C Slave drivers syscall are also added to make new "I2C Slave" drivers to : - register them to their I2C controller - unregister them to their I2C controller Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
2017-11-30 23:36:38 +08:00
kernel: Port remaining buildable syscalls to new API These calls are buildable on common sanitycheck platforms, but are not invoked at runtime in any tests accessible to CI. The changes are mostly mechanical, so the risk is low, but this commit is separated from the main API change to allow for more careful review. Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
2019-08-14 01:27:12 +08:00
static inline int z_vrfy_i2c_slave_driver_register(struct device *dev)
{
Z_OOPS(Z_SYSCALL_OBJ(dev, K_OBJ_DRIVER_I2C));
return z_impl_i2c_slave_driver_register(dev);
}
#include <syscalls/i2c_slave_driver_register_mrsh.c>
i2c: Add new I2C Slave syscalls This patchs adds new I2C Syscalls for : - I2C controllers slave support - I2C Slave drivers support I2C Controllers slave support adds 2 new ops to : - register new slave driver - unregister slave driver Slave funcs consists on all the I2C phases : - read or write request once address matches - read or write done once the byte has been received/sent - stop when the trasmit stops I2C Slave drivers syscall are also added to make new "I2C Slave" drivers to : - register them to their I2C controller - unregister them to their I2C controller Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
2017-11-30 23:36:38 +08:00
kernel: Port remaining buildable syscalls to new API These calls are buildable on common sanitycheck platforms, but are not invoked at runtime in any tests accessible to CI. The changes are mostly mechanical, so the risk is low, but this commit is separated from the main API change to allow for more careful review. Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
2019-08-14 01:27:12 +08:00
static inline int z_vrfy_i2c_slave_driver_unregister(struct device *dev)
{
Z_OOPS(Z_SYSCALL_OBJ(dev, K_OBJ_DRIVER_I2C));
return z_vrfy_i2c_slave_driver_unregister(dev);
}
#include <syscalls/i2c_slave_driver_unregister_mrsh.c>