Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

lib: sbi: Refine the way to construct platform features

Browse Source 
sbi_platform_get_features_str() uses sbi_snprintf() to construct the
features_str. However, it passes the wrong length value (i.e., the nfstr),
which should be (nfstr-offset) as the starting point of str (i.e.,
features_str + offset) changes.

This commit also checks the return value of snprintf, and handles the
corner case that the string buffer is full.

Signed-off-by: Dong Du <Dd_nirvana@sjtu.edu.cn>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
This commit is contained in:
Dong Du
2021-09-01 11:06:24 +08:00
committed by Anup Patel
parent 1718b1642e
commit bd355213bf
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/sbi/sbi_platform.c
View File

@@ -48,9 +48,18 @@ void sbi_platform_get_features_str(const struct sbi_platform *plat,
if (features & feat) { if (features & feat) {
temp = sbi_platform_feature_id2string(feat); temp = sbi_platform_feature_id2string(feat);
if (temp) { if (temp) {
sbi_snprintf(features_str + offset, nfstr, int len = sbi_snprintf(features_str + offset,
"%s,", temp); nfstr - offset,
offset = offset + sbi_strlen(temp) + 1; "%s,", temp);
if (len < 0)
break;
if (offset + len >= nfstr) {
/* No more space for features */
offset = nfstr;
break;
} else
offset = offset + len;
} }
} }
feat = feat << 1; feat = feat << 1;