netfilter: handle unreadable frags
Subsystems (2)
Florian Westphal
maintainerPATCH v2 1/1 netfilter: handle unreadable frags
sashiko reports:
When an skb with unreadable fragments (such as from devmem TCP, where skb_frags_readable(skb) returns false) is processed by the u32 module, skb_copy_bits() will safely return a negative error code [..]
xt_u32: bail out with hotdrop in this case.gather_frags: return -1, just as if we had no fragment header.nfnetlink_queue: restrict to the non-linear part.nfnetlink_log: restrict to the non-linear part.
v2:
- skb_zerocopy helpers don't copy readable flag, i.e. nfnetlink_queue is broken too
xt_u32 shouldn't return true if hotdrop was set.
---
Mina, there are other places that BUG on skb_copy_bits(). Could you please have a look at:
https://sashiko.dev/#/patchset/20260706155219.23757-1-fw%40strlen.de
and see if those need fixing or not?
[ and the v2 review of this ... ]
Also, should skb_zerocopy() copy over the skb->readable flag (or refuse to handle unreadable skbs)?
net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +- net/netfilter/nfnetlink_log.c | 26 ++++++++++++++++--------- net/netfilter/nfnetlink_queue.c | 16 +++++++++++---- net/netfilter/xt_u32.c | 16 ++++++++++----- 4 files changed, 41 insertions(+), 19 deletions(-)
net/ipv6/netfilter/nf_conntrack_reasm.c +1 -1
@@ -419,7 +419,7 @@ find_prev_fhdr(struct sk_buff *skb, u8 *prevhdrp, int *prevhoff, int *fhoff)return -1 ; }if (skb_copy_bits (skb, start, &hdr,sizeof (hdr))) -BUG (); +return -1 ;if (nexthdr ==NEXTHDR_AUTH ) hdrlen =ipv6_authlen (&hdr);else
net/netfilter/nfnetlink_log.c +17 -9
@@ -676,7 +676,7 @@ __build_packet_message(struct nfnl_log_net *log, goto nla_put_failure;if (skb_copy_bits (skb,0 ,nla_data (nla), data_len)) -BUG (); + goto nla_put_failure; } nlh->nlmsg_len = inst->skb->tail - old_tail;
@@ -698,6 +698,21 @@ static const struct nf_loginfo default_loginfo = { }, }; +static unsigned int nfulnl_get_copy_len (const struct nf_loginfo *li, +const struct sk_buff *skb, +unsigned int copy_len) +{ +unsigned int len = skb->len; + +if ((li->u.ulog.flags &NF_LOG_F_COPY_LEN ) && + li->u.ulog.copy_len < copy_len) + copy_len = li->u.ulog.copy_len; +if (!skb_frags_readable (skb)) + len =skb_headlen (skb); + +return min (len, copy_len); +} +/* log handler for internal netfilter logging api */ static void nfulnl_log_packet(struct net *net,
@@ -790,14 +805,7 @@ nfulnl_log_packet(struct net *net,break ;case NFULNL_COPY_PACKET : - data_len = inst->copy_range; -if ((li->u.ulog.flags &NF_LOG_F_COPY_LEN ) && - (li->u.ulog.copy_len < data_len)) - data_len = li->u.ulog.copy_len; - -if (data_len > skb->len) - data_len = skb->len; - + data_len =nfulnl_get_copy_len (li, skb, inst->copy_range); size +=nla_total_size (data_len);break ;
net/netfilter/nfnetlink_queue.c +12 -4
@@ -690,6 +690,17 @@ static int nfqnl_put_master_ifindex(struct sk_buff *nlskb, int attr, }#endif +static unsigned int nfqnl_get_data_len (const struct sk_buff *entskb, +unsigned int copy_range) +{ +unsigned int data_len = entskb->len; + +if (!skb_frags_readable (entskb)) + data_len =skb_headlen (entskb); + +return min (data_len, copy_range); +} +static struct sk_buff * nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, struct nf_queue_entry *entry,
@@ -755,10 +766,7 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, nf_queue_checksum_help(entskb))return NULL ; - data_len =READ_ONCE (queue->copy_range); -if (data_len > entskb->len) - data_len = entskb->len; - + data_len =nfqnl_get_data_len (entskb,READ_ONCE (queue->copy_range)); hlen =skb_zerocopy_headlen (entskb); hlen = min_t(unsigned int, hlen, data_len); size +=sizeof (struct nlattr ) + hlen;
net/netfilter/xt_u32.c +11 -5
@@ -14,8 +14,8 @@#include <linux/netfilter/x_tables.h> #include <linux/netfilter/xt_u32.h> -static bool u32_match_it (const struct xt_u32 *data, -const struct sk_buff *skb) +static int u32_match_it (const struct xt_u32 *data, +const struct sk_buff *skb) {const struct xt_u32_test *ct;unsigned int testind;
@@ -40,7 +40,8 @@ static bool u32_match_it(const struct xt_u32 *data,return false;if (skb_copy_bits (skb, pos, &n,sizeof (n)) <0 ) -BUG (); +return -1 ; + val =ntohl (n); nnums = ct->nnums;
@@ -68,7 +69,7 @@ static bool u32_match_it(const struct xt_u32 *data,if (skb_copy_bits (skb, at + pos, &n,sizeof (n)) <0 ) -BUG (); +return -1 ; val =ntohl (n);break ; }
@@ -90,9 +91,14 @@ static bool u32_match_it(const struct xt_u32 *data,static bool u32_mt (const struct sk_buff *skb,struct xt_action_param *par) {const struct xt_u32 *data = par->matchinfo; -bool ret; +int ret; ret =u32_match_it (data, skb); +if (ret <0 ) { + par->hotdrop = true; +return false; + } +return ret ^ data->invert; }
Signature · 1 line
2.54.0
Quoted 11 lines · Florian Westphal
sashiko reports:
When an skb with unreadable fragments (such as from devmem TCP, whereskb_frags_readable(skb)returns false) is processed by the u32 module,skb_copy_bits()will safely return a negative error code [..]
xt_u32: bail out with hotdrop in this case.gather_frags: return -1, just as if we had no fragment header.nfnetlink_queue: restrict to the non-linear part.nfnetlink_log: restrict to the non-linear part.
Quoted 8 lines
v2:
-skb_zerocopyhelpers don't copy readable flag, i.e.nfnetlink_queueis broken too
xt_u32shouldn't return true if hotdrop was set.Cc Mina Almasry <[email protected]>Fixes 65249feb6b3d ("net: add support for skbs with unreadable frags")Signed-off-by Florian Westphal <[email protected]>
I don't understand netfliter implementations enough to confirm the error handling is correct, but in general handling skb_copy_bits() failures due to unreadable frags sounds good to me. I definitely did not address all the call sites in the first iteration, so:
Quoted 4 lines
---
Mina, there are other places that BUG onskb_copy_bits(). Could you please have a look at:
Quoted 8 lines
https://sashiko.dev/#/patchset/20260706155219.23757-1-fw%40strlen.de
and see if those need fixing or not?
[ and the v2 review of this ... ]Also, should
skb_zerocopy()copy over theskb->readableflag (or refuse to handle unreadable skbs)?
Yep it's buggy :(. From my reading, skb_zerocopy() needs to set the skb->readable frag on the to skb (and clear it on the from skb?). Let me find the cycles to fix that.
Signature · 2 lines
Thanks, Mina