From 8c9979dcc71077c6e00f1ca7509bc05401945b9f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 10 Oct 2022 08:36:44 +0200 Subject: [PATCH] 4.19-stable patches added patches: rpmsg-qcom-glink-replace-strncpy-with-strscpy_pad.patch --- ...ink-replace-strncpy-with-strscpy_pad.patch | 66 +++++++++++++++++++ queue-4.19/series | 1 + 2 files changed, 67 insertions(+) create mode 100644 queue-4.19/rpmsg-qcom-glink-replace-strncpy-with-strscpy_pad.patch diff --git a/queue-4.19/rpmsg-qcom-glink-replace-strncpy-with-strscpy_pad.patch b/queue-4.19/rpmsg-qcom-glink-replace-strncpy-with-strscpy_pad.patch new file mode 100644 index 00000000000..fab4c9a67fe --- /dev/null +++ b/queue-4.19/rpmsg-qcom-glink-replace-strncpy-with-strscpy_pad.patch @@ -0,0 +1,66 @@ +From 766279a8f85df32345dbda03b102ca1ee3d5ddea Mon Sep 17 00:00:00 2001 +From: Krzysztof Kozlowski +Date: Thu, 19 May 2022 09:33:28 +0200 +Subject: rpmsg: qcom: glink: replace strncpy() with strscpy_pad() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Krzysztof Kozlowski + +commit 766279a8f85df32345dbda03b102ca1ee3d5ddea upstream. + +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 08de420a8014 ("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 +Reviewed-by: Stephen Boyd +Signed-off-by: Bjorn Andersson +Link: https://lore.kernel.org/r/20220519073330.7187-1-krzysztof.kozlowski@linaro.org +Signed-off-by: Andrew Chernyakov +Signed-off-by: Greg Kroah-Hartman +--- + drivers/rpmsg/qcom_glink_native.c | 2 +- + drivers/rpmsg/qcom_smd.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/rpmsg/qcom_glink_native.c ++++ b/drivers/rpmsg/qcom_glink_native.c +@@ -1472,7 +1472,7 @@ static void qcom_glink_rx_close(struct q + cancel_work_sync(&channel->intent_work); + + if (channel->rpdev) { +- strncpy(chinfo.name, channel->name, sizeof(chinfo.name)); ++ strscpy_pad(chinfo.name, channel->name, sizeof(chinfo.name)); + chinfo.src = RPMSG_ADDR_ANY; + chinfo.dst = RPMSG_ADDR_ANY; + +--- a/drivers/rpmsg/qcom_smd.c ++++ b/drivers/rpmsg/qcom_smd.c +@@ -1073,7 +1073,7 @@ static int qcom_smd_create_device(struct + + /* Assign public information to the rpmsg_device */ + rpdev = &qsdev->rpdev; +- strncpy(rpdev->id.name, channel->name, RPMSG_NAME_SIZE); ++ strscpy_pad(rpdev->id.name, channel->name, RPMSG_NAME_SIZE); + rpdev->src = RPMSG_ADDR_ANY; + rpdev->dst = RPMSG_ADDR_ANY; + +@@ -1304,7 +1304,7 @@ static void qcom_channel_state_worker(st + + spin_unlock_irqrestore(&edge->channels_lock, flags); + +- strncpy(chinfo.name, channel->name, sizeof(chinfo.name)); ++ strscpy_pad(chinfo.name, channel->name, sizeof(chinfo.name)); + chinfo.src = RPMSG_ADDR_ANY; + chinfo.dst = RPMSG_ADDR_ANY; + rpmsg_unregister_device(&edge->dev, &chinfo); diff --git a/queue-4.19/series b/queue-4.19/series index e0e9e1533b9..f6aff406a5f 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -16,3 +16,4 @@ usb-mon-make-mmapped-memory-read-only.patch usb-serial-ftdi_sio-fix-300-bps-rate-for-sio.patch mmc-core-replace-with-already-defined-values-for-readability.patch mmc-core-terminate-infinite-loop-in-sd-uhs-voltage-switch.patch +rpmsg-qcom-glink-replace-strncpy-with-strscpy_pad.patch -- 2.47.3