github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

crypto: hisilicon/qm - annotate cap_tables with __counted_by_ptr

Browse Source 
Annotate the 'qm_cap_table' and 'dev_cap_table' pointer fields in
'struct hisi_qm_cap_tables' with the '__counted_by_ptr' attribute.
This improves bounds checking via CONFIG_UBSAN_BOUNDS and
CONFIG_FORTIFY_SOURCE, allowing KASAN and compiler diagnostics to
detect out-of-bounds accesses.

The 'qm_cap_table' pointer is associated with 'qm_cap_size' which
specifies its element count. Similarly, 'dev_cap_table' is associated
with 'dev_cap_size'.

To ensure safety under compiler instrumentation, the assignments in the
initialization paths have been updated to set the 'size'/'count' fields
prior to setting the pointer fields. This prevents any transient state
where the pointer is valid but the count is 0 (or uninitialized),
ensuring that subsequent accesses to these tables do not trigger
false-positive bounds check panics.

Cc: codemender-patching+linux@google.com
Assisted-by: LLM
Signed-off-by: Bill Wendling <morbo@google.com>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: Longfang Liu <liulongfang@huawei.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Bill Wendling 2026-09-23 06:01:14 +00:00 committed by Herbert Xu
parent 780cd10c8e
commit 973eb89550
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/crypto/hisilicon/hpre/hpre_main.c
View File

@ -1223,8 +1223,8 @@ static int hpre_pre_store_cap_reg(struct hisi_qm *qm)
return -EINVAL;
}
qm->cap_tables.dev_cap_table = hpre_cap;
qm->cap_tables.dev_cap_size = size;
qm->cap_tables.dev_cap_table = hpre_cap;
return 0;
}

2
drivers/crypto/hisilicon/qm.c
View File

@ -5743,8 +5743,8 @@ static int qm_pre_store_caps(struct hisi_qm *qm)
i, qm->cap_ver);
}
qm->cap_tables.qm_cap_table = qm_cap;
qm->cap_tables.qm_cap_size = size;
qm->cap_tables.qm_cap_table = qm_cap;
return 0;
}

2
drivers/crypto/hisilicon/sec2/sec_main.c
View File

@ -1285,8 +1285,8 @@ static int sec_pre_store_cap_reg(struct hisi_qm *qm)
i, qm->cap_ver);
}
qm->cap_tables.dev_cap_table = sec_cap;
qm->cap_tables.dev_cap_size = size;
qm->cap_tables.dev_cap_table = sec_cap;
return 0;
}

2
drivers/crypto/hisilicon/zip/zip_main.c
View File

@ -1400,8 +1400,8 @@ static int zip_pre_store_cap_reg(struct hisi_qm *qm)
i, qm->cap_ver);
}
qm->cap_tables.dev_cap_table = zip_cap;
qm->cap_tables.dev_cap_size = size;
qm->cap_tables.dev_cap_table = zip_cap;
return 0;
}

4
include/linux/hisi_acc_qm.h
View File

@ -332,9 +332,9 @@ struct hisi_qm_cap_record {
struct hisi_qm_cap_tables {
u32 qm_cap_size;
struct hisi_qm_cap_record *qm_cap_table;
struct hisi_qm_cap_record *qm_cap_table __counted_by_ptr(qm_cap_size);
u32 dev_cap_size;
struct hisi_qm_cap_record *dev_cap_table;
struct hisi_qm_cap_record *dev_cap_table __counted_by_ptr(dev_cap_size);
};
struct hisi_qm_list {