| Message ID | d38582083ece76155dabdfd9a29d5a9dd0d6bce7.1693855091.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | accel/habanalabs/gaudi2: Fix incorrect string length computation in gaudi2_psoc_razwi_get_engines() | expand |
On Mon, Sep 04, 2023 at 09:18:36PM +0200, Christophe JAILLET wrote: > snprintf() returns the "number of characters which *would* be generated for > the given input", not the size *really* generated. > > In order to avoid too large values for 'str_size' (and potential negative > values for "PSOC_RAZWI_ENG_STR_SIZE - str_size") use scnprintf() > instead of snprintf(). > > Fixes: c0e6df916050 ("accel/habanalabs: fix address decode RAZWI handling") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
On Tue, Sep 5, 2023 at 3:28 PM Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com> wrote: > > On Mon, Sep 04, 2023 at 09:18:36PM +0200, Christophe JAILLET wrote: > > snprintf() returns the "number of characters which *would* be generated for > > the given input", not the size *really* generated. > > > > In order to avoid too large values for 'str_size' (and potential negative > > values for "PSOC_RAZWI_ENG_STR_SIZE - str_size") use scnprintf() > > instead of snprintf(). > > > > Fixes: c0e6df916050 ("accel/habanalabs: fix address decode RAZWI handling") > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > Reviewed-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com> Applied to -next. Thanks for the patch. Oded
diff --git a/drivers/accel/habanalabs/gaudi2/gaudi2.c b/drivers/accel/habanalabs/gaudi2/gaudi2.c index d94acec63d95..9617c062b7ca 100644 --- a/drivers/accel/habanalabs/gaudi2/gaudi2.c +++ b/drivers/accel/habanalabs/gaudi2/gaudi2.c @@ -8277,11 +8277,11 @@ static int gaudi2_psoc_razwi_get_engines(struct gaudi2_razwi_info *razwi_info, u eng_id[num_of_eng] = razwi_info[i].eng_id; base[num_of_eng] = razwi_info[i].rtr_ctrl; if (!num_of_eng) - str_size += snprintf(eng_name + str_size, + str_size += scnprintf(eng_name + str_size, PSOC_RAZWI_ENG_STR_SIZE - str_size, "%s", razwi_info[i].eng_name); else - str_size += snprintf(eng_name + str_size, + str_size += scnprintf(eng_name + str_size, PSOC_RAZWI_ENG_STR_SIZE - str_size, " or %s", razwi_info[i].eng_name); num_of_eng++;
snprintf() returns the "number of characters which *would* be generated for the given input", not the size *really* generated. In order to avoid too large values for 'str_size' (and potential negative values for "PSOC_RAZWI_ENG_STR_SIZE - str_size") use scnprintf() instead of snprintf(). Fixes: c0e6df916050 ("accel/habanalabs: fix address decode RAZWI handling") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- drivers/accel/habanalabs/gaudi2/gaudi2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)