From: Daniel Xu <dxu@dxuuu.xyz>
To: "David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
David Ahern <dsahern@kernel.org>
Cc: ppenkov@aviatrix.com, dbird@aviatrix.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, bpf@vger.kernel.org
Subject: [PATCH bpf-next 1/6] ip: frags: Return actual error codes from ip_check_defrag()
Date: Wed, 14 Dec 2022 16:25:28 -0700 [thread overview]
Message-ID: <cc96452ecae8a1934b0f96a73272e18c78ae5f90.1671049840.git.dxu@dxuuu.xyz> (raw)
In-Reply-To: <cover.1671049840.git.dxu@dxuuu.xyz>
Once we wrap ip_check_defrag() in a kfunc, it may be useful for progs to
know the exact error condition ip_check_defrag() encountered.
Signed-off-by: Daniel Xu <dxu@dxuuu.xyz>
---
drivers/net/macvlan.c | 2 +-
net/ipv4/ip_fragment.c | 11 ++++++-----
net/packet/af_packet.c | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 99a971929c8e..b8310e13d7e1 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -456,7 +456,7 @@ static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb)
unsigned int hash;
skb = ip_check_defrag(dev_net(skb->dev), skb, IP_DEFRAG_MACVLAN);
- if (!skb)
+ if (IS_ERR(skb))
return RX_HANDLER_CONSUMED;
*pskb = skb;
eth = eth_hdr(skb);
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 69c00ffdcf3e..7406c6b6376d 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -514,6 +514,7 @@ struct sk_buff *ip_check_defrag(struct net *net, struct sk_buff *skb, u32 user)
struct iphdr iph;
int netoff;
u32 len;
+ int err;
if (skb->protocol != htons(ETH_P_IP))
return skb;
@@ -535,15 +536,15 @@ struct sk_buff *ip_check_defrag(struct net *net, struct sk_buff *skb, u32 user)
if (skb) {
if (!pskb_may_pull(skb, netoff + iph.ihl * 4)) {
kfree_skb(skb);
- return NULL;
+ return ERR_PTR(-ENOMEM);
}
- if (pskb_trim_rcsum(skb, netoff + len)) {
+ if ((err = pskb_trim_rcsum(skb, netoff + len))) {
kfree_skb(skb);
- return NULL;
+ return ERR_PTR(err);
}
memset(IPCB(skb), 0, sizeof(struct inet_skb_parm));
- if (ip_defrag(net, skb, user))
- return NULL;
+ if ((err = ip_defrag(net, skb, user)))
+ return ERR_PTR(err);
skb_clear_hash(skb);
}
}
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 41c4ccc3a5d6..cf706f98448e 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1472,7 +1472,7 @@ static int packet_rcv_fanout(struct sk_buff *skb, struct net_device *dev,
if (fanout_has_flag(f, PACKET_FANOUT_FLAG_DEFRAG)) {
skb = ip_check_defrag(net, skb, IP_DEFRAG_AF_PACKET);
- if (!skb)
+ if (IS_ERR(skb))
return 0;
}
switch (f->type) {
--
2.39.0
next prev parent reply other threads:[~2022-12-14 23:28 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-14 23:25 [PATCH bpf-next 0/6] Support defragmenting IPv4 packets in BPF Daniel Xu
2022-12-14 23:25 ` Daniel Xu [this message]
2022-12-14 23:25 ` [PATCH bpf-next 2/6] bpf: verifier: Support KF_CHANGES_PKT flag Daniel Xu
2022-12-17 18:08 ` kernel test robot
2022-12-14 23:25 ` [PATCH bpf-next 3/6] bpf, net, frags: Add bpf_ip_check_defrag() kfunc Daniel Xu
2022-12-15 22:31 ` Daniel Borkmann
2022-12-15 23:58 ` Daniel Xu
2022-12-14 23:25 ` [PATCH bpf-next 4/6] bpf: selftests: Support not connecting client socket Daniel Xu
2022-12-14 23:25 ` [PATCH bpf-next 5/6] bpf: selftests: Support custom type and proto for client sockets Daniel Xu
2022-12-14 23:25 ` [PATCH bpf-next 6/6] bpf: selftests: Add bpf_ip_check_defrag() selftest Daniel Xu
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=cc96452ecae8a1934b0f96a73272e18c78ae5f90.1671049840.git.dxu@dxuuu.xyz \
--to=dxu@dxuuu.xyz \
--cc=bpf@vger.kernel.org \
--cc=davem@davemloft.net \
--cc=dbird@aviatrix.com \
--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 \
--cc=ppenkov@aviatrix.com \
--cc=yoshfuji@linux-ipv6.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.