iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'chelsio-annotate-structs-with-__counted_by'

Browse Source 
Kees Cook says:

====================
chelsio: Annotate structs with __counted_by

This annotates several chelsio structures with the coming __counted_by
attribute for bounds checking of flexible arrays at run-time. For more details,
see commit dd06e72e68bc ("Compiler Attributes: Add __counted_by macro").
====================

Link: https://lore.kernel.org/r/20230929181042.work.990-kees@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2023-10-04 15:37:15 -07:00
commit f8e5b77862
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/chelsio/cxgb3/l2t.h
View File

@ -76,7 +76,7 @@ struct l2t_data {
atomic_t nfree; /* number of free entries */
rwlock_t lock;
struct rcu_head rcu_head; /* to handle rcu cleanup */
struct l2t_entry l2tab[];
struct l2t_entry l2tab[] __counted_by(nentries);
};
typedef void (*arp_failure_handler_func)(struct t3cdev * dev,

2
drivers/net/ethernet/chelsio/cxgb4/clip_tbl.h
View File

@ -29,7 +29,7 @@ struct clip_tbl {
atomic_t nfree;
struct list_head ce_free_head;
void *cl_list;
struct list_head hash_list[];
struct list_head hash_list[] __counted_by(clipt_size);
};
enum {

2
drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32_parse.h
View File

@ -331,6 +331,6 @@ struct cxgb4_link {
struct cxgb4_tc_u32_table {
unsigned int size; /* number of entries in table */
struct cxgb4_link table[]; /* Jump table */
struct cxgb4_link table[] __counted_by(size); /* Jump table */
};
#endif /* __CXGB4_TC_U32_PARSE_H */

2
drivers/net/ethernet/chelsio/cxgb4/l2t.c
View File

@ -59,7 +59,7 @@ struct l2t_data {
rwlock_t lock;
atomic_t nfree; /* number of free entries */
struct l2t_entry *rover; /* starting point for next allocation */
struct l2t_entry l2tab[]; /* MUST BE LAST */
struct l2t_entry l2tab[] __counted_by(l2t_size); /* MUST BE LAST */
};
static inline unsigned int vlan_prio(const struct l2t_entry *e)

2
drivers/net/ethernet/chelsio/cxgb4/sched.h
View File

@ -82,7 +82,7 @@ struct sched_class {
struct sched_table { /* per port scheduling table */
u8 sched_size;
struct sched_class tab[];
struct sched_class tab[] __counted_by(sched_size);
};
static inline bool can_sched(struct net_device *dev)

2
drivers/net/ethernet/chelsio/cxgb4/smt.h
View File

@ -66,7 +66,7 @@ struct smt_entry {
struct smt_data {
unsigned int smt_size;
rwlock_t lock;
struct smt_entry smtab[];
struct smt_entry smtab[] __counted_by(smt_size);
};
struct smt_data *t4_init_smt(void);