VSOCK: fix Information Leak in virtio_transport_shutdown()
Subsystems (6)
PATCH 1/1 VSOCK: fix Information Leak in virtio_transport_shutdown()
From: Henry Martin <[email protected]>
The struct virtio_vsock_pkt_info is declared on the stack but only partially initialized (only op, flags, and vsk are set)
The uninitialized fields (including pkt_len, remote_cid, remote_port, etc.) contain residual kernel stack data. This structure is passed to virtio_transport_send_pkt_info(), which uses the uninitialized fields.
--- net/vmw_vsock/virtio_transport_common.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
net/vmw_vsock/virtio_transport_common.c +8 -8
@@ -1073,14 +1073,14 @@ EXPORT_SYMBOL_GPL(virtio_transport_connect);int virtio_transport_shutdown (struct vsock_sock *vsk,int mode) { -struct virtio_vsock_pkt_info info = { - .op =VIRTIO_VSOCK_OP_SHUTDOWN , - .flags = (mode &RCV_SHUTDOWN ? -VIRTIO_VSOCK_SHUTDOWN_RCV :0 ) | - (mode &SEND_SHUTDOWN ? -VIRTIO_VSOCK_SHUTDOWN_SEND :0 ), - .vsk = vsk, - }; +struct virtio_vsock_pkt_info info = {0 }; + + info.op =VIRTIO_VSOCK_OP_SHUTDOWN ; + info.flags = (mode &RCV_SHUTDOWN ? +VIRTIO_VSOCK_SHUTDOWN_RCV :0 ) | + (mode &SEND_SHUTDOWN ? +VIRTIO_VSOCK_SHUTDOWN_SEND :0 ); + info.vsk = vsk;return virtio_transport_send_pkt_info (vsk, &info); }
Signature · 1 line
2.41.3
Quoted 34 lines · 在 2025/8/5 13:10, [email protected] 写道:
From: Henry Martin <[email protected]>
The
struct virtio_vsock_pkt_infois declared on the stack but only partially initialized (onlyop,flags, andvskare set)The uninitialized fields (including
pkt_len,remote_cid,remote_port, etc.) contain residual kernel stack data. This structure is passed tovirtio_transport_send_pkt_info(), which uses the uninitialized fields.Fixes 06a8fc78367d ("VSOCK: Introduce virtio_vsock_common.ko")Reported-by TCS Robot <[email protected]>Signed-off-by Henry Martin <[email protected]>--- net/vmw_vsock/virtio_transport_common.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)net/vmw_vsock/virtio_transport_common.c +1
-8@@ -1073,14 +1073,14 @@ EXPORT_SYMBOL_GPL(virtio_transport_connect);int virtio_transport_shutdown (struct vsock_sock *vsk,int mode) { -struct virtio_vsock_pkt_info info = { - .op =VIRTIO_VSOCK_OP_SHUTDOWN , - .flags = (mode &RCV_SHUTDOWN ? -VIRTIO_VSOCK_SHUTDOWN_RCV :0 ) | - (mode &SEND_SHUTDOWN ? -VIRTIO_VSOCK_SHUTDOWN_SEND :0 ), - .vsk = vsk, - }; +struct virtio_vsock_pkt_info info = {0 };
net/vmw_vsock/virtio_transport_common.c EXPORT_SYMBOL_GPL(virtio_transport_connect); · line 1086
Quoted 10 lines
net/vmw_vsock/virtio_transport_common.c +7
-0+ + info.op =VIRTIO_VSOCK_OP_SHUTDOWN ; + info.flags = (mode &RCV_SHUTDOWN ? +VIRTIO_VSOCK_SHUTDOWN_RCV :0 ) | + (mode &SEND_SHUTDOWN ? +VIRTIO_VSOCK_SHUTDOWN_SEND :0 ); + info.vsk = vsk;return virtio_transport_send_pkt_info (vsk, &info); }
No. The unassigned members (including pkt_len, remote_cid, remote_port, etc.) will be automatically initialized to 0?
Stefano Garzarella
maintainerQuoted 23 lines · On Tue, Aug 05, 2025 at 01:10:09PM +0800, [email protected] wrote:
From: Henry Martin <[email protected]>
The
struct virtio_vsock_pkt_infois declared on the stack but only partially initialized (onlyop,flags, andvskare set)The uninitialized fields (including
pkt_len,remote_cid,remote_port, etc.) contain residual kernel stack data. This structure is passed tovirtio_transport_send_pkt_info(), which uses the uninitialized fields.Fixes 06a8fc78367d ("VSOCK: Introduce virtio_vsock_common.ko")Reported-by TCS Robot <[email protected]>Signed-off-by Henry Martin <[email protected]>---
net/vmw_vsock/virtio_transport_common.c| 15 +++++++--------1 file changed, 7 insertions(+), 8 deletions(-)net/vmw_vsock/virtio_transport_common.c +0
-0@@ -1073,14 +1073,14 @@ EXPORT_SYMBOL_GPL(virtio_transport_connect);
net/vmw_vsock/virtio_transport_common.c EXPORT_SYMBOL_GPL(virtio_transport_connect); · line 1083
Quoted 10 lines
net/vmw_vsock/virtio_transport_common.c +0
-8int virtio_transport_shutdown (struct vsock_sock *vsk,int mode) { -struct virtio_vsock_pkt_info info = { - .op =VIRTIO_VSOCK_OP_SHUTDOWN , - .flags = (mode &RCV_SHUTDOWN ? -VIRTIO_VSOCK_SHUTDOWN_RCV :0 ) | - (mode &SEND_SHUTDOWN ? -VIRTIO_VSOCK_SHUTDOWN_SEND :0 ), - .vsk = vsk, - };
The compiler sets all other fields to 0, so I don't understand what this patch solves. Can you give an example of the problem you found?
Furthermore, even if this fix were valid, why do it for just one function?
Stefano
Quoted 14 lines
net/vmw_vsock/virtio_transport_common.c +8
-0+struct virtio_vsock_pkt_info info = {0 }; + + info.op =VIRTIO_VSOCK_OP_SHUTDOWN ; + info.flags = (mode &RCV_SHUTDOWN ? +VIRTIO_VSOCK_SHUTDOWN_RCV :0 ) | + (mode &SEND_SHUTDOWN ? +VIRTIO_VSOCK_SHUTDOWN_SEND :0 ); + info.vsk = vsk;return virtio_transport_send_pkt_info (vsk, &info); }Signature · 1 line
2.41.3
Thanks for the quick review. You're right—this patch is a false positive. Modern compilers zero out the remaining fields, so the fix isn't needed.
I'll be withdrawing all the patches and will ensure we more carefully evaluate our robot's findings before submitting in the future.
Thanks for your help!
Quoted 60 lines · Stefano Garzarella <[email protected]> 于2025年8月5日周二 15:01写道:
Quoted 23 lines · On Tue, Aug 05, 2025 at 01:10:09PM +0800, [email protected] wrote:
From: Henry Martin <[email protected]>
The
struct virtio_vsock_pkt_infois declared on the stack but only partially initialized (onlyop,flags, andvskare set)The uninitialized fields (including
pkt_len,remote_cid,remote_port, etc.) contain residual kernel stack data. This structure is passed tovirtio_transport_send_pkt_info(), which uses the uninitialized fields.Fixes 06a8fc78367d ("VSOCK: Introduce virtio_vsock_common.ko")Reported-by TCS Robot <[email protected]>Signed-off-by Henry Martin <[email protected]>---
net/vmw_vsock/virtio_transport_common.c| 15 +++++++--------1 file changed, 7 insertions(+), 8 deletions(-)net/vmw_vsock/virtio_transport_common.c +0
-0@@ -1073,14 +1073,14 @@ EXPORT_SYMBOL_GPL(virtio_transport_connect);net/vmw_vsock/virtio_transport_common.c EXPORT_SYMBOL_GPL(virtio_transport_connect); · line 1083
Quoted 10 lines
net/vmw_vsock/virtio_transport_common.c +0
-8int virtio_transport_shutdown (struct vsock_sock *vsk,int mode) { -struct virtio_vsock_pkt_info info = { - .op =VIRTIO_VSOCK_OP_SHUTDOWN , - .flags = (mode &RCV_SHUTDOWN ? -VIRTIO_VSOCK_SHUTDOWN_RCV :0 ) | - (mode &SEND_SHUTDOWN ? -VIRTIO_VSOCK_SHUTDOWN_SEND :0 ), - .vsk = vsk, - };The compiler sets all other fields to 0, so I don't understand what this patch solves.
Can you give an example of the problem you found?Furthermore, even if this fix were valid, why do it for just one function?
Stefano
Quoted 14 lines
net/vmw_vsock/virtio_transport_common.c +8
-1+struct virtio_vsock_pkt_info info = {0 }; + + info.op =VIRTIO_VSOCK_OP_SHUTDOWN ; + info.flags = (mode &RCV_SHUTDOWN ? +VIRTIO_VSOCK_SHUTDOWN_RCV :0 ) | + (mode &SEND_SHUTDOWN ? +VIRTIO_VSOCK_SHUTDOWN_SEND :0 ); + info.vsk = vsk;return virtio_transport_send_pkt_info (vsk, &info); } --2.41.3
Quoted 2 lines
The
struct virtio_vsock_pkt_infois declared on the stack but only partially initialized (onlyop,flags, andvskare set)
…
See also once more:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v6.16#n94
Would a summary phrase like “Prevent information leak in virtio_transport_shutdown()” be nicer?
Regards,
Markus