netdev - [PATCH net-next v5 1/2] drivers: net: prevent tun_build

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20230803185947.2379988-1-andrew.kanner@gmail.com>
Date: Thu,  3 Aug 2023 20:59:48 +0200
From: Andrew Kanner <andrew.kanner@...il.com>
To: davem@...emloft.net,
	edumazet@...gle.com,
	kuba@...nel.org,
	pabeni@...hat.com,
	jasowang@...hat.com,
	netdev@...r.kernel.org,
	hawk@...nel.org,
	jbrouer@...hat.com,
	dsahern@...il.com,
	john.fastabend@...il.com,
	linux-kernel@...r.kernel.org
Cc: linux-kernel-mentees@...ts.linuxfoundation.org,
	syzbot+f817490f5bd20541b90a@...kaller.appspotmail.com,
	Andrew Kanner <andrew.kanner@...il.com>
Subject: [PATCH net-next v5 1/2] drivers: net: prevent tun_build_skb() to exceed the packet size limit

Using the syzkaller repro with reduced packet size it was discovered
that XDP_PACKET_HEADROOM is not checked in tun_can_build_skb(),
although pad may be incremented in tun_build_skb(). This may end up
with exceeding the PAGE_SIZE limit in tun_build_skb().

Jason Wang <jasowang@...hat.com> proposed to count XDP_PACKET_HEADROOM
always (e.g. without rcu_access_pointer(tun->xdp_prog)) in
tun_can_build_skb() since there's a window during which XDP program
might be attached between tun_can_build_skb() and tun_build_skb().

Fixes: 7df13219d757 ("tun: reserve extra headroom only when XDP is set")
Link: https://syzkaller.appspot.com/bug?extid=f817490f5bd20541b90a
Signed-off-by: Andrew Kanner <andrew.kanner@...il.com>
---

Notes (akanner):
    v5:
      - always count XDP_PACKET_HEADROOM in tun_can_build_skb() as there's a
        window between tun_can_build_skb() and tun_build_skb() and XDP
        program might be attached there.
      - rcu_read_lock/unlock() for tun->xdp_prog were completely removed and
        there's no need to use rcu_access_pointer() instead which was noted
        by David Ahern <dsahern@...il.com>.
    v4: https://lore.kernel.org/all/20230801220710.464-1-andrew.kanner@gmail.com/T/
      - fall back to v1, fixing only missing XDP_PACKET_HEADROOM in pad
        and removing bpf_xdp_adjust_tail() check for frame_sz.
      - added rcu read lock, noted by Jason Wang <jasowang@...hat.com> in
        v1
      - I decided to leave the packet length check in tun_can_build_skb()
        instead of moving to tun_build_skb() suggested by Jason Wang
        <jasowang@...hat.com>. Otherwise extra packets will be dropped
        without falling back to tun_alloc_skb(). And in the discussion of
        v3 Jesper Dangaard Brouer <jbrouer@...hat.com> noticed that XDP is
        ok with a higher order pages if it's a contiguous physical memory
        allocation, so falling to tun_alloc_skb() -> do_xdp_generic()
        should be ok.
    v3: https://lore.kernel.org/all/20230725155403.796-1-andrew.kanner@gmail.com/T/
      - attach the forgotten changelog
    v2: https://lore.kernel.org/all/20230725153941.653-1-andrew.kanner@gmail.com/T/
      - merged 2 patches in 1, fixing both issues: WARN_ON_ONCE with
        syzkaller repro and missing XDP_PACKET_HEADROOM in pad
      - changed the title and description of the execution path, suggested
        by Jason Wang <jasowang@...hat.com>
      - move the limit check from tun_can_build_skb() to tun_build_skb()
        to remove duplication and locking issue, and also drop the packet
        in case of a failed check - noted by Jason Wang
        <jasowang@...hat.com>
    v1: https://lore.kernel.org/all/20230724221326.384-1-andrew.kanner@gmail.com/T/

 drivers/net/tun.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 25f0191df00b..100339bc8b04 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1594,7 +1594,7 @@ static bool tun_can_build_skb(struct tun_struct *tun, struct tun_file *tfile,
 	if (zerocopy)
 		return false;
 
-	if (SKB_DATA_ALIGN(len + TUN_RX_PAD) +
+	if (SKB_DATA_ALIGN(len + TUN_RX_PAD + XDP_PACKET_HEADROOM) +
 	    SKB_DATA_ALIGN(sizeof(struct skb_shared_info)) > PAGE_SIZE)
 		return false;
 
-- 
2.39.3