2022-02-09 12:26:41

by Julia Lawall

[permalink] [raw]
Subject: [PATCH] remoteproc: fix minmax.cocci warnings

From: kernel test robot <[email protected]>

The code seems more readable with min.

Generated by: scripts/coccinelle/misc/minmax.cocci

Fixes: 2b9408d09dc6 ("remoteproc: Add support for peek from remote and acking kick from remote")
CC: Wendy Liang <[email protected]>
Reported-by: kernel test robot <[email protected]>
Signed-off-by: kernel test robot <[email protected]>
Signed-off-by: Julia Lawall <[email protected]>

---

tree: https://github.com/Xilinx/linux-xlnx xlnx_rebase_v5.15
head: 1183ce490adb103e5e569b8ebd74c50c885ddc05
commit: 2b9408d09dc6367fd2f0820f0c7beab69e9aed56 [550/872] remoteproc: Add support for peek from remote and acking kick from remote
:::::: branch date: 7 days ago
:::::: commit date: 7 days ago

remoteproc_sysfs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/remoteproc/remoteproc_sysfs.c
+++ b/drivers/remoteproc/remoteproc_sysfs.c
@@ -241,7 +241,7 @@ static ssize_t kick_store(struct device
size_t cpy_len;

(void)attr;
- cpy_len = count <= sizeof(id) ? count : sizeof(id);
+ cpy_len = min(count, sizeof(id));
memcpy((char *)(&id), buf, cpy_len);

if (rproc->ops->kick)


2022-02-10 19:11:01

by Mathieu Poirier

[permalink] [raw]
Subject: Re: [PATCH] remoteproc: fix minmax.cocci warnings

Hi,

On Tue, Feb 08, 2022 at 09:41:39PM +0100, Julia Lawall wrote:
> From: kernel test robot <[email protected]>
>
> The code seems more readable with min.
>
> Generated by: scripts/coccinelle/misc/minmax.cocci
>
> Fixes: 2b9408d09dc6 ("remoteproc: Add support for peek from remote and acking kick from remote")
> CC: Wendy Liang <[email protected]>
> Reported-by: kernel test robot <[email protected]>
> Signed-off-by: kernel test robot <[email protected]>
> Signed-off-by: Julia Lawall <[email protected]>
>
> ---
>
> tree: https://github.com/Xilinx/linux-xlnx xlnx_rebase_v5.15
> head: 1183ce490adb103e5e569b8ebd74c50c885ddc05
> commit: 2b9408d09dc6367fd2f0820f0c7beab69e9aed56 [550/872] remoteproc: Add support for peek from remote and acking kick from remote
> :::::: branch date: 7 days ago
> :::::: commit date: 7 days ago
>
> remoteproc_sysfs.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- a/drivers/remoteproc/remoteproc_sysfs.c
> +++ b/drivers/remoteproc/remoteproc_sysfs.c
> @@ -241,7 +241,7 @@ static ssize_t kick_store(struct device
> size_t cpy_len;
>
> (void)attr;
> - cpy_len = count <= sizeof(id) ? count : sizeof(id);
> + cpy_len = min(count, sizeof(id));

Looking at the min() macro the above would become "count < sizeof(id)" rather
than "count <= sizeof(id)". I don't have more context into this code because I
can't find it in rproc-next nor today's linux-next, but it is something to look
into. The patch is also missing the minmax.h include for the min() macro.

Thanks,
Mathieu

> memcpy((char *)(&id), buf, cpy_len);
>
> if (rproc->ops->kick)