counter: Adjust final parameter type in function and signal callbacks
Subsystems (11)
PATCH 1/4 counter: Adjust final parameter type in function and signal callbacks
With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. A proposed warning in clang aims to catch these at compile time, which reveals:
drivers/counter/counter-chrdev.c:323:34: error: incompatible function pointer types assigning to 'int (*)(struct counter_device *, struct counter_signal *, u32 *)' (aka 'int (*)(struct counter_device *, struct counter_signal *, unsigned int *)') from 'int (*const)(struct counter_device *, struct counter_signal *, enum counter_signal_level *)' [-Werror,-Wincompatible-function-pointer-types-strict]
comp_node.comp.signal_u32_read = counter->ops->signal_read;
^ ~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/counter/counter-chrdev.c:337:33: error: incompatible function pointer types assigning to 'int (*)(struct counter_device *, struct counter_count *, u32 *)' (aka 'int (*)(struct counter_device *, struct counter_count *, unsigned int *)') from 'int (*const)(struct counter_device *, struct counter_count *, enum counter_function *)' [-Werror,-Wincompatible-function-pointer-types-strict]
comp_node.comp.count_u32_read = counter->ops->function_read;
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
2 errors generated.
drivers/counter/counter-sysfs.c:845:23: error: incompatible function pointer types assigning to 'int (*)(struct counter_device *, struct counter_signal *, u32 *)' (aka 'int (*)(struct counter_device *, struct counter_signal *, unsigned int *)') from 'int (*const)(struct counter_device *, struct counter_signal *, enum counter_signal_level *)' [-Werror,-Wincompatible-function-pointer-types-strict]
comp.signal_u32_read = counter->ops->signal_read;
^ ~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/counter/counter-sysfs.c:958:22: error: incompatible function pointer types assigning to 'int (*)(struct counter_device *, struct counter_count *, u32 *)' (aka 'int (*)(struct counter_device *, struct counter_count *, unsigned int *)') from 'int (*const)(struct counter_device *, struct counter_count *, enum counter_function *)' [-Werror,-Wincompatible-function-pointer-types-strict]
comp.count_u32_read = counter->ops->function_read;
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/counter/counter-sysfs.c:959:23: error: incompatible function pointer types assigning to 'int (*)(struct counter_device *, struct counter_count *, u32)' (aka 'int (*)(struct counter_device *, struct counter_count *, unsigned int)') from 'int (*const)(struct counter_device *, struct counter_count *, enum counter_function)' [-Werror,-Wincompatible-function-pointer-types-strict]
comp.count_u32_write = counter->ops->function_write;
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3 errors generated.The ->signal_u32_read(), ->count_u32_read(), and ->count_u32_write() callbacks in 'struct counter_comp' expect the final parameter to have a type of 'u32' or 'u32 *' but the ops functions that are being assigned to those callbacks have an enumerated type as the final parameter. While these are compatible from an ABI perspective, they will fail the aforementioned CFI checks.
Adjust the type of the final parameter in the ->signal_read(), ->function_read(), and ->function_write() callbacks in 'struct counter_ops' and their implementations to match the prototypes in 'struct counter_comp' to clear up these warnings and CFI failures.
---
Cc: Patrick Havelange <[email protected]>
Cc: Jarkko Nikula <[email protected]>
Cc: Oleksij Rempel <[email protected]>
Cc: Pengutronix Kernel Team <[email protected]>
Cc: Fabrice Gasnier <[email protected]>
Cc: Vignesh Raghavendra <[email protected]>
Cc: Julien Panis <[email protected]>
Cc: David Lechner <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- drivers/counter/104-quad-8.c | 6 +++--- drivers/counter/ftm-quaddec.c | 2 +- drivers/counter/intel-qep.c | 2 +- drivers/counter/interrupt-cnt.c | 4 ++-- drivers/counter/microchip-tcb-capture.c | 6 +++--- drivers/counter/stm32-lptimer-cnt.c | 4 ++-- drivers/counter/stm32-timer-cnt.c | 4 ++-- drivers/counter/ti-ecap-capture.c | 2 +- drivers/counter/ti-eqep.c | 4 ++-- include/linux/counter.h | 6 +++--- 10 files changed, 20 insertions(+), 20 deletions(-)
drivers/counter/104-quad-8.c +3 -3
@@ -135,7 +135,7 @@ struct quad8 {static int quad8_signal_read (struct counter_device *counter,struct counter_signal *signal, -enum counter_signal_level *level) +u32 *level) {const struct quad8 *const priv =counter_priv (counter);unsigned int state;
@@ -258,7 +258,7 @@ static int quad8_function_get(const struct quad8 *const priv, const size_t id,static int quad8_function_read (struct counter_device *counter,struct counter_count *count, -enum counter_function *function) +u32 *function) {struct quad8 *const priv =counter_priv (counter);unsigned long irqflags;
@@ -275,7 +275,7 @@ static int quad8_function_read(struct counter_device *counter,static int quad8_function_write (struct counter_device *counter,struct counter_count *count, -enum counter_function function) +u32 function) {struct quad8 *const priv =counter_priv (counter);const int id = count->id;
drivers/counter/ftm-quaddec.c +1 -1
@@ -189,7 +189,7 @@ static int ftm_quaddec_count_write(struct counter_device *counter,static int ftm_quaddec_count_function_read (struct counter_device *counter,struct counter_count *count, -enum counter_function *function) +u32 *function) { *function =COUNTER_FUNCTION_QUADRATURE_X4 ;
drivers/counter/intel-qep.c +1 -1
@@ -123,7 +123,7 @@ static const enum counter_function intel_qep_count_functions[] = {static int intel_qep_function_read (struct counter_device *counter,struct counter_count *count, -enum counter_function *function) +u32 *function) { *function =COUNTER_FUNCTION_QUADRATURE_X4 ;
drivers/counter/interrupt-cnt.c +2 -2
@@ -113,7 +113,7 @@ static const enum counter_function interrupt_cnt_functions[] = {static int interrupt_cnt_function_read (struct counter_device *counter,struct counter_count *count, -enum counter_function *function) +u32 *function) { *function =COUNTER_FUNCTION_INCREASE ;
@@ -122,7 +122,7 @@ static int interrupt_cnt_function_read(struct counter_device *counter,static int interrupt_cnt_signal_read (struct counter_device *counter,struct counter_signal *signal, -enum counter_signal_level *level) +u32 *level) {struct interrupt_cnt_priv *priv =counter_priv (counter);int ret;
drivers/counter/microchip-tcb-capture.c +3 -3
@@ -68,7 +68,7 @@ static struct counter_synapse mchp_tc_count_synapses[] = {static int mchp_tc_count_function_read (struct counter_device *counter,struct counter_count *count, -enum counter_function *function) +u32 *function) {struct mchp_tc_data *const priv =counter_priv (counter);
@@ -82,7 +82,7 @@ static int mchp_tc_count_function_read(struct counter_device *counter,static int mchp_tc_count_function_write (struct counter_device *counter,struct counter_count *count, -enum counter_function function) +u32 function) {struct mchp_tc_data *const priv =counter_priv (counter);u32 bmr, cmr;
@@ -144,7 +144,7 @@ static int mchp_tc_count_function_write(struct counter_device *counter,static int mchp_tc_count_signal_read (struct counter_device *counter,struct counter_signal *signal, -enum counter_signal_level *lvl) +u32 *lvl) {struct mchp_tc_data *const priv =counter_priv (counter);bool sigstatus;
drivers/counter/stm32-lptimer-cnt.c +2 -2
@@ -155,7 +155,7 @@ static int stm32_lptim_cnt_read(struct counter_device *counter,static int stm32_lptim_cnt_function_read (struct counter_device *counter,struct counter_count *count, -enum counter_function *function) +u32 *function) {struct stm32_lptim_cnt *const priv =counter_priv (counter);
@@ -174,7 +174,7 @@ static int stm32_lptim_cnt_function_read(struct counter_device *counter,static int stm32_lptim_cnt_function_write (struct counter_device *counter,struct counter_count *count, -enum counter_function function) +u32 function) {struct stm32_lptim_cnt *const priv =counter_priv (counter);
drivers/counter/stm32-timer-cnt.c +2 -2
@@ -70,7 +70,7 @@ static int stm32_count_write(struct counter_device *counter,static int stm32_count_function_read (struct counter_device *counter,struct counter_count *count, -enum counter_function *function) +u32 *function) {struct stm32_timer_cnt *const priv =counter_priv (counter);u32 smcr;
@@ -97,7 +97,7 @@ static int stm32_count_function_read(struct counter_device *counter,static int stm32_count_function_write (struct counter_device *counter,struct counter_count *count, -enum counter_function function) +u32 function) {struct stm32_timer_cnt *const priv =counter_priv (counter);u32 cr1, sms;
drivers/counter/ti-ecap-capture.c +1 -1
@@ -188,7 +188,7 @@ static int ecap_cnt_count_write(struct counter_device *counter,static int ecap_cnt_function_read (struct counter_device *counter,struct counter_count *count, -enum counter_function *function) +u32 *function) { *function =COUNTER_FUNCTION_INCREASE ;
drivers/counter/ti-eqep.c +2 -2
@@ -119,7 +119,7 @@ static int ti_eqep_count_write(struct counter_device *counter,static int ti_eqep_function_read (struct counter_device *counter,struct counter_count *count, -enum counter_function *function) +u32 *function) {struct ti_eqep_cnt *priv =ti_eqep_count_from_counter (counter);u32 qdecctl;
@@ -146,7 +146,7 @@ static int ti_eqep_function_read(struct counter_device *counter,static int ti_eqep_function_write (struct counter_device *counter,struct counter_count *count, -enum counter_function function) +u32 function) {struct ti_eqep_cnt *priv =ti_eqep_count_from_counter (counter);enum ti_eqep_count_func qsrc;
include/linux/counter.h +3 -3
@@ -324,17 +324,17 @@ struct counter_event_node {struct counter_ops {int (*signal_read)(struct counter_device *counter,struct counter_signal *signal, -enum counter_signal_level *level); +u32 *level);int (*count_read)(struct counter_device *counter,struct counter_count *count,u64 *value);int (*count_write)(struct counter_device *counter,struct counter_count *count,u64 value);int (*function_read)(struct counter_device *counter,struct counter_count *count, -enum counter_function *function); +u32 *function);int (*function_write)(struct counter_device *counter,struct counter_count *count, -enum counter_function function); +u32 function); int (*action_read)(struct counter_device *counter, struct counter_count *count, struct counter_synapse *synapse,
base-commit: d501d37841d3b7f18402d71a9ef057eb9dde127e
Signature · 1 line
2.38.1
PATCH 2/4 counter: stm32-timer-cnt: Adjust final parameter type of stm32_count_direction_read()
With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. A proposed warning in clang aims to catch these at compile time, which reveals:
drivers/counter/stm32-timer-cnt.c:220:2: error: incompatible function pointer types initializing 'int (*)(struct counter_device *, struct counter_count *, u32 *)' (aka 'int (*)(struct counter_device *, struct counter_count *, unsigned int *)') with an expression of type 'int (struct counter_device *, struct counter_count *, enum counter_count_direction *)' [-Werror,-Wincompatible-function-pointer-types-strict]
COUNTER_COMP_DIRECTION(stm32_count_direction_read),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./include/linux/counter.h:596:20: note: expanded from macro 'COUNTER_COMP_DIRECTION'
.count_u32_read = (_read), \
^~~~~~~
1 error generated->count_u32_read() in 'struct counter_comp' expects a return type of 'u32 *', not 'enum counter_count_direction *'. Adjust the final parameter type of stm32_count_direction_read() to match the prototype's to resolve the warning and CFI failure.
---
Cc: Fabrice Gasnier <[email protected]>
Cc: [email protected]
Cc: [email protected]
--- drivers/counter/stm32-timer-cnt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/counter/stm32-timer-cnt.c +1 -1
@@ -137,7 +137,7 @@ static int stm32_count_function_write(struct counter_device *counter,static int stm32_count_direction_read (struct counter_device *counter,struct counter_count *count, -enum counter_count_direction *direction) +u32 *direction) {struct stm32_timer_cnt *const priv =counter_priv (counter);u32 cr1;
Signature · 1 line
2.38.1
PATCH 3/4 counter: ti-ecap-capture: Adjust final parameter type of ecap_cnt_pol_{read,write}()
In reply to Nathan ChancellorWith clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. A proposed warning in clang aims to catch these at compile time, which reveals:
drivers/counter/ti-ecap-capture.c:384:2: error: incompatible function pointer types initializing 'int (*)(struct counter_device *, struct counter_signal *, size_t, u32 *)' (aka 'int (*)(struct counter_device *, struct counter_signal *, unsigned long, unsigned int *)') with an expression of type 'int (struct counter_device *, struct counter_signal *, size_t, enum counter_signal_polarity *)' (aka 'int (struct counter_device *, struct counter_signal *, unsigned long, enum counter_signal_polarity *)') [-Werror,-Wincompatible-function-pointer-types-strict]
COUNTER_COMP_ARRAY_POLARITY(ecap_cnt_pol_read, ecap_cnt_pol_write, ecap_cnt_pol_array),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./include/linux/counter.h:627:27: note: expanded from macro 'COUNTER_COMP_ARRAY_POLARITY'
.signal_array_u32_read = (_read), \
^~~~~~~
drivers/counter/ti-ecap-capture.c:384:2: error: incompatible function pointer types initializing 'int (*)(struct counter_device *, struct counter_signal *, size_t, u32)' (aka 'int (*)(struct counter_device *, struct counter_signal *, unsigned long, unsigned int)') with an expression of type 'int (struct counter_device *, struct counter_signal *, size_t, enum counter_signal_polarity)' (aka 'int (struct counter_device *, struct counter_signal *, unsigned long, enum counter_signal_polarity)') [-Werror,-Wincompatible-function-pointer-types-strict]
COUNTER_COMP_ARRAY_POLARITY(ecap_cnt_pol_read, ecap_cnt_pol_write, ecap_cnt_pol_array),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./include/linux/counter.h:628:28: note: expanded from macro 'COUNTER_COMP_ARRAY_POLARITY'
.signal_array_u32_write = (_write), \
^~~~~~~~
2 errors generated.->signal_array_u32_read() and ->signal_array_u32_write() in 'struct counter_comp' expect a final parameter type of 'u32 *' and 'u32' respectively, not 'enum counter_signal_polarity *' and 'enum counter_signal_polarity'. Adjust the final parameter type of ecap_cnt_pol_{read,write}() to match the prototype's to resolve the warning and CFI failure.
---
Cc: Vignesh Raghavendra <[email protected]>
Cc: Julien Panis <[email protected]>
Cc: [email protected]
--- drivers/counter/ti-ecap-capture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/counter/ti-ecap-capture.c +2 -2
@@ -234,7 +234,7 @@ static int ecap_cnt_clk_get_freq(struct counter_device *counter,static int ecap_cnt_pol_read (struct counter_device *counter,struct counter_signal *signal, -size_t idx,enum counter_signal_polarity *pol) +size_t idx,u32 *pol) {struct ecap_cnt_dev *ecap_dev =counter_priv (counter);int bitval;
@@ -250,7 +250,7 @@ static int ecap_cnt_pol_read(struct counter_device *counter,static int ecap_cnt_pol_write (struct counter_device *counter,struct counter_signal *signal, -size_t idx,enum counter_signal_polarity pol) +size_t idx,u32 pol) {struct ecap_cnt_dev *ecap_dev =counter_priv (counter);
Signature · 1 line
2.38.1
PATCH 4/4 counter: 104-quad-8: Adjust final parameter type of certain callback functions
In reply to Nathan ChancellorWith clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. A proposed warning in clang aims to catch these at compile time, which reveals:
drivers/counter/104-quad-8.c:1041:2: error: incompatible function pointer types initializing 'int (*)(struct counter_device *, struct counter_signal *, u32 *)' (aka 'int (*)(struct counter_device *, struct counter_signal *, unsigned int *)') with an expression of type
'int (struct counter_device *, struct counter_signal *, enum counter_signal_polarity *)' [-Werror,-Wincompatible-function-pointer-types-strict]
COUNTER_COMP_POLARITY(quad8_polarity_read, quad8_polarity_write,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./include/linux/counter.h:609:21: note: expanded from macro 'COUNTER_COMP_POLARITY'
.signal_u32_read = (_read), \
^~~~~~~
drivers/counter/104-quad-8.c:1041:2: error: incompatible function pointer types initializing 'int (*)(struct counter_device *, struct counter_signal *, u32)' (aka 'int (*)(struct counter_device *, struct counter_signal *, unsigned int)') with an expression of type 'int
(struct counter_device *, struct counter_signal *, enum counter_signal_polarity)' [-Werror,-Wincompatible-function-pointer-types-strict]
COUNTER_COMP_POLARITY(quad8_polarity_read, quad8_polarity_write,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./include/linux/counter.h:610:22: note: expanded from macro 'COUNTER_COMP_POLARITY'
.signal_u32_write = (_write), \
^~~~~~~~
drivers/counter/104-quad-8.c:1129:2: error: incompatible function pointer types initializing 'int (*)(struct counter_device *, struct counter_count *, u32 *)' (aka 'int (*)(struct counter_device *, struct counter_count *, unsigned int *)') with an expression of type 'i
nt (struct counter_device *, struct counter_count *, enum counter_count_mode *)' [-Werror,-Wincompatible-function-pointer-types-strict]
COUNTER_COMP_COUNT_MODE(quad8_count_mode_read, quad8_count_mode_write,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./include/linux/counter.h:587:20: note: expanded from macro 'COUNTER_COMP_COUNT_MODE'
.count_u32_read = (_read), \
^~~~~~~
drivers/counter/104-quad-8.c:1129:2: error: incompatible function pointer types initializing 'int (*)(struct counter_device *, struct counter_count *, u32)' (aka 'int (*)(struct counter_device *, struct counter_count *, unsigned int)') with an expression of type 'int (
struct counter_device *, struct counter_count *, enum counter_count_mode)' [-Werror,-Wincompatible-function-pointer-types-strict]
COUNTER_COMP_COUNT_MODE(quad8_count_mode_read, quad8_count_mode_write,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./include/linux/counter.h:588:21: note: expanded from macro 'COUNTER_COMP_COUNT_MODE'
.count_u32_write = (_write), \
^~~~~~~~
drivers/counter/104-quad-8.c:1131:2: error: incompatible function pointer types initializing 'int (*)(struct counter_device *, struct counter_count *, u32 *)' (aka 'int (*)(struct counter_device *, struct counter_count *, unsigned int *)') with an expression of type 'i
nt (struct counter_device *, struct counter_count *, enum counter_count_direction *)' [-Werror,-Wincompatible-function-pointer-types-strict]
COUNTER_COMP_DIRECTION(quad8_direction_read),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./include/linux/counter.h:596:20: note: expanded from macro 'COUNTER_COMP_DIRECTION'
.count_u32_read = (_read), \
^~~~~~~
5 errors generated.->count_u32_{read,write}() and ->count_u32_{read,write}() in 'struct counter_comp' expect a final parameter type of either 'u32' or 'u32 *', not the enumerated types used in the implementations. Adjust the final parameter type in the implementations to match the prototype's to resolve the warning and CFI failures.
--- drivers/counter/104-quad-8.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/counter/104-quad-8.c +5 -5
@@ -337,7 +337,7 @@ static int quad8_function_write(struct counter_device *counter,static int quad8_direction_read (struct counter_device *counter,struct counter_count *count, -enum counter_count_direction *direction) +u32 *direction) {const struct quad8 *const priv =counter_priv (counter);unsigned int ud_flag;
@@ -572,7 +572,7 @@ static int quad8_index_polarity_set(struct counter_device *counter,static int quad8_polarity_read (struct counter_device *counter,struct counter_signal *signal, -enum counter_signal_polarity *polarity) +u32 *polarity) {int err;u32 index_polarity;
@@ -589,7 +589,7 @@ static int quad8_polarity_read(struct counter_device *counter,static int quad8_polarity_write (struct counter_device *counter,struct counter_signal *signal, -enum counter_signal_polarity polarity) +u32 polarity) {const u32 pol = (polarity ==COUNTER_SIGNAL_POLARITY_POSITIVE ) ?1 :0 ;
@@ -654,7 +654,7 @@ static int quad8_count_floor_read(struct counter_device *counter,static int quad8_count_mode_read (struct counter_device *counter,struct counter_count *count, -enum counter_count_mode *cnt_mode) +u32 *cnt_mode) {const struct quad8 *const priv =counter_priv (counter);
@@ -679,7 +679,7 @@ static int quad8_count_mode_read(struct counter_device *counter,static int quad8_count_mode_write (struct counter_device *counter,struct counter_count *count, -enum counter_count_mode cnt_mode) +u32 cnt_mode) {struct quad8 *const priv =counter_priv (counter);unsigned int count_mode;
Signature · 1 line
2.38.1
Quoted 11 lines · Nathan Chancellor
The ->signal_u32_read(), ->count_u32_read(), and ->count_u32_write() callbacks in 'struct
counter_comp' expect the final parameter to have a type of 'u32' or 'u32 *' but the ops functions that are being assigned to those callbacks have an enumerated type as the final parameter. While these are compatible from an ABI perspective, they will fail the aforementioned CFI checks.Adjust the type of the final parameter in the ->signal_read(), ->function_read(), and ->function_write() callbacks in 'struct
counter_ops' and their implementations to match the prototypes in 'structcounter_comp' to clear up these warnings and CFI failures.
I don't understand these changes. Where do 'struct counter_comp' and 'struct counter_ops' get confused? I can only find matching ops/assignments/calls, so I must be missing something. This looks like a loss of CFI granularity instead of having wrappers added if there is an enum/u32 conversion needed somewhere.
Signature · 1 line
Kees Cook
Quoted 13 lines · Kees Cook
Quoted 11 lines · Nathan Chancellor
The ->signal_u32_read(), ->count_u32_read(), and ->count_u32_write() callbacks in 'struct
counter_comp' expect the final parameter to have a type of 'u32' or 'u32 *' but the ops functions that are being assigned to those callbacks have an enumerated type as the final parameter. While these are compatible from an ABI perspective, they will fail the aforementioned CFI checks.Adjust the type of the final parameter in the ->signal_read(), ->function_read(), and ->function_write() callbacks in 'struct
counter_ops' and their implementations to match the prototypes in 'structcounter_comp' to clear up these warnings and CFI failures.
Quoted 5 lines
I don't understand these changes. Where do 'struct
counter_comp' and 'structcounter_ops' get confused? I can only find matching ops/assignments/calls, so I must be missing something. This looks like a loss of CFI granularity instead of having wrappers added if there is an enum/u32 conversion needed somewhere.
Right, I am not the biggest fan of this change myself and it is entirely possible that I am misreading the warnings from the commit message but I do not see how
comp_node.comp.signal_u32_read = counter->ops->signal_read;
and
comp_node.comp.count_u32_read = counter->ops->function_read;
in counter_add_watch(),
comp.signal_u32_read = counter->ops->signal_read;
in counter_signal_attrs_create(), and
comp.count_u32_read = counter->ops->function_read;
comp.count_u32_write = counter->ops->function_write;in counter_count_attrs_create() are currently safe under kCFI, since the final parameter type of the prototypes in 'struct counter_ops' does not match the final parameter type of the prototypes in 'struct counter_comp'. I would expect the indirect calls in counter_get_data() and counter_comp_u32_show() to fail currently.
I briefly looked at making the 'struct counter_comp' callbacks match the 'struct counter_ops' ones but the COUNTER_COMP macros in include/linux/counter.h made it seem like these callbacks might be used by implementations that might use different enumerated types as the final parameter. I can look a little closer to see if we can make everything match.
I am not sure how wrappers would work here, I can take a look into how feasible that is.
Cheers,
Nathan
Quoted 52 lines · Nathan Chancellor
Quoted 13 lines · Kees Cook
Quoted 11 lines · Nathan Chancellor
The ->signal_u32_read(), ->count_u32_read(), and ->count_u32_write() callbacks in 'struct
counter_comp' expect the final parameter to have a type of 'u32' or 'u32 *' but the ops functions that are being assigned to those callbacks have an enumerated type as the final parameter. While these are compatible from an ABI perspective, they will fail the aforementioned CFI checks.Adjust the type of the final parameter in the ->signal_read(), ->function_read(), and ->function_write() callbacks in 'struct
counter_ops' and their implementations to match the prototypes in 'structcounter_comp' to clear up these warnings and CFI failures.Quoted 5 lines
I don't understand these changes. Where do 'struct
counter_comp' and 'structcounter_ops' get confused? I can only find matching ops/assignments/calls, so I must be missing something. This looks like a loss of CFI granularity instead of having wrappers added if there is an enum/u32 conversion needed somewhere.Right, I am not the biggest fan of this change myself and it is entirely possible that I am misreading the warnings from the commit message but I do not see how
comp_node.comp.signal_u32_read = counter->ops->signal_read;and
comp_node.comp.count_u32_read = counter->ops->function_read;in
counter_add_watch(),comp.signal_u32_read = counter->ops->signal_read;in
counter_signal_attrs_create(), andcomp.count_u32_read = counter->ops->function_read; comp.count_u32_write = counter->ops->function_write;in
counter_count_attrs_create()are currently safe under kCFI, since the final parameter type of the prototypes in 'structcounter_ops' does not match the final parameter type of the prototypes in 'structcounter_comp'. I would expect the indirect calls incounter_get_data()andcounter_comp_u32_show()to fail currently.I briefly looked at making the 'struct
counter_comp' callbacks match the 'structcounter_ops' ones but theCOUNTER_COMPmacros ininclude/linux/counter.hmade it seem like these callbacks might be used by implementations that might use different enumerated types as the final parameter. I can look a little closer to see if we can make everything match.
Quoted 5 lines
I am not sure how wrappers would work here, I can take a look into how feasible that is.
Cheers,
Nathan
The intention of the code here is to treat the last parameter as an makeshift generic; the u32 will always be some corresponding enum type provided by the driver. The expectation is for drivers to define components via respective COUNTER_COMP_* macros, such that the assignments of the *_u32_read/*_u32_write callbacks are abstracted away and the driver can treat the respective last parameter as of the desired enum type.
For example, COUNTER_COMP_DIRECTION is expected to be used with enum counter_count_direction, COUNTER_COMP_POLARITY is expected to be used with enum counter_signal_polarity, etc.
What would be nice is if there is a way to ensure the enum type of the last parameter of the callback provided to these COUNTER_COMP_* macros matches the particular respective COUNTER_COMP_* macro's expectation; e.g. we should get some sort of error if COUNTER_COMP_DIRECTION is used for a enum counter_signal_level, etc.
William Breathitt Gray
Quoted 16 lines · Nathan Chancellor
Right, I am not the biggest fan of this change myself and it is entirely possible that I am misreading the warnings from the commit message but I do not see how
comp_node.comp.signal_u32_read = counter->ops->signal_read;and
comp_node.comp.count_u32_read = counter->ops->function_read;in
counter_add_watch(),comp.signal_u32_read = counter->ops->signal_read;in
counter_signal_attrs_create(), and
Quoted 8 lines
comp.count_u32_read = counter->ops->function_read; comp.count_u32_write = counter->ops->function_write;in
counter_count_attrs_create()are currently safe under kCFI, since the final parameter type of the prototypes in 'structcounter_ops' does not match the final parameter type of the prototypes in 'structcounter_comp'. I would expect the indirect calls incounter_get_data()andcounter_comp_u32_show()to fail currently.
Ah! Thank you -- those were the places I couldn't find.
Signature · 1 line
Kees Cook
Quoted 52 lines · Nathan Chancellor
Quoted 13 lines · Kees Cook
Quoted 11 lines · Nathan Chancellor
The ->signal_u32_read(), ->count_u32_read(), and ->count_u32_write() callbacks in 'struct
counter_comp' expect the final parameter to have a type of 'u32' or 'u32 *' but the ops functions that are being assigned to those callbacks have an enumerated type as the final parameter. While these are compatible from an ABI perspective, they will fail the aforementioned CFI checks.Adjust the type of the final parameter in the ->signal_read(), ->function_read(), and ->function_write() callbacks in 'struct
counter_ops' and their implementations to match the prototypes in 'structcounter_comp' to clear up these warnings and CFI failures.Quoted 5 lines
I don't understand these changes. Where do 'struct
counter_comp' and 'structcounter_ops' get confused? I can only find matching ops/assignments/calls, so I must be missing something. This looks like a loss of CFI granularity instead of having wrappers added if there is an enum/u32 conversion needed somewhere.Right, I am not the biggest fan of this change myself and it is entirely possible that I am misreading the warnings from the commit message but I do not see how
comp_node.comp.signal_u32_read = counter->ops->signal_read;and
comp_node.comp.count_u32_read = counter->ops->function_read;in
counter_add_watch(),comp.signal_u32_read = counter->ops->signal_read;in
counter_signal_attrs_create(), andcomp.count_u32_read = counter->ops->function_read; comp.count_u32_write = counter->ops->function_write;in
counter_count_attrs_create()are currently safe under kCFI, since the final parameter type of the prototypes in 'structcounter_ops' does not match the final parameter type of the prototypes in 'structcounter_comp'. I would expect the indirect calls incounter_get_data()andcounter_comp_u32_show()to fail currently.I briefly looked at making the 'struct
counter_comp' callbacks match the 'structcounter_ops' ones but theCOUNTER_COMPmacros ininclude/linux/counter.hmade it seem like these callbacks might be used by implementations that might use different enumerated types as the final parameter. I can look a little closer to see if we can make everything match.
Quoted 2 lines
I am not sure how wrappers would work here, I can take a look into how feasible that is.
How about this? (I only did signal_read -- similar changes are needed for function_read and function_write:
drivers/counter/counter-chrdev.c +6 -3
@@ -38,6 +38,7 @@ struct counter_comp_node { a.device_u32_read == b.device_u32_read || \ a.count_u32_read == b.count_u32_read || \ a.signal_u32_read == b.signal_u32_read || \ + a.signal_read == b.signal_read || \ a.device_u64_read == b.device_u64_read || \ a.count_u64_read == b.count_u64_read || \ a.signal_u64_read == b.signal_u64_read || \
@@ -54,6 +55,7 @@ struct counter_comp_node { comp.device_u32_read || \ comp.count_u32_read || \ comp.signal_u32_read || \ + comp.signal_read || \ comp.device_u64_read || \ comp.count_u64_read || \ comp.signal_u64_read || \
@@ -320,7 +322,7 @@ static int counter_add_watch(struct counter_device *const counter,return -EINVAL ; comp_node.comp.type =COUNTER_COMP_SIGNAL_LEVEL ; - comp_node.comp.signal_u32_read = counter->ops->signal_read; + comp_node.comp.signal_read = counter->ops->signal_read;break ;case COUNTER_COMPONENT_COUNT :if (watch.component.scope !=COUNTER_SCOPE_COUNT )
@@ -530,6 +532,7 @@ static int counter_get_data(struct counter_device *const counter,const size_t id = comp_node->component.id;struct counter_signal *const signal = comp_node->parent;struct counter_count *const count = comp_node->parent; +enum counter_signal_level level =0 ;u8 value_u8 =0 ;u32 value_u32 =0 ;const struct counter_comp *ext;
@@ -569,8 +572,8 @@ static int counter_get_data(struct counter_device *const counter, ret = comp->device_u32_read (counter, &value_u32);break ;case COUNTER_SCOPE_SIGNAL : - ret = comp->signal_u32_read (counter, signal, - &value_u32); + ret = comp->signal_read (counter, signal, &level); + value_u32 = level;break ;case COUNTER_SCOPE_COUNT : ret = comp->count_u32_read (counter, count, &value_u32);
drivers/counter/counter-sysfs.c +4 -2
@@ -170,6 +170,7 @@ static ssize_t counter_comp_u32_show(struct device *dev,const struct counter_attribute *const a =to_counter_attribute (attr);struct counter_device *const counter =counter_from_dev (dev);const struct counter_available *const avail = a->comp.priv; +enum counter_signal_level level =0 ;int err;u32 data =0 ;
@@ -178,7 +179,8 @@ static ssize_t counter_comp_u32_show(struct device *dev, err = a->comp.device_u32_read (counter, &data);break ;case COUNTER_SCOPE_SIGNAL : - err = a->comp.signal_u32_read (counter, a->parent, &data); + err = a->comp.signal_read (counter, a->parent, &level); + data = level;break ;case COUNTER_SCOPE_COUNT :if (a->comp.type ==COUNTER_COMP_SYNAPSE_ACTION )
@@ -842,7 +844,7 @@ static int counter_signal_attrs_create(struct counter_device *const counter,/* Create main Signal attribute */ comp = counter_signal_comp; - comp.signal_u32_read = counter->ops->signal_read; + comp.signal_read = counter->ops->signal_read; err =counter_attr_create (dev, cattr_group, &comp, scope, signal);if (err <0 )return err;
include/linux/counter.h +3 -0
@@ -169,6 +169,9 @@ struct counter_comp { struct counter_count *count, u32 *val);int (*signal_u32_read)(struct counter_device *counter,struct counter_signal *signal,u32 *val); +int (*signal_read)(struct counter_device *counter, +struct counter_signal *signal, +enum counter_signal_level *level);int (*device_u64_read)(struct counter_device *counter,u64 *val); int (*count_u64_read)(struct counter_device *counter,
Signature · 1 line
Kees Cook
Quoted 53 lines · Kees Cook
Quoted 52 lines · Nathan Chancellor
Quoted 13 lines · Kees Cook
Quoted 11 lines · Nathan Chancellor
The ->signal_u32_read(), ->count_u32_read(), and ->count_u32_write() callbacks in 'struct
counter_comp' expect the final parameter to have a type of 'u32' or 'u32 *' but the ops functions that are being assigned to those callbacks have an enumerated type as the final parameter. While these are compatible from an ABI perspective, they will fail the aforementioned CFI checks.Adjust the type of the final parameter in the ->signal_read(), ->function_read(), and ->function_write() callbacks in 'struct
counter_ops' and their implementations to match the prototypes in 'structcounter_comp' to clear up these warnings and CFI failures.Quoted 5 lines
I don't understand these changes. Where do 'struct
counter_comp' and 'structcounter_ops' get confused? I can only find matching ops/assignments/calls, so I must be missing something. This looks like a loss of CFI granularity instead of having wrappers added if there is an enum/u32 conversion needed somewhere.Right, I am not the biggest fan of this change myself and it is entirely possible that I am misreading the warnings from the commit message but I do not see how
comp_node.comp.signal_u32_read = counter->ops->signal_read;and
comp_node.comp.count_u32_read = counter->ops->function_read;in
counter_add_watch(),comp.signal_u32_read = counter->ops->signal_read;in
counter_signal_attrs_create(), andcomp.count_u32_read = counter->ops->function_read; comp.count_u32_write = counter->ops->function_write;in
counter_count_attrs_create()are currently safe under kCFI, since the final parameter type of the prototypes in 'structcounter_ops' does not match the final parameter type of the prototypes in 'structcounter_comp'. I would expect the indirect calls incounter_get_data()andcounter_comp_u32_show()to fail currently.I briefly looked at making the 'struct
counter_comp' callbacks match the 'structcounter_ops' ones but theCOUNTER_COMPmacros ininclude/linux/counter.hmade it seem like these callbacks might be used by implementations that might use different enumerated types as the final parameter. I can look a little closer to see if we can make everything match.
Quoted 5 lines
Quoted 2 lines
I am not sure how wrappers would work here, I can take a look into how feasible that is.
How about this? (I only did
signal_read-- similar changes are needed forfunction_readandfunction_write:
The reason for the u32 type is that all the Counter enum components can make use of the same *_u32_read/*_u32_write calls; in other words, we don't have to handle each Counter enum read/write as unique.
If you want to get rid of that design, then you'll need to create respective code paths for each Counter enum. See the comments inline below.
Quoted 39 lines
drivers/counter/counter-chrdev.c +4
-1@@ -38,6 +38,7 @@ struct counter_comp_node { a.device_u32_read == b.device_u32_read || \ a.count_u32_read == b.count_u32_read || \ a.signal_u32_read == b.signal_u32_read || \ + a.signal_read == b.signal_read || \ a.device_u64_read == b.device_u64_read || \ a.count_u64_read == b.count_u64_read || \ a.signal_u64_read == b.signal_u64_read || \@@ -54,6 +55,7 @@ struct counter_comp_node { comp.device_u32_read || \ comp.count_u32_read || \ comp.signal_u32_read || \ + comp.signal_read || \ comp.device_u64_read || \ comp.count_u64_read || \ comp.signal_u64_read || \@@ -320,7 +322,7 @@ static int counter_add_watch(struct counter_device *const counter,return -EINVAL ; comp_node.comp.type =COUNTER_COMP_SIGNAL_LEVEL ; - comp_node.comp.signal_u32_read = counter->ops->signal_read; + comp_node.comp.signal_read = counter->ops->signal_read;break ;case COUNTER_COMPONENT_COUNT :if (watch.component.scope !=COUNTER_SCOPE_COUNT )@@ -530,6 +532,7 @@ static int counter_get_data(struct counter_device *const counter,const size_t id = comp_node->component.id;struct counter_signal *const signal = comp_node->parent;struct counter_count *const count = comp_node->parent; +enum counter_signal_level level =0 ;u8 value_u8 =0 ;u32 value_u32 =0 ;const struct counter_comp *ext;
drivers/counter/counter-chrdev.c static int counter_get_data(struct counter_device *const counter, · line 576
Quoted 7 lines
drivers/counter/counter-chrdev.c +2
-2@@ -569,8 +572,8 @@ static int counter_get_data(struct counter_device *const counter, ret = comp->device_u32_read (counter, &value_u32);break ;case COUNTER_SCOPE_SIGNAL : - ret = comp->signal_u32_read (counter, signal, - &value_u32); + ret = comp->signal_read (counter, signal, &level); + value_u32 = level;
This code path is for all Counter enum types currently; changing signal_u32_read to signal_read here will work for COUNTER_COMP_SIGNAL_LEVEL but break all the other Counter Signal enum types. Instead, you should duplicate this code with proper adjustments for each of the Counter enums in their own respective case blocks.
Quoted 16 lines
drivers/counter/counter-chrdev.c +0
-0break ;case COUNTER_SCOPE_COUNT : ret = comp->count_u32_read (counter, count, &value_u32);drivers/counter/counter-sysfs.c +1
-0@@ -170,6 +170,7 @@ static ssize_t counter_comp_u32_show(struct device *dev,const struct counter_attribute *const a =to_counter_attribute (attr);struct counter_device *const counter =counter_from_dev (dev);const struct counter_available *const avail = a->comp.priv; +enum counter_signal_level level =0 ;int err;u32 data =0 ;
drivers/counter/counter-sysfs.c static ssize_t counter_comp_u32_show(struct device *dev, · line 183
Quoted 6 lines
drivers/counter/counter-sysfs.c +2
-1@@ -178,7 +179,8 @@ static ssize_t counter_comp_u32_show(struct device *dev, err = a->comp.device_u32_read (counter, &data);break ;case COUNTER_SCOPE_SIGNAL : - err = a->comp.signal_u32_read (counter, a->parent, &data); + err = a->comp.signal_read (counter, a->parent, &level); + data = level;
Same issue as comment above: Counter Signal enums besides COUNTER_COMP_SIGNAL_LEVEL are possible.
Quoted 29 lines
drivers/counter/counter-sysfs.c +1
-1break ;case COUNTER_SCOPE_COUNT :if (a->comp.type ==COUNTER_COMP_SYNAPSE_ACTION )@@ -842,7 +844,7 @@ static int counter_signal_attrs_create(struct counter_device *const counter,/* Create main Signal attribute */ comp = counter_signal_comp; - comp.signal_u32_read = counter->ops->signal_read; + comp.signal_read = counter->ops->signal_read; err =counter_attr_create (dev, cattr_group, &comp, scope, signal);if (err <0 )return err;include/linux/counter.h +3
-0@@ -169,6 +169,9 @@ struct counter_comp { struct counter_count *count, u32 *val);int (*signal_u32_read)(struct counter_device *counter,struct counter_signal *signal,u32 *val); +int (*signal_read)(struct counter_device *counter, +struct counter_signal *signal, +enum counter_signal_level *level);int (*device_u64_read)(struct counter_device *counter,u64 *val); int (*count_u64_read)(struct counter_device *counter,Signature · 2 lines
-- Kees Cook
I'm not familiar with kCFI, but a better solution if possible would be to hint to the compiler the intention of the code here -- that we're intentionally type punning the last parameter in order to avoid duplicate code for each Counter enum because they are all handled the same way.
William Breathitt Gray