Commit d8e45f29 authored by Kees Cook's avatar Kees Cook
Browse files

overflow: Change DEFINE_FLEX to take __counted_by member 



The norm should be flexible array structures with __counted_by
annotations, so DEFINE_FLEX() is updated to expect that. Rename
the non-annotated version to DEFINE_RAW_FLEX(), and update the
few existing users. Additionally add selftests for the macros.

Reviewed-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/20240306235128.it.933-kees@kernel.org


Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent acd80cdc

drivers/net/ethernet/intel/ice/ice_base.c

+2 −2
Original line number Diff line number Diff line
@@ -956,7 +956,7 @@ ice_vsi_cfg_txq(struct ice_vsi *vsi, struct ice_tx_ring *ring, 
int ice_vsi_cfg_single_txq(struct ice_vsi *vsi, struct ice_tx_ring **tx_rings,

			   u16 q_idx)

{

	DEFINE_FLEX(struct ice_aqc_add_tx_qgrp, qg_buf, txqs, 1);

	DEFINE_RAW_FLEX(struct ice_aqc_add_tx_qgrp, qg_buf, txqs, 1);



	if (q_idx >= vsi->alloc_txq || !tx_rings || !tx_rings[q_idx])

		return -EINVAL;
@@ -978,7 +978,7 @@ int ice_vsi_cfg_single_txq(struct ice_vsi *vsi, struct ice_tx_ring **tx_rings, 
static int

ice_vsi_cfg_txqs(struct ice_vsi *vsi, struct ice_tx_ring **rings, u16 count)

{

	DEFINE_FLEX(struct ice_aqc_add_tx_qgrp, qg_buf, txqs, 1);

	DEFINE_RAW_FLEX(struct ice_aqc_add_tx_qgrp, qg_buf, txqs, 1);

	int err = 0;

	u16 q_idx;

drivers/net/ethernet/intel/ice/ice_common.c

+2 −2
Original line number Diff line number Diff line
@@ -4695,7 +4695,7 @@ ice_dis_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_queues, 
		enum ice_disq_rst_src rst_src, u16 vmvf_num,

		struct ice_sq_cd *cd)

{

	DEFINE_FLEX(struct ice_aqc_dis_txq_item, qg_list, q_id, 1);

	DEFINE_RAW_FLEX(struct ice_aqc_dis_txq_item, qg_list, q_id, 1);

	u16 i, buf_size = __struct_size(qg_list);

	struct ice_q_ctx *q_ctx;

	int status = -ENOENT;
@@ -4917,7 +4917,7 @@ int 
ice_dis_vsi_rdma_qset(struct ice_port_info *pi, u16 count, u32 *qset_teid,

		      u16 *q_id)

{

	DEFINE_FLEX(struct ice_aqc_dis_txq_item, qg_list, q_id, 1);

	DEFINE_RAW_FLEX(struct ice_aqc_dis_txq_item, qg_list, q_id, 1);

	u16 qg_size = __struct_size(qg_list);

	struct ice_hw *hw;

	int status = 0;

drivers/net/ethernet/intel/ice/ice_ddp.c

+4 −4
Original line number Diff line number Diff line
@@ -1938,7 +1938,7 @@ static enum ice_ddp_state ice_init_pkg_info(struct ice_hw *hw, 
 */

static enum ice_ddp_state ice_get_pkg_info(struct ice_hw *hw)

{

	DEFINE_FLEX(struct ice_aqc_get_pkg_info_resp, pkg_info, pkg_info,

	DEFINE_RAW_FLEX(struct ice_aqc_get_pkg_info_resp, pkg_info, pkg_info,

			ICE_PKG_CNT);

	u16 size = __struct_size(pkg_info);

	u32 i;
@@ -1990,7 +1990,7 @@ static enum ice_ddp_state ice_chk_pkg_compat(struct ice_hw *hw, 
					     struct ice_pkg_hdr *ospkg,

					     struct ice_seg **seg)

{

	DEFINE_FLEX(struct ice_aqc_get_pkg_info_resp, pkg, pkg_info,

	DEFINE_RAW_FLEX(struct ice_aqc_get_pkg_info_resp, pkg, pkg_info,

			ICE_PKG_CNT);

	u16 size = __struct_size(pkg);

	enum ice_ddp_state state;

drivers/net/ethernet/intel/ice/ice_lag.c

+3 −3
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ static void 
ice_lag_move_vf_node_tc(struct ice_lag *lag, u8 oldport, u8 newport,

			u16 vsi_num, u8 tc)

{

	DEFINE_FLEX(struct ice_aqc_move_elem, buf, teid, 1);

	DEFINE_RAW_FLEX(struct ice_aqc_move_elem, buf, teid, 1);

	struct device *dev = ice_pf_to_dev(lag->pf);

	u16 numq, valq, num_moved, qbuf_size;

	u16 buf_size = __struct_size(buf);
@@ -849,7 +849,7 @@ static void 
ice_lag_reclaim_vf_tc(struct ice_lag *lag, struct ice_hw *src_hw, u16 vsi_num,

		      u8 tc)

{

	DEFINE_FLEX(struct ice_aqc_move_elem, buf, teid, 1);

	DEFINE_RAW_FLEX(struct ice_aqc_move_elem, buf, teid, 1);

	struct device *dev = ice_pf_to_dev(lag->pf);

	u16 numq, valq, num_moved, qbuf_size;

	u16 buf_size = __struct_size(buf);
@@ -1873,7 +1873,7 @@ static void 
ice_lag_move_vf_nodes_tc_sync(struct ice_lag *lag, struct ice_hw *dest_hw,

			      u16 vsi_num, u8 tc)

{

	DEFINE_FLEX(struct ice_aqc_move_elem, buf, teid, 1);

	DEFINE_RAW_FLEX(struct ice_aqc_move_elem, buf, teid, 1);

	struct device *dev = ice_pf_to_dev(lag->pf);

	u16 numq, valq, num_moved, qbuf_size;

	u16 buf_size = __struct_size(buf);

drivers/net/ethernet/intel/ice/ice_sched.c

+2 −2
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static int 
ice_sched_remove_elems(struct ice_hw *hw, struct ice_sched_node *parent,

		       u32 node_teid)

{

	DEFINE_FLEX(struct ice_aqc_delete_elem, buf, teid, 1);

	DEFINE_RAW_FLEX(struct ice_aqc_delete_elem, buf, teid, 1);

	u16 buf_size = __struct_size(buf);

	u16 num_groups_removed = 0;

	int status;
@@ -2219,7 +2219,7 @@ int 
ice_sched_move_nodes(struct ice_port_info *pi, struct ice_sched_node *parent,

		     u16 num_items, u32 *list)

{

	DEFINE_FLEX(struct ice_aqc_move_elem, buf, teid, 1);

	DEFINE_RAW_FLEX(struct ice_aqc_move_elem, buf, teid, 1);

	u16 buf_len = __struct_size(buf);

	struct ice_sched_node *node;

	u16 i, grps_movd = 0;