Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09c8a33e authored by Niklas Cassel's avatar Niklas Cassel Committed by Greg Kroah-Hartman
Browse files

soc: qcom: apr: Avoid string overflow 



[ Upstream commit 4fadb26574cb74e5de079dd384f25f44f4fb3ec3 ]

'adev->name' is used as a NUL-terminated string, but using strncpy() with the
length equal to the buffer size may result in lack of the termination:

In function 'apr_add_device',
    inlined from 'of_register_apr_devices' at drivers//soc/qcom/apr.c:264:7,
    inlined from 'apr_probe' at drivers//soc/qcom/apr.c:290:2:
drivers//soc/qcom/apr.c:222:3: warning: 'strncpy' specified bound 32 equals destination size [-Wstringop-truncation]
   strncpy(adev->name, np->name, APR_NAME_SIZE);
   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

This changes it to use the safer strscpy() instead.

Signed-off-by: default avatarNiklas Cassel <niklas.cassel@linaro.org>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarAndy Gross <andy.gross@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6651ecf9

drivers/soc/qcom/apr.c

+2 −2
Original line number Diff line number Diff line
@@ -219,9 +219,9 @@ static int apr_add_device(struct device *dev, struct device_node *np, 
	adev->domain_id = id->domain_id;

	adev->version = id->svc_version;

	if (np)

		strncpy(adev->name, np->name, APR_NAME_SIZE);

		strscpy(adev->name, np->name, APR_NAME_SIZE);

	else

		strncpy(adev->name, id->name, APR_NAME_SIZE);

		strscpy(adev->name, id->name, APR_NAME_SIZE);



	dev_set_name(&adev->dev, "aprsvc:%s:%x:%x", adev->name,

		     id->domain_id, id->svc_id);