RDMA/mlx4: Copy union directly
Subsystems (2)
PATCH 1/1 RDMA/mlx4: Copy union directly
Copy union directly instead of using memcpy().
Note that in this case, a direct assignment is more readable and consistent with the subsequent assignments.
This addresses the following -Wstringop-overflow warning seen in s390
with defconfig:drivers/infiniband/hw/mlx4/main.c:296:33: warning: writing 16 bytes into a region of size 0 [-Wstringop-overflow=]
296 | memcpy(&port_gid_table->gids[free].gid,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
297 | &attr->gid, sizeof(attr->gid));
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~This helps with the ongoing efforts to globally enable -Wstringop-overflow.
--- drivers/infiniband/hw/mlx4/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/infiniband/hw/mlx4/main.c +1 -2
@@ -293,8 +293,7 @@ static int mlx4_ib_add_gid(const struct ib_gid_attr *attr, void **context) ret = -ENOMEM ; }else { *context = port_gid_table->gids[free].ctx; -memcpy (&port_gid_table->gids[free].gid, - &attr->gid,sizeof (attr->gid)); + port_gid_table->gids[free].gid = attr->gid; port_gid_table->gids[free].gid_type = attr->gid_type; port_gid_table->gids[free].vlan_id = vlan_id; port_gid_table->gids[free].ctx->real_index = free;
Signature · 1 line
2.34.1
Quoted 5 lines · Gustavo A. R. Silva
Copy union directly instead of using
memcpy().Note that in this case, a direct assignment is more readable and consistent with the subsequent assignments.
Quoted 7 lines
This addresses the following -Wstringop-overflow warning seen in s390
with defconfig:drivers/infiniband/hw/mlx4/main.c:296:33: warning: writing 16 bytes into a region of size 0 [-Wstringop-overflow=]296 | memcpy(&port_gid_table->gids[free].gid, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 297 | &attr->gid, sizeof(attr->gid)); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Hm, why did it think the union had a size of 0?
Regardless, it's a nice fix:
Signature · 1 line
Kees Cook
Leon Romanovsky
AppliedQuoted 8 lines · Gustavo A. R. Silva
Copy union directly instead of using
memcpy().Note that in this case, a direct assignment is more readable and consistent with the subsequent assignments.
This addresses the following -Wstringop-overflow warning seen in s390
with defconfig:drivers/infiniband/hw/mlx4/main.c:296:33: warning: writing 16 bytes into a region of size 0 [-Wstringop-overflow=]
Quoted 6 lines
296 | memcpy(&port_gid_table->gids[free].gid, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 297 | &attr->gid, sizeof(attr->gid)); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~[...]
Applied, thanks!
[1/1] RDMA/mlx4: Copy union directly
https://git.kernel.org/rdma/rdma/c/18ddaeb03bdb65
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>