virtio_blk: fix snprintf truncation compiler warning
Subsystems (7)
Sasha Levin
maintainerPATCH 1/5 virtio_blk: fix snprintf truncation compiler warning
From: Stefan Hajnoczi <[email protected]>
[ Upstream commit b8e0792449928943c15d1af9f63816911d139267 ]
Commit 4e0400525691 ("virtio-blk: support polling I/O") triggers the following gcc 13 W=1 warnings:
drivers/block/virtio_blk.c: In function ‘init_vq’:drivers/block/virtio_blk.c:1077:68: warning: ‘%d’ directive output may be truncated writing between 1 and 11 bytes into a region of size 7 [-Wformat-truncation=]
1077 | snprintf(vblk->vqs[i].name, VQ_NAME_LEN, "req_poll.%d", i);
| ^~drivers/block/virtio_blk.c:1077:58: note: directive argument in the range [-2147483648, 65534]
1077 | snprintf(vblk->vqs[i].name, VQ_NAME_LEN, "req_poll.%d", i);
| ^~~~~~~~~~~~~drivers/block/virtio_blk.c:1077:17: note: ‘snprintf’ output between 11 and 21 bytes into a destination of size 16
1077 | snprintf(vblk->vqs[i].name, VQ_NAME_LEN, "req_poll.%d", i);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~This is a false positive because the lower bound -2147483648 is incorrect. The true range of i is [0, num_vqs - 1] where 0 < num_vqs < 65536.
The code mixes int, unsigned short, and unsigned int types in addition to using "%d" for an unsigned value. Use unsigned short and "%u" consistently to solve the compiler warning.
Message-Id: <[email protected]>
--- drivers/block/virtio_blk.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/block/virtio_blk.c +4 -4
@@ -609,12 +609,12 @@ static void virtblk_config_changed(struct virtio_device *vdev)static int init_vq (struct virtio_blk *vblk) {int err; -int i; +unsigned short i;vq_callback_t **callbacks;const char **names;struct virtqueue **vqs;unsigned short num_vqs; -unsigned int num_poll_vqs; +unsigned short num_poll_vqs;struct virtio_device *vdev = vblk->vdev;struct irq_affinity desc = {0 , };
@@ -658,13 +658,13 @@ static int init_vq(struct virtio_blk *vblk)for (i =0 ; i < num_vqs - num_poll_vqs; i++) { callbacks[i] = virtblk_done; -snprintf (vblk->vqs[i].name,VQ_NAME_LEN ,"req.%d" , i); +snprintf (vblk->vqs[i].name,VQ_NAME_LEN ,"req.%u" , i); names[i] = vblk->vqs[i].name; }for (; i < num_vqs; i++) { callbacks[i] =NULL ; -snprintf (vblk->vqs[i].name,VQ_NAME_LEN ,"req_poll.%d" , i); +snprintf (vblk->vqs[i].name,VQ_NAME_LEN ,"req_poll.%u" , i); names[i] = vblk->vqs[i].name; }
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 2/5 nfc: Do not send datagram if socket state isn't LLCP_BOUND
From: Siddh Raman Pant <[email protected]>
[ Upstream commit 6ec0d7527c4287369b52df3bcefd21a0c4fb2b7c ]
As we know we cannot send the datagram (state can be set to LLCP_CLOSED by nfc_llcp_socket_release()), there is no need to proceed further.
Thus, bail out early from llcp_sock_sendmsg().
--- net/nfc/llcp_sock.c | 5 +++++ 1 file changed, 5 insertions(+)
net/nfc/llcp_sock.c +5 -0
@@ -796,6 +796,11 @@ static int llcp_sock_sendmsg(struct socket *sock, struct msghdr *msg, }if (sk->sk_type ==SOCK_DGRAM ) { +if (sk->sk_state !=LLCP_BOUND ) { +release_sock (sk); +return -ENOTCONN ; + } + DECLARE_SOCKADDR(struct sockaddr_nfc_llcp *, addr, msg->msg_name);
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 3/5 net: qrtr: ns: Return 0 if server port is not present
In reply to Sasha LevinFrom: Sarannya S <[email protected]>
[ Upstream commit 9bf2e9165f90dc9f416af53c902be7e33930f728 ]
When a 'DEL_CLIENT' message is received from the remote, the corresponding server port gets deleted. A DEL_SERVER message is then announced for this server. As part of handling the subsequent DEL_SERVER message, the name- server attempts to delete the server port which results in a '-ENOENT' error. The return value from server_del() is then propagated back to qrtr_ns_worker, causing excessive error prints.
To address this, return 0 from control_cmd_del_server() without checking the return value of server_del(), since the above scenario is not an error case and hence server_del() doesn't have any other error return value.
--- net/qrtr/ns.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/qrtr/ns.c +3 -1
@@ -569,7 +569,9 @@ static int ctrl_cmd_del_server(struct sockaddr_qrtr *from,if (!node)return -ENOENT ; -return server_del (node, port, true); +server_del (node, port, true); + +return 0 ; } static int ctrl_cmd_new_lookup(struct sockaddr_qrtr *from,
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 4/5 ARM: sun9i: smp: fix return code check of of_property_match_string
In reply to Sasha LevinFrom: Stefan Wahren <[email protected]>
[ Upstream commit 643fe70e7bcdcc9e2d96952f7fc2bab56385cce5 ]
of_property_match_string returns an int; either an index from 0 or greater if successful or negative on failure. Even it's very unlikely that the DT CPU node contains multiple enable-methods these checks should be fixed.
This patch was inspired by the work of Nick Desaulniers.
--- arch/arm/mach-sunxi/mc_smp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-sunxi/mc_smp.c +2 -2
@@ -804,14 +804,14 @@ static int __init sunxi_mc_smp_init(void)for (i =0 ; i <ARRAY_SIZE (sunxi_mc_smp_data); i++) { ret =of_property_match_string (node,"enable-method" , sunxi_mc_smp_data[i].enable_method); -if (!ret) +if (ret >=0 )break ; } is_a83t = sunxi_mc_smp_data[i].is_a83t;of_node_put (node); -if (ret) +if (ret <0 )return -ENODEV ;if (!sunxi_mc_smp_cpu_table_init ())
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 5/5 nouveau: fix disp disabling with GSP
In reply to Sasha LevinFrom: Dave Airlie <[email protected]>
[ Upstream commit 7854ea0e408d7f2e8faaada1773f3ddf9cb538f5 ]
This func ptr here is normally static allocation, but gsp r535 uses a dynamic pointer, so we need to handle that better.
This fixes a crash with GSP when you use config=disp=0 to avoid disp problems.
--- drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c +4 -2
@@ -359,7 +359,7 @@ nvkm_disp_oneinit(struct nvkm_engine *engine)if (ret)return ret; -if (disp->func->oneinit) { +if (disp->func && disp->func->oneinit) { ret = disp->func->oneinit (disp);if (ret)return ret;
@@ -461,8 +461,10 @@ nvkm_disp_new_(const struct nvkm_disp_func *func, struct nvkm_device *device,spin_lock_init (&disp->client.lock); ret =nvkm_engine_ctor (&nvkm_disp, device, type, inst, true, &disp->engine); -if (ret) +if (ret) { + disp->func =NULL ;return ret; + }if (func->super) { disp->super.wq =create_singlethread_workqueue ("nvkm-disp" );
Signature · 1 line
2.43.0
Re: [PATCH AUTOSEL 6.1 5/5] nouveau: fix disp disabling with GSP
NAK for backporting this to anything, it is just a fix for 6.7
Quoted 46 lines · Sasha Levin
From: Dave Airlie <[email protected]>
[ Upstream commit
7854ea0e408d7f2e8faaada1773f3ddf9cb538f5]This func ptr here is normally static allocation, but gsp r535 uses a dynamic pointer, so we need to handle that better.
This fixes a crash with GSP when you use config=disp=0 to avoid disp problems.
Signed-off-by Dave Airlie <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c +4
-3@@ -359,7 +359,7 @@ nvkm_disp_oneinit(struct nvkm_engine *engine)if (ret)return ret; -if (disp->func->oneinit) { +if (disp->func && disp->func->oneinit) { ret = disp->func->oneinit (disp);if (ret)return ret;@@ -461,8 +461,10 @@ nvkm_disp_new_(const struct nvkm_disp_func *func, struct nvkm_device *device,spin_lock_init (&disp->client.lock); ret =nvkm_engine_ctor (&nvkm_disp, device, type, inst, true, &disp->engine); -if (ret) +if (ret) { + disp->func =NULL ;return ret; + }if (func->super) { disp->super.wq =create_singlethread_workqueue ("nvkm-disp" ); --2.43.0
Sasha Levin
maintainerRe: [PATCH AUTOSEL 6.1 5/5] nouveau: fix disp disabling with GSP
Quoted 1 line · David Airlie
NAK for backporting this to anything, it is just a fix for 6.7
Dropped it from everywhere, thanks!
Signature · 2 lines
Thanks, Sasha