]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
tun: zero the whole vnet header in tun_put_user()
authorXiang Mei <xmei5@asu.edu>
Sun, 7 Jun 2026 05:44:28 +0000 (22:44 -0700)
committerJakub Kicinski <kuba@kernel.org>
Wed, 10 Jun 2026 01:33:18 +0000 (18:33 -0700)
tun_put_user() declares an on-stack struct virtio_net_hdr_v1_hash_tunnel
without zeroing it. For a non-tunnel skb, virtio_net_hdr_tnl_from_skb()
only initializes the first 10 bytes (sizeof(struct virtio_net_hdr)),
leaving bytes 10..23 (num_buffers and the hash/tunnel fields) as stack
garbage.

An unprivileged user can set the vnet header size to 24 with
TUNSETVNETHDRSZ, so __tun_vnet_hdr_put() copies all 24 bytes of the
partially-initialized struct to userspace, leaking 14 bytes of kernel
stack on every read of a non-tunnel packet.

Fix it the same way tun_get_user() already does by zeroing the whole
header right after declaration.

Fixes: 288f30435132 ("tun: enable gso over UDP tunnel support.")
Reported-by: Weiming Shi <bestswngs@gmail.com>
Signed-off-by: Xiang Mei <xmei5@asu.edu>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Link: https://patch.msgid.link/20260607054428.3050243-1-xmei5@asu.edu
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/tun.c

index 9e7744eb57a32523406498f4d81c0286617b1695..fed9dfdfcc3bc093970db57392ead13a5bc3fb69 100644 (file)
@@ -2070,6 +2070,7 @@ static ssize_t tun_put_user(struct tun_struct *tun,
                struct virtio_net_hdr_v1_hash_tunnel hdr;
                struct virtio_net_hdr *gso;
 
+               memset(&hdr, 0, sizeof(hdr));
                ret = tun_vnet_hdr_tnl_from_skb(tun->flags, tun->dev, skb,
                                                &hdr);
                if (ret)