Skip to content

Commit 766279a

Browse files
krzkandersson
authored andcommitted
rpmsg: qcom: glink: replace strncpy() with strscpy_pad()
The use of strncpy() is considered deprecated for NUL-terminated strings[1]. Replace strncpy() with strscpy_pad(), to keep existing pad-behavior of strncpy, similarly to commit 08de420 ("rpmsg: glink: Replace strncpy() with strscpy_pad()"). This fixes W=1 warning: In function ‘qcom_glink_rx_close’, inlined from ‘qcom_glink_work’ at ../drivers/rpmsg/qcom_glink_native.c:1638:4: drivers/rpmsg/qcom_glink_native.c:1549:17: warning: ‘strncpy’ specified bound 32 equals destination size [-Wstringop-truncation] 1549 | strncpy(chinfo.name, channel->name, sizeof(chinfo.name)); [1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings Signed-off-by: Krzysztof Kozlowski <[email protected]> Reviewed-by: Stephen Boyd <[email protected]> Signed-off-by: Bjorn Andersson <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 99de650 commit 766279a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

drivers/rpmsg/qcom_glink_native.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1546,7 +1546,7 @@ static void qcom_glink_rx_close(struct qcom_glink *glink, unsigned int rcid)
15461546
cancel_work_sync(&channel->intent_work);
15471547

15481548
if (channel->rpdev) {
1549-
strncpy(chinfo.name, channel->name, sizeof(chinfo.name));
1549+
strscpy_pad(chinfo.name, channel->name, sizeof(chinfo.name));
15501550
chinfo.src = RPMSG_ADDR_ANY;
15511551
chinfo.dst = RPMSG_ADDR_ANY;
15521552

drivers/rpmsg/qcom_smd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,7 +1089,7 @@ static int qcom_smd_create_device(struct qcom_smd_channel *channel)
10891089

10901090
/* Assign public information to the rpmsg_device */
10911091
rpdev = &qsdev->rpdev;
1092-
strncpy(rpdev->id.name, channel->name, RPMSG_NAME_SIZE);
1092+
strscpy_pad(rpdev->id.name, channel->name, RPMSG_NAME_SIZE);
10931093
rpdev->src = RPMSG_ADDR_ANY;
10941094
rpdev->dst = RPMSG_ADDR_ANY;
10951095

@@ -1323,7 +1323,7 @@ static void qcom_channel_state_worker(struct work_struct *work)
13231323

13241324
spin_unlock_irqrestore(&edge->channels_lock, flags);
13251325

1326-
strncpy(chinfo.name, channel->name, sizeof(chinfo.name));
1326+
strscpy_pad(chinfo.name, channel->name, sizeof(chinfo.name));
13271327
chinfo.src = RPMSG_ADDR_ANY;
13281328
chinfo.dst = RPMSG_ADDR_ANY;
13291329
rpmsg_unregister_device(&edge->dev, &chinfo);

0 commit comments

Comments
 (0)