From: Shigeru Yoshida <syoshida@redhat.com>
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 <syoshida@redhat.com>
Subject: [PATCH net] ipv4: ip_gre: Handle skb_pull() failure in ipgre_xmit()
Date: Mon, 27 Nov 2023 00:16:52 +0900 [thread overview]
Message-ID: <20231126151652.372783-1-syoshida@redhat.com> (raw)
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 <syoshida@redhat.com>
---
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 &&
--
2.41.0
next reply other threads:[~2023-11-26 15:17 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-26 15:16 Shigeru Yoshida [this message]
2023-11-27 15:55 ` [PATCH net] ipv4: ip_gre: Handle skb_pull() failure in ipgre_xmit() Willem de Bruijn
2023-11-29 1:50 ` Shigeru Yoshida
2023-11-29 9:56 ` Eric Dumazet
2023-11-30 14:03 ` Shigeru Yoshida
2023-11-30 14:05 ` Eric Dumazet
2023-12-01 6:00 ` Shigeru Yoshida
2023-11-28 15:45 ` Eric Dumazet
2023-11-28 15:51 ` Paolo Abeni
2023-11-28 16:05 ` Eric Dumazet
2023-11-28 16:13 ` Eric Dumazet
2023-11-28 16:15 ` Eric Dumazet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231126151652.372783-1-syoshida@redhat.com \
--to=syoshida@redhat.com \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox