netfilter: handle unreadable frags
Subsystems (2)
Florian Westphal
maintainerPATCH 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 rather than successfully copying the bits.
For xt_u32: bail out with hotdrop in this case.
For gather_frags: return -1, just as if we had no fragment header. For nfnetlink_log: restrict to the non-linear part.
nfnetlink_queue is ok, it uses skb_zerocopy() helper.
Fixes 65249feb6b3d ("net: add support for skbs with unreadable frags")
Signed-off-by Florian Westphal <[email protected]>
--- net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +- net/netfilter/nfnetlink_log.c | 26 ++++++++++++++++--------- net/netfilter/xt_u32.c | 13 +++++++++---- 3 files changed, 27 insertions(+), 14 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/xt_u32.c +9 -4
@@ -14,9 +14,10 @@#include <linux/netfilter/x_tables.h> #include <linux/netfilter/xt_u32.h> -static bool u32_match_it (const struct xt_u32 *data, +static bool u32_match_it (struct xt_action_param *par,const struct sk_buff *skb) { +const struct xt_u32 *data = par->matchinfo;const struct xt_u32_test *ct;unsigned int testind;unsigned int nnums;
@@ -40,7 +41,8 @@ static bool u32_match_it(const struct xt_u32 *data,return false;if (skb_copy_bits (skb, pos, &n,sizeof (n)) <0 ) -BUG (); + goto err; + val =ntohl (n); nnums = ct->nnums;
@@ -68,7 +70,7 @@ static bool u32_match_it(const struct xt_u32 *data,if (skb_copy_bits (skb, at + pos, &n,sizeof (n)) <0 ) -BUG (); + goto err; val =ntohl (n);break ; }
@@ -85,6 +87,9 @@ static bool u32_match_it(const struct xt_u32 *data, }return true; +err: + par->hotdrop = true; +return false; }static bool u32_mt (const struct sk_buff *skb,struct xt_action_param *par)
@@ -92,7 +97,7 @@ static bool u32_mt(const struct sk_buff *skb, struct xt_action_param *par)const struct xt_u32 *data = par->matchinfo;bool ret; - ret =u32_match_it (data, skb); + ret =u32_match_it (par, skb);return ret ^ data->invert; }
Signature · 1 line
2.54.0