From patchwork Thu Aug 3 18:59:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Kanner X-Patchwork-Id: 130857 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp1400392vqx; Thu, 3 Aug 2023 13:55:52 -0700 (PDT) X-Google-Smtp-Source: APBJJlHG+lEj0Yv+Lq5YhabWKnGO2xJdk8X2r1zA3wjBLiXcHKAaFWdDgV2cqjb1egYZGK5st8ke X-Received: by 2002:a05:6808:1211:b0:3a1:d629:d1dd with SMTP id a17-20020a056808121100b003a1d629d1ddmr25590405oil.56.1691096152626; Thu, 03 Aug 2023 13:55:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691096152; cv=none; d=google.com; s=arc-20160816; b=oM5UbW5f3MluY8NFdUaDDooeXTYDIFhux/wkP8MbXU+L98+5ZUhrQ7pYhc9urcqQDK AmrdxZtvixJmWpjLdLsfVdU55CxDeLCbDFxL2MYhtILQlvmvGy6UM859Hp3hQJnZOMFi zMIRINFS1ngJlNvxJ/AneL4sRhkZIGxqbVhel97sFKM1uXdiDx7KZdKd2iAUZRntHJzT ZvGAR7v/5zPbfgOFNVlYSOiMfEqQR7WG0ByETccxSFE0nug4n+uYpiJpNBKAg/faYCZG 727zFB1o1q5ov1jpGAKU6HSVN5XuyIHe+9sQ9msJYx929FVMmSjqlM+gW7H5+htXgq35 AgwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=fpJNHhs8hGi2yDC45xTTVL8bPEioZdZntYr6lajc9vM=; fh=IF+y20gbIuOPMFnUD07j8ckGhRwRWHSdpdsouObJbDs=; b=w7RycDHuze/MBJHYzKnkSv+dnlYZxqM/5tXbjbGNdutLxTUoo4qWtP9mH1D+v1RZSL SGIBbROIKUjyqsaq+tH62I6fY/nHeWLT/VrxPGKXvQEkCL8uzmMP4NTVCuoegGCxRJtz cqRaQHfRx0cEE4BD2LqdTyhAHoLahgZuoJETRcIwpC9hixrEUJSmbwnOr+RP9PG84D70 DNQP3xr1ICStogJp19to4q+1kQZ05VCph5SBRiyoQbXRIOV4gYoL3V9Ey2l0YwtVV0Ho 4HRzkyNMce9obZYCNzC5+grMmKkFiYIlKhP+sSaWvam1r31eerE+mGYz+ZU5VKg+KGcG TY9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=k5NDFDrE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y23-20020a631817000000b00563db158152si514228pgl.457.2023.08.03.13.55.38; Thu, 03 Aug 2023 13:55:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=k5NDFDrE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230122AbjHCTAg (ORCPT + 99 others); Thu, 3 Aug 2023 15:00:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229822AbjHCTAe (ORCPT ); Thu, 3 Aug 2023 15:00:34 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B9802D45; Thu, 3 Aug 2023 12:00:30 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-99bed101b70so177599466b.3; Thu, 03 Aug 2023 12:00:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691089229; x=1691694029; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=fpJNHhs8hGi2yDC45xTTVL8bPEioZdZntYr6lajc9vM=; b=k5NDFDrEg+9nNDfAkqK83fDOp8A5hffycEbrlbI1/HFSkoagQYZMmMPYLy72x3L1wF JTyYZl2/V9SuoMJt9V3F/7xfyxu01MSFXa2Xhu/TtBD6BVVPbIYsb+0cN3OSQ4ZzY7qV sLMQfRL+DlBOv9af5SFsYVhKt8Yrf8E+RH9PvIzTXoXF5B3MwM01l3mdjlPDFa94T/5x XIi4lG512p/FVDpSvNiARyeXHw50IbimFnqlTAn/a/o63GlyqwYjJBdWDdtAbFGbfknY PcDd53ab0QCfjsii/z7pcosDnLaQrDL9LBgq9QPpZCYn7XUPYkMAEojnEN9BefiQyZTN 77Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691089229; x=1691694029; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=fpJNHhs8hGi2yDC45xTTVL8bPEioZdZntYr6lajc9vM=; b=hliGL4XMG/izhD1vc88sC/3AMnwPi5BEVOqy0h4xklm+8uTHpXUUSmaI887BJ3NK6O 1AqKAN1wkmWx2kB9NbYCg+ps2kSh3VQW3hWkJdJTLrPZa35lYYRdmv9F6pfPjib7Hb+U aBKr9nAvXdgQ8QhHx7s8I339UDOM8SEM/Q9Y1nJhAvRBV3P4TgsJZWbNVzU+7RwIy3LK kv5cWVi9MUJbRCNAAIZ25z6bX7KUhOHrTIveyi5MJLqG6IkArDPPWlF+vEZybeEjHdfk NFN80W/o8p28qraKQ4CgF68RmOMK/UW4a2GTBAZXpusFrxU8y92fjI/6bADEjPe4Av5N EVTQ== X-Gm-Message-State: ABy/qLaQCra+qoNC0DaP69C/xqa1EVABm1BOEeUnSpJuE8ckWQ29PXV0 6kbzbVSNNmr10KayXSenttw= X-Received: by 2002:a17:906:20d9:b0:994:47a0:c730 with SMTP id c25-20020a17090620d900b0099447a0c730mr8455282ejc.43.1691089228564; Thu, 03 Aug 2023 12:00:28 -0700 (PDT) Received: from dev7.kernelcare.com ([2a01:4f8:201:23::2]) by smtp.gmail.com with ESMTPSA id d13-20020a1709063ecd00b00992a8a54f32sm182939ejj.139.2023.08.03.12.00.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Aug 2023 12:00:27 -0700 (PDT) From: Andrew Kanner To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, jasowang@redhat.com, netdev@vger.kernel.org, hawk@kernel.org, jbrouer@redhat.com, dsahern@gmail.com, john.fastabend@gmail.com, linux-kernel@vger.kernel.org Cc: linux-kernel-mentees@lists.linuxfoundation.org, syzbot+f817490f5bd20541b90a@syzkaller.appspotmail.com, Andrew Kanner Subject: [PATCH net-next v5 1/2] drivers: net: prevent tun_build_skb() to exceed the packet size limit Date: Thu, 3 Aug 2023 20:59:48 +0200 Message-Id: <20230803185947.2379988-1-andrew.kanner@gmail.com> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773067528619337198 X-GMAIL-MSGID: 1773242839317740558 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 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 --- 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 . 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 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 . Otherwise extra packets will be dropped without falling back to tun_alloc_skb(). And in the discussion of v3 Jesper Dangaard Brouer 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 - 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 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;