From patchwork Sun Nov 26 15:16:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shigeru Yoshida X-Patchwork-Id: 169868 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp2529596vqx; Sun, 26 Nov 2023 07:17:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IGlL8lQK63ma7dfCUs+DD61wXl2OWj4p/5lT5Ac4Cc/uq1hPTMKBlMvpNIu87JA62/Vs+F5 X-Received: by 2002:a17:90b:1001:b0:285:6f1a:4a71 with SMTP id gm1-20020a17090b100100b002856f1a4a71mr8820618pjb.32.1701011836640; Sun, 26 Nov 2023 07:17:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701011836; cv=none; d=google.com; s=arc-20160816; b=PfU7t8VZqE+hY3re9fg55A9uYZ4imYYe7hVQ/DaFUPiEB7d0Weuau3pjM1oPeoHfPk vGHrCJ7E+jdCEbFb8J52CBaXIUKIkfyKOEuUKtxlCfEwybXBBFHViUeh23501TOpkZ4X J3wwV7jpWiynK7f2F0Dm9Q2H0P68MYdiHcKlEu8GWWBWYCGZmS30tH/YYE6PNmbQ54cx 3tpqxsVSVMtfgutNDW4IHgjNp4JsKb3qMbx8BZS8FErKlAn7utuxKeeoAgWpp5N47CkX dLFnyi1gi/dvMsq5QtDgoy6XagEensNGtba3WGu2c2LrYfCOf7NoNDIH6LKaKZqG3SUM r81A== 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=m5u/ab7IuDASESlzxALPg8Iqhjs7X4s/7bijJ9wvXUc=; fh=J/bNmTXfPjKUKo64j2xQR++KqvFAj2d3s/6EsxFhJfY=; b=n8V9ZPLGen1t32Psv19TFUmAjCj6cUJMaLgis9T9KLnAhfKv2mdw/+UuxMSm597HlU mhlaLimXw/dEG1WB5xuiroopPnZwBgG1ytMHCUWrRGQ08KSWNI68mEitxhmDVse7cSHq Y/VAdl3HHmLz74yPomJOzzDAVujnFOSh2lhVovwGbPOByObXRXRomkJzQsA01V0T1vtX Lqa6OrGLXoewNAJBIRSzR4BAcDqa2eBR4V5O5ayt3bVICUH1z5UWTa29axS9PbNY040Z knh8ZPj584TImcaSTwyMskLUel9NdFhxFaMeVdsMvlyTH+Jx+ApW6jLGAsoxmtJuOv1z opBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=F5kHlumf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id j13-20020a17090ae60d00b002791d79bbf9si8323417pjy.187.2023.11.26.07.17.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Nov 2023 07:17:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=F5kHlumf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 4BB01806D28F; Sun, 26 Nov 2023 07:17:14 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229874AbjKZPQ7 (ORCPT + 99 others); Sun, 26 Nov 2023 10:16:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229457AbjKZPQ6 (ORCPT ); Sun, 26 Nov 2023 10:16:58 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DDA2FEA for ; Sun, 26 Nov 2023 07:17:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701011821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=m5u/ab7IuDASESlzxALPg8Iqhjs7X4s/7bijJ9wvXUc=; b=F5kHlumfw/np0dFzEGF3/SGcNHPetnaYlw4JBcL6D2uYr1tniL5MvxZ+9YV+NRTY4nJ6jh m8tWywxiniDWABbNq8wpmG0cM/lacJg6bO8yElOq5HindLthPfzBDYs9k81OoIKGd7xhab vU2Ar+lhvYaoGysngW2KPz3yX7q+1+Y= Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-223-QN8xVvv_NoGahLXfQyFpEw-1; Sun, 26 Nov 2023 10:17:00 -0500 X-MC-Unique: QN8xVvv_NoGahLXfQyFpEw-1 Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-6baaa9c0ba5so4385432b3a.0 for ; Sun, 26 Nov 2023 07:17:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701011819; x=1701616619; 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=m5u/ab7IuDASESlzxALPg8Iqhjs7X4s/7bijJ9wvXUc=; b=QOo9MW9CMd+PFmscNnJlD1wAKgr6Y/q8tGQXUczJECep2KC9CZSFYCZhPFgmKbor/y hy4eE37qjjvtAQywwHqrFuWNDblZ55FCepkErVORwUjE5oTmND+LVdOPwajU7z+KINKT Bg3Kc650HQwYNFsTXka9aebxcjco8a4uYnlK1X7MMdUUv1UKeBPpy8YLfl/yokMpCmxY F1lqKcAB1QnNXZZ6rpMh4+8xkUY9ucDZztW2vFAC3g0tB46Xby+ngNwMQpGVqJgETN4c ip/Q9X41tD6X4DDyWBFwV/P2grvFvMrN5WDDZ9JX4LtHcTfjqSFq2LtJbz3ZN64EAbr2 2JrA== X-Gm-Message-State: AOJu0Yz9v7jTQhYWElZml/wry9YgbEn0avWwD4MVdgHtJYgZT8i4CS7b dxFb+Z2TXtAZ5EMhju9t+Fz4+1K41EkSWxVpcYqByi0MsoYpmXVB1V1onzOpuc3VQklfdqdtW3e mlPwNZGwrHss2xcnQ0p5mrU9s2JsNGzDo X-Received: by 2002:a05:6a20:42a0:b0:188:973c:ef84 with SMTP id o32-20020a056a2042a000b00188973cef84mr8891707pzj.9.1701011819118; Sun, 26 Nov 2023 07:16:59 -0800 (PST) X-Received: by 2002:a05:6a20:42a0:b0:188:973c:ef84 with SMTP id o32-20020a056a2042a000b00188973cef84mr8891687pzj.9.1701011818817; Sun, 26 Nov 2023 07:16:58 -0800 (PST) Received: from kernel-devel.local ([240d:1a:c0d:9f00:245e:16ff:fe87:c960]) by smtp.gmail.com with ESMTPSA id c4-20020aa781c4000000b006cb955dc54csm5741888pfn.58.2023.11.26.07.16.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Nov 2023 07:16:58 -0800 (PST) From: Shigeru Yoshida To: davem@davemloft.net, dsahern@kernel.org, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Shigeru Yoshida Subject: [PATCH net] ipv4: ip_gre: Handle skb_pull() failure in ipgre_xmit() Date: Mon, 27 Nov 2023 00:16:52 +0900 Message-ID: <20231126151652.372783-1-syoshida@redhat.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sun, 26 Nov 2023 07:17:14 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783640187629281159 X-GMAIL-MSGID: 1783640187629281159 In ipgre_xmit(), skb_pull() may fail even if pskb_inet_may_pull() returns true. For example, applications can create a malformed packet that causes this problem with PF_PACKET. This patch fixes the problem by dropping skb and returning from the function if skb_pull() fails. Fixes: c54419321455 ("GRE: Refactor GRE tunneling code.") Signed-off-by: Shigeru Yoshida --- net/ipv4/ip_gre.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 22a26d1d29a0..95efa97cb84b 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -643,7 +643,8 @@ static netdev_tx_t ipgre_xmit(struct sk_buff *skb, /* Pull skb since ip_tunnel_xmit() needs skb->data pointing * to gre header. */ - skb_pull(skb, tunnel->hlen + sizeof(struct iphdr)); + if (!skb_pull(skb, tunnel->hlen + sizeof(struct iphdr))) + goto free_skb; skb_reset_mac_header(skb); if (skb->ip_summed == CHECKSUM_PARTIAL &&