| Message ID | cover.1667934775.git.gustavoars@kernel.org |
|---|---|
| Headers | show |
| Series | Avoid clashing function prototypes | expand |
On Tue, Nov 08, 2022 at 02:21:24PM -0600, Gustavo A. R. Silva wrote: > When built with Control Flow Integrity, function prototypes between > caller and function declaration must match. These mismatches are visible > at compile time with the new -Wcast-function-type-strict in Clang[1]. > > Fix a total of 43 warnings like these: > > drivers/net/wireless/intersil/orinoco/wext.c:1379:27: warning: cast from 'int (*)(struct net_device *, struct iw_request_info *, struct iw_param *, char *)' to 'iw_handler' (aka 'int (*)(struct net_device *, struct iw_request_info *, union iwreq_data *, char *)') converts to incompatible function type [-Wcast-function-type-strict] > IW_HANDLER(SIOCGIWPOWER, (iw_handler)orinoco_ioctl_getpower), > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > The orinoco Wireless Extension handler callbacks (iw_handler) use a > union for the data argument. Actually use the union and perform explicit > member selection in the function body instead of having a function > prototype mismatch. No significant binary differences were seen > before/after changes. > > These changes were made partly manually and partly with the help of > Coccinelle. > > Link: https://github.com/KSPP/linux/issues/234 > Link: https://reviews.llvm.org/D134831 [1] > Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> Reviewed-by: Kees Cook <keescook@chromium.org>
"Gustavo A. R. Silva" <gustavoars@kernel.org> writes: > When built with Control Flow Integrity, function prototypes between > caller and function declaration must match. These mismatches are visible > at compile time with the new -Wcast-function-type-strict in Clang[1]. > > Fix a total of 227 warnings like these: > > drivers/net/ethernet/brocade/bna/bna_enet.c:519:3: warning: cast from 'void (*)(struct bna_ethport *, enum bna_ethport_event)' to 'bfa_fsm_t' (aka 'void (*)(void *, int)') converts to incompatible function type [-Wcast-function-type-strict] > bfa_fsm_set_state(ethport, bna_ethport_sm_down); > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > The bna state machine code heavily overloads its state machine functions, > so these have been separated into their own sets of structs, enums, > typedefs, and helper functions. There are almost zero binary code changes, > all seem to be related to header file line numbers changing, or the > addition of the new stats helper. > > Important to mention is that while I was manually implementing this changes > I was staring at this[2] patch from Kees Cook. Thanks, Kees. :) > > [1] https://reviews.llvm.org/D134831 > [2] https://lore.kernel.org/linux-hardening/20220929230334.2109344-1-keescook@chromium.org/ > Reviewed-by: Kees Cook <keescook@chromium.org> > Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> > --- > Changes in v3: > - Add RB tag from Kees. > - Update changelog text. > > Changes in v2: > - None. This patch is new in the series. > - Link: https://lore.kernel.org/linux-hardening/2812afc0de278b97413a142d39d939a08ac74025.1666894751.git.gustavoars@kernel.org/ > > drivers/net/ethernet/brocade/bna/bfa_cs.h | 60 +++++++++++++------- > drivers/net/ethernet/brocade/bna/bfa_ioc.c | 10 ++-- > drivers/net/ethernet/brocade/bna/bfa_ioc.h | 8 ++- > drivers/net/ethernet/brocade/bna/bfa_msgq.h | 8 ++- > drivers/net/ethernet/brocade/bna/bna_enet.c | 6 +- > drivers/net/ethernet/brocade/bna/bna_tx_rx.c | 6 +- > drivers/net/ethernet/brocade/bna/bna_types.h | 27 +++++++-- Mixing wifi and ethernet patches in the same patch is not a good idea, the network maintainers might miss this patch. I recommend submitting patch 6 separately.
> Mixing wifi and ethernet patches in the same patch is not a good idea, > the network maintainers might miss this patch. I recommend submitting > patch 6 separately. OK. In the meantime, can you take patches 1-5? :) Thanks! -- Gustavo