netfilter: x_tables: remove pr_debug in matches/targets
Subsystems (3)
Pablo Neira Ayuso
maintainerPATCH 1/4 netfilter: x_tables: remove pr_debug in matches/targets
Remove pr_debug() for these xtables extensions, these have no use these days. Still, turn pr_debug() into pr_info_ratelimited() in the .check path since this helps provide a hint via dmesg in legacy iptables.
--- net/ipv4/netfilter/ipt_ah.c | 10 +---- net/ipv6/netfilter/ip6t_ah.c | 27 +------------- net/ipv6/netfilter/ip6t_frag.c | 41 +------------------- net/ipv6/netfilter/ip6t_hbh.c | 40 +++++--------------- net/ipv6/netfilter/ip6t_mh.c | 3 -- net/ipv6/netfilter/ip6t_rt.c | 6 +-- net/netfilter/xt_IDLETIMER.c | 68 ++++++---------------------------- net/netfilter/xt_LOG.c | 4 +- net/netfilter/xt_MASQUERADE.c | 4 +- net/netfilter/xt_NETMAP.c | 4 +- net/netfilter/xt_REDIRECT.c | 4 +- net/netfilter/xt_esp.c | 10 +---- net/netfilter/xt_ipcomp.c | 8 +--- net/netfilter/xt_iprange.c | 32 ++-------------- net/netfilter/xt_ipvs.c | 1 - net/netfilter/xt_multiport.c | 4 -- net/netfilter/xt_sctp.c | 19 +--------- net/netfilter/xt_tcpudp.c | 8 +--- 18 files changed, 47 insertions(+), 246 deletions(-)
net/ipv4/netfilter/ipt_ah.c +2 -8
@@ -19,12 +19,7 @@ MODULE_DESCRIPTION("Xtables: IPv4 IPsec-AH SPI match");static inline bool spi_match (u_int32_t min,u_int32_t max,u_int32_t spi,bool invert) { -bool r; -pr_debug ("spi_match:%c 0x%x <= 0x%x <= 0x%x\n" , - invert ?'!' :' ' , min, spi, max); - r = (spi >= min && spi <= max) ^ invert; -pr_debug (" result %s\n" , r ?"PASS" :"FAILED" ); -return r; +return (spi >= min && spi <= max) ^ invert; }static bool ah_mt (const struct sk_buff *skb,struct xt_action_param *par)
@@ -42,7 +37,6 @@ static bool ah_mt(const struct sk_buff *skb, struct xt_action_param *par)/* We've been asked to examine this packet, and we * can't. Hence, no choice but to drop. */ -pr_debug ("Dropping evil AH tinygram.\n" ); par->hotdrop = true;return false; }
@@ -58,7 +52,7 @@ static int ah_mt_check(const struct xt_mtchk_param *par)/* Must specify no unknown invflags */ if (ahinfo->invflags & ~IPT_AH_INV_MASK ) { -pr_debug ("unknown flags %X\n" , ahinfo->invflags); +pr_info_ratelimited ("unknown flags %X\n" , ahinfo->invflags);return -EINVAL ; }return 0 ;
net/ipv6/netfilter/ip6t_ah.c +2 -25
@@ -24,13 +24,7 @@ MODULE_AUTHOR("Andras Kis-Szabo <[email protected]>");static inline bool spi_match (u_int32_t min,u_int32_t max,u_int32_t spi,bool invert) { -bool r; - -pr_debug ("spi_match:%c 0x%x <= 0x%x <= 0x%x\n" , - invert ?'!' :' ' , min, spi, max); - r = (spi >= min && spi <= max) ^ invert; -pr_debug (" result %s\n" , r ?"PASS" :"FAILED" ); -return r; +return (spi >= min && spi <= max) ^ invert; }static bool ah_mt6 (const struct sk_buff *skb,struct xt_action_param *par)
@@ -62,23 +56,6 @@ static bool ah_mt6(const struct sk_buff *skb, struct xt_action_param *par)return false; } -pr_debug ("IPv6 AH LEN %u %u " , hdrlen, ah->hdrlen); -pr_debug ("RES %04X " , ah->reserved); -pr_debug ("SPI %u %08X\n" ,ntohl (ah->spi),ntohl (ah->spi)); - -pr_debug ("IPv6 AH spi %02X " , -spi_match (ahinfo->spis[0 ], ahinfo->spis[1 ], -ntohl (ah->spi), - !!(ahinfo->invflags &IP6T_AH_INV_SPI ))); -pr_debug ("len %02X %04X %02X " , - ahinfo->hdrlen, hdrlen, - (!ahinfo->hdrlen || - (ahinfo->hdrlen == hdrlen) ^ - !!(ahinfo->invflags &IP6T_AH_INV_LEN ))); -pr_debug ("res %02X %04X %02X\n" , - ahinfo->hdrres, ah->reserved, - !(ahinfo->hdrres && ah->reserved)); -return spi_match (ahinfo->spis[0 ], ahinfo->spis[1 ],ntohl (ah->spi), !!(ahinfo->invflags & IP6T_AH_INV_SPI)) &&
@@ -93,7 +70,7 @@ static int ah_mt6_check(const struct xt_mtchk_param *par)const struct ip6t_ah *ahinfo = par->matchinfo;if (ahinfo->invflags & ~IP6T_AH_INV_MASK ) { -pr_debug ("unknown flags %X\n" , ahinfo->invflags); +pr_info_ratelimited ("unknown flags %X\n" , ahinfo->invflags);return -EINVAL ; }return 0 ;
net/ipv6/netfilter/ip6t_frag.c +2 -39
59 lines not on this page · raw message
net/ipv6/netfilter/ip6t_hbh.c +9 -31
@@ -79,14 +79,6 @@ hbh_mt6(const struct sk_buff *skb, struct xt_action_param *par)return false; } -pr_debug ("IPv6 OPTS LEN %u %u " , hdrlen, oh->hdrlen); - -pr_debug ("len %02X %04X %02X " , - optinfo->hdrlen, hdrlen, - (!(optinfo->flags &IP6T_OPTS_LEN ) || - ((optinfo->hdrlen == hdrlen) ^ - !!(optinfo->invflags &IP6T_OPTS_INV_LEN )))); - ret = (!(optinfo->flags &IP6T_OPTS_LEN ) || ((optinfo->hdrlen == hdrlen) ^ !!(optinfo->invflags &IP6T_OPTS_INV_LEN )));
@@ -96,8 +88,6 @@ hbh_mt6(const struct sk_buff *skb, struct xt_action_param *par)if (!(optinfo->flags &IP6T_OPTS_OPTS )) {return ret; }else { -pr_debug ("Strict " ); -pr_debug ("#%d " , optinfo->optsnr);for (temp =0 ; temp < optinfo->optsnr; temp++) {/* type field exists ? */ if (hdrlen <1 )
@@ -108,13 +98,9 @@ hbh_mt6(const struct sk_buff *skb, struct xt_action_param *par)break ;/* Type check */ -if (*tp != (optinfo->opts[temp] &0xFF00 ) >>8 ) { -pr_debug ("Tbad %02X %02X\n" , *tp, - (optinfo->opts[temp] &0xFF00 ) >>8 ); +if (*tp != (optinfo->opts[temp] &0xFF00 ) >>8 )return false; - }else { -pr_debug ("Tok " ); - } +/* Length check */ if (*tp) {u16 spec_len;
@@ -129,26 +115,18 @@ hbh_mt6(const struct sk_buff *skb, struct xt_action_param *par)break ; spec_len = optinfo->opts[temp] &0x00FF ; -if (spec_len !=0x00FF && spec_len != *lp) { -pr_debug ("Lbad %02X %04X\n" , *lp, - spec_len); +if (spec_len !=0x00FF && spec_len != *lp)return false; - } -pr_debug ("Lok " ); + optlen = *lp +2 ; }else { -pr_debug ("Pad1\n" ); optlen =1 ; } -/* Step to the next */ -pr_debug ("len%04X\n" , optlen); -if ((ptr > skb->len - optlen || hdrlen < optlen) && - temp < optinfo->optsnr -1 ) { -pr_debug ("new pointer is too large!\n" ); + temp < optinfo->optsnr -1 )break ; - } + ptr += optlen; hdrlen -= optlen; }
@@ -166,16 +144,16 @@ static int hbh_mt6_check(const struct xt_mtchk_param *par)const struct ip6t_opts *optsinfo = par->matchinfo;if (optsinfo->invflags & ~IP6T_OPTS_INV_MASK ) { -pr_debug ("unknown flags %X\n" , optsinfo->invflags); +pr_info_ratelimited ("unknown flags %X\n" , optsinfo->invflags);return -EINVAL ; }if (optsinfo->optsnr >IP6T_OPTS_OPTSNR ) { -pr_debug ("too many supported opts specified\n" ); +pr_info_ratelimited ("too many supported opts specified\n" );return -EINVAL ; }if (optsinfo->flags &IP6T_OPTS_NSTRICT ) { -pr_debug ("Not strict - not implemented" ); +pr_info_ratelimited ("Not strict - not implemented" );return -EINVAL ; }
net/ipv6/netfilter/ip6t_mh.c +0 -3
@@ -42,14 +42,11 @@ static bool mh_mt6(const struct sk_buff *skb, struct xt_action_param *par)if (mh ==NULL ) {/* We've been asked to examine this packet, and we can't. Hence, no choice but to drop. */ -pr_debug ("Dropping evil MH tinygram.\n" ); par->hotdrop = true;return false; }if (mh->ip6mh_proto !=IPPROTO_NONE ) { -pr_debug ("Dropping invalid MH Payload Proto: %u\n" , - mh->ip6mh_proto); par->hotdrop = true;return false; }
net/ipv6/netfilter/ip6t_rt.c +3 -3
@@ -155,18 +155,18 @@ static int rt_mt6_check(const struct xt_mtchk_param *par)const struct ip6t_rt *rtinfo = par->matchinfo;if (rtinfo->invflags & ~IP6T_RT_INV_MASK ) { -pr_debug ("unknown flags %X\n" , rtinfo->invflags); +pr_info_ratelimited ("unknown flags %X\n" , rtinfo->invflags);return -EINVAL ; }if (rtinfo->addrnr >IP6T_RT_HOPS ) { -pr_debug ("too many addresses specified\n" ); +pr_info_ratelimited ("too many addresses specified\n" );return -EINVAL ; }if ((rtinfo->flags & (IP6T_RT_RES |IP6T_RT_FST_MASK )) && (!(rtinfo->flags &IP6T_RT_TYP ) || (rtinfo->rt_type !=0 ) || (rtinfo->invflags &IP6T_RT_INV_TYP ))) { -pr_debug ("`--rt-type 0' required before `--rt-0-*'" ); +pr_info_ratelimited ("`--rt-type 0' required before `--rt-0-*'" );return -EINVAL ; }
net/netfilter/xt_IDLETIMER.c +12 -56
227 lines not on this page · raw message
net/netfilter/xt_LOG.c +2 -2
@@ -50,12 +50,12 @@ static int log_tg_check(const struct xt_tgchk_param *par)return -EINVAL ;if (loginfo->level >=8 ) { -pr_debug ("level %u >= 8\n" , loginfo->level); +pr_info_ratelimited ("level %u >= 8\n" , loginfo->level);return -EINVAL ; }if (loginfo->prefix[sizeof (loginfo->prefix)-1 ] !='\0' ) { -pr_debug ("prefix is not null-terminated\n" ); +pr_info_ratelimited ("prefix is not null-terminated\n" );return -EINVAL ; }
net/netfilter/xt_MASQUERADE.c +2 -2
@@ -21,11 +21,11 @@ static int masquerade_tg_check(const struct xt_tgchk_param *par)const struct nf_nat_ipv4_multi_range_compat *mr = par->targinfo;if (mr->range[0 ].flags &NF_NAT_RANGE_MAP_IPS ) { -pr_debug ("bad MAP_IPS.\n" ); +pr_info_ratelimited ("bad MAP_IPS.\n" );return -EINVAL ; }if (mr->rangesize !=1 ) { -pr_debug ("bad rangesize %u\n" , mr->rangesize); +pr_info_ratelimited ("bad rangesize %u\n" , mr->rangesize);return -EINVAL ; }return nf_ct_netns_get (par->net, par->family);
net/netfilter/xt_NETMAP.c +2 -2
@@ -106,11 +106,11 @@ static int netmap_tg4_check(const struct xt_tgchk_param *par)const struct nf_nat_ipv4_multi_range_compat *mr = par->targinfo;if (!(mr->range[0 ].flags &NF_NAT_RANGE_MAP_IPS )) { -pr_debug ("bad MAP_IPS.\n" ); +pr_info_ratelimited ("bad MAP_IPS.\n" );return -EINVAL ; }if (mr->rangesize !=1 ) { -pr_debug ("bad rangesize %u.\n" , mr->rangesize); +pr_info_ratelimited ("bad rangesize %u.\n" , mr->rangesize);return -EINVAL ; }return nf_ct_netns_get (par->net, par->family);
net/netfilter/xt_REDIRECT.c +2 -2
@@ -51,11 +51,11 @@ static int redirect_tg4_check(const struct xt_tgchk_param *par)const struct nf_nat_ipv4_multi_range_compat *mr = par->targinfo;if (mr->range[0 ].flags &NF_NAT_RANGE_MAP_IPS ) { -pr_debug ("bad MAP_IPS.\n" ); +pr_info_ratelimited ("bad MAP_IPS.\n" );return -EINVAL ; }if (mr->rangesize !=1 ) { -pr_debug ("bad rangesize %u.\n" , mr->rangesize); +pr_info_ratelimited ("bad rangesize %u.\n" , mr->rangesize);return -EINVAL ; }return nf_ct_netns_get (par->net, par->family);
net/netfilter/xt_esp.c +2 -8
@@ -25,12 +25,7 @@ MODULE_ALIAS("ip6t_esp");static inline bool spi_match (u_int32_t min,u_int32_t max,u_int32_t spi,bool invert) { -bool r; -pr_debug ("spi_match:%c 0x%x <= 0x%x <= 0x%x\n" , - invert ?'!' :' ' , min, spi, max); - r = (spi >= min && spi <= max) ^ invert; -pr_debug (" result %s\n" , r ?"PASS" :"FAILED" ); -return r; +return (spi >= min && spi <= max) ^ invert; }static bool esp_mt (const struct sk_buff *skb,struct xt_action_param *par)
@@ -48,7 +43,6 @@ static bool esp_mt(const struct sk_buff *skb, struct xt_action_param *par)/* We've been asked to examine this packet, and we * can't. Hence, no choice but to drop. */ -pr_debug ("Dropping evil ESP tinygram.\n" ); par->hotdrop = true;return false; }
@@ -62,7 +56,7 @@ static int esp_mt_check(const struct xt_mtchk_param *par)const struct xt_esp *espinfo = par->matchinfo;if (espinfo->invflags & ~XT_ESP_INV_MASK ) { -pr_debug ("unknown flags %X\n" , espinfo->invflags); +pr_info_ratelimited ("unknown flags %X\n" , espinfo->invflags);return -EINVAL ; }
net/netfilter/xt_ipcomp.c +1 -7
@@ -29,12 +29,7 @@ MODULE_ALIAS("ip6t_ipcomp");static inline bool spi_match (u_int32_t min,u_int32_t max,u_int32_t spi,bool invert) { -bool r; -pr_debug ("spi_match:%c 0x%x <= 0x%x <= 0x%x\n" , - invert ?'!' :' ' , min, spi, max); - r = (spi >= min && spi <= max) ^ invert; -pr_debug (" result %s\n" , r ?"PASS" :"FAILED" ); -return r; +return (spi >= min && spi <= max) ^ invert; }static bool comp_mt (const struct sk_buff *skb,struct xt_action_param *par)
@@ -52,7 +47,6 @@ static bool comp_mt(const struct sk_buff *skb, struct xt_action_param *par)/* We've been asked to examine this packet, and we * can't. Hence, no choice but to drop. */ -pr_debug ("Dropping evil IPComp tinygram.\n" ); par->hotdrop = true;return false; }
net/netfilter/xt_iprange.c +4 -28
@@ -24,27 +24,15 @@ iprange_mt4(const struct sk_buff *skb, struct xt_action_param *par) m =ntohl (iph->saddr) <ntohl (info->src_min.ip); m |=ntohl (iph->saddr) >ntohl (info->src_max.ip); m ^= !!(info->flags &IPRANGE_SRC_INV ); -if (m) { -pr_debug ("src IP %pI4 NOT in range %s%pI4-%pI4\n" , - &iph->saddr, - (info->flags &IPRANGE_SRC_INV ) ?"(INV) " :"" , - &info->src_min.ip, - &info->src_max.ip); +if (m)return false; - } }if (info->flags &IPRANGE_DST ) { m =ntohl (iph->daddr) <ntohl (info->dst_min.ip); m |=ntohl (iph->daddr) >ntohl (info->dst_max.ip); m ^= !!(info->flags &IPRANGE_DST_INV ); -if (m) { -pr_debug ("dst IP %pI4 NOT in range %s%pI4-%pI4\n" , - &iph->daddr, - (info->flags &IPRANGE_DST_INV ) ?"(INV) " :"" , - &info->dst_min.ip, - &info->dst_max.ip); +if (m)return false; - } }return true; }
@@ -73,27 +61,15 @@ iprange_mt6(const struct sk_buff *skb, struct xt_action_param *par) m =iprange_ipv6_lt (&iph->saddr, &info->src_min.in6); m |=iprange_ipv6_lt (&info->src_max.in6, &iph->saddr); m ^= !!(info->flags &IPRANGE_SRC_INV ); -if (m) { -pr_debug ("src IP %pI6 NOT in range %s%pI6-%pI6\n" , - &iph->saddr, - (info->flags &IPRANGE_SRC_INV ) ?"(INV) " :"" , - &info->src_min.in6, - &info->src_max.in6); +if (m)return false; - } }if (info->flags &IPRANGE_DST ) { m =iprange_ipv6_lt (&iph->daddr, &info->dst_min.in6); m |=iprange_ipv6_lt (&info->dst_max.in6, &iph->daddr); m ^= !!(info->flags &IPRANGE_DST_INV ); -if (m) { -pr_debug ("dst IP %pI6 NOT in range %s%pI6-%pI6\n" , - &iph->daddr, - (info->flags &IPRANGE_DST_INV ) ?"(INV) " :"" , - &info->dst_min.in6, - &info->dst_max.in6); +if (m)return false; - } }return true; }
net/netfilter/xt_ipvs.c +0 -1
@@ -148,7 +148,6 @@ ipvs_mt(const struct sk_buff *skb, struct xt_action_param *par) out_put_cp:__ip_vs_conn_put (cp); out: -pr_debug ("match=%d\n" , match);return match; }
net/netfilter/xt_multiport.c +0 -4
@@ -37,7 +37,6 @@ ports_match_v1(const struct xt_multiport_v1 *minfo,if (minfo->pflags[i]) {/* range port matching */ e = minfo->ports[++i]; -pr_debug ("src or dst matches with %d-%d?\n" , s, e);switch (minfo->flags) {case XT_MULTIPORT_SOURCE :
@@ -58,8 +57,6 @@ ports_match_v1(const struct xt_multiport_v1 *minfo, } }else {/* exact port matching */ -pr_debug ("src or dst matches with %d?\n" , s); -switch (minfo->flags) {case XT_MULTIPORT_SOURCE :if (src == s)
@@ -97,7 +94,6 @@ multiport_mt(const struct sk_buff *skb, struct xt_action_param *par)/* We've been asked to examine this packet, and we * can't. Hence, no choice but to drop. */ -pr_debug ("Dropping evil offset=0 tinygram.\n" ); par->hotdrop = true;return false; }
net/netfilter/xt_sctp.c +1 -18
@@ -48,30 +48,17 @@ match_packet(const struct sk_buff *skb,const struct xt_sctp_flag_info *flag_info = info->flag_info;int flag_count = info->flag_count; -#ifdef DEBUG -int i =0 ; -#endif -if (chunk_match_type ==SCTP_CHUNK_MATCH_ALL )SCTP_CHUNKMAP_COPY (chunkmapcopy, info->chunkmap); do { sch = skb_header_pointer(skb, offset, sizeof(_sch), &_sch); if (sch == NULL || sch->length == 0) { - pr_debug("Dropping invalid SCTP packet.\n"); *hotdrop = true; return false; } -#ifdef DEBUG - pr_debug("Chunk num: %d\toffset: %d\ttype: %d\tlength: %d" - "\tflags: %x\n", - ++i, offset, sch->type, htons(sch->length), - sch->flags); -#endif offset += SCTP_PAD4(ntohs(sch->length)); - pr_debug("skb->len: %d\toffset: %d\n", skb->len, offset); - if (SCTP_CHUNKMAP_IS_SET(info->chunkmap, sch->type)) { switch (chunk_match_type) { case SCTP_CHUNK_MATCH_ANY:
@@ -121,18 +108,14 @@ sctp_mt(const struct sk_buff *skb, struct xt_action_param *par)const struct sctphdr *sh;struct sctphdr _sh; -if (par->fragoff !=0 ) { -pr_debug ("Dropping non-first fragment.. FIXME\n" ); +if (par->fragoff !=0 )return false; - } sh =skb_header_pointer (skb, par->thoff,sizeof (_sh), &_sh);if (sh ==NULL ) { -pr_debug ("Dropping evil TCP offset=0 tinygram.\n" ); par->hotdrop = true;return false; } -pr_debug ("spt: %d\tdpt: %d\n" ,ntohs (sh->source),ntohs (sh->dest)); return SCCHECK(ntohs(sh->source) >= info->spts[0] && ntohs(sh->source) <= info->spts[1],
net/netfilter/xt_tcpudp.c +1 -7
@@ -44,8 +44,6 @@ tcp_find_option(u_int8_t option,u_int8_t _opt[60 -sizeof (struct tcphdr )];unsigned int i; -pr_debug ("finding option\n" ); -if (!optlen)return invert;
@@ -81,10 +79,8 @@ static bool tcp_mt(const struct sk_buff *skb, struct xt_action_param *par)causes this. Its a cracker trying to break in by doing a flag overwrite to pass the direction checks. */ -if (par->fragoff ==1 ) { -pr_debug ("Dropping evil TCP offset=1 frag.\n" ); +if (par->fragoff ==1 ) par->hotdrop = true; - }/* Must not be a fragment. */ return false; }
@@ -93,7 +89,6 @@ static bool tcp_mt(const struct sk_buff *skb, struct xt_action_param *par)if (th ==NULL ) {/* We've been asked to examine this packet, and we can't. Hence, no choice but to drop. */ -pr_debug ("Dropping evil TCP offset=0 tinygram.\n" ); par->hotdrop = true;return false; }
@@ -145,7 +140,6 @@ static bool udp_mt(const struct sk_buff *skb, struct xt_action_param *par)if (uh ==NULL ) {/* We've been asked to examine this packet, and we can't. Hence, no choice but to drop. */ -pr_debug ("Dropping evil UDP tinygram.\n" ); par->hotdrop = true;return false; }
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH 2/4 netfilter: xt_CT: check for nul-terminated timeout and helper name
Otherwise, ignore malformed helper/timeout string that userspace provides.
--- net/netfilter/xt_CT.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/netfilter/xt_CT.c +4 -2
@@ -195,7 +195,8 @@ static int xt_ct_tg_check(const struct xt_tgchk_param *par, goto err3; } -if (info->helper[0 ]) { +if (info->helper[0 ] && +strnlen (info->helper,sizeof (info->helper)) <sizeof (info->helper)) {if (strnlen (info->helper,sizeof (info->helper)) ==sizeof (info->helper)) { ret = -ENAMETOOLONG ; goto err3;
@@ -206,7 +207,8 @@ static int xt_ct_tg_check(const struct xt_tgchk_param *par, goto err3; } -if (info->timeout[0 ]) { +if (info->timeout[0 ] && +strnlen (info->timeout,sizeof (info->timeout)) <sizeof (info->timeout)) {if (strnlen (info->timeout,sizeof (info->timeout)) ==sizeof (info->timeout)) { ret = -ENAMETOOLONG ; goto err4;
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH 3/4 netfilter: x_tables: do not print specified table
In reply to Pablo Neira AyusoThis is defensive, possibly this string has been already been sanitized but simply print that this match/target extension can only be used for a given table.
--- net/ipv4/netfilter/ipt_rpfilter.c | 3 +-- net/ipv6/netfilter/ip6t_rpfilter.c | 2 +- net/netfilter/xt_CONNSECMARK.c | 3 +-- net/netfilter/xt_SECMARK.c | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-)
net/ipv4/netfilter/ipt_rpfilter.c +1 -2
@@ -95,8 +95,7 @@ static int rpfilter_check(const struct xt_mtchk_param *par)if (strcmp (par->table,"mangle" ) !=0 &&strcmp (par->table,"raw" ) !=0 ) { -pr_info_ratelimited ("only valid in \'raw\' or \'mangle\' table, not \'%s\'\n" , - par->table); +pr_info_ratelimited ("only valid in \'raw\' or \'mangle\' table\n" );return -EINVAL ; }
net/ipv6/netfilter/ip6t_rpfilter.c +1 -1
@@ -118,7 +118,7 @@ static int rpfilter_check(const struct xt_mtchk_param *par)if (strcmp (par->table,"mangle" ) !=0 &&strcmp (par->table,"raw" ) !=0 ) { -pr_info_ratelimited ("only valid in \'raw\' or \'mangle\' table, not \'%s\'\n" , +pr_info_ratelimited ("only valid in \'raw\' or \'mangle\' table\n" , par->table);return -EINVAL ; }
net/netfilter/xt_CONNSECMARK.c +1 -2
@@ -87,8 +87,7 @@ static int connsecmark_tg_check(const struct xt_tgchk_param *par)if (strcmp (par->table,"mangle" ) !=0 &&strcmp (par->table,"security" ) !=0 ) { -pr_info_ratelimited ("only valid in \'mangle\' or \'security\' table, not \'%s\'\n" , - par->table); +pr_info_ratelimited ("only valid in \'mangle\' or \'security\' table\n" );return -EINVAL ; }
net/netfilter/xt_SECMARK.c +1 -2
@@ -79,8 +79,7 @@ secmark_tg_check(const char *table, struct xt_secmark_target_info_v1 *info)if (strcmp (table,"mangle" ) !=0 &&strcmp (table,"security" ) !=0 ) { -pr_info_ratelimited ("only valid in \'mangle\' or \'security\' table, not \'%s\'\n" , - table); +pr_info_ratelimited ("only valid in \'mangle\' or \'security\' table\n" );return -EINVAL ; }
Signature · 1 line
2.47.3
Re: [PATCH nf-next 3/4] netfilter: x_tables: do not print specified table
net/ipv4/netfilter/ipt_rpfilter.c static int rpfilter_check(const struct xt_mtchk_param *par) · line 100
Quoted 13 lines · Pablo Neira Ayuso
This is defensive, possibly this string has been already been sanitized but simply print that this match/target extension can only be used for a given table.
net/ipv4/netfilter/ipt_rpfilter.c +1
-2@@ -95,8 +95,7 @@ static int rpfilter_check(const struct xt_mtchk_param *par)if (strcmp (par->table,"mangle" ) !=0 &&strcmp (par->table,"raw" ) !=0 ) { -pr_info_ratelimited ("only valid in \'raw\' or \'mangle\' table, not \'%s\'\n" , - par->table); +pr_info_ratelimited ("only valid in \'raw\' or \'mangle\' table\n" );return -EINVAL ; }
You have now robbed the user of information where the problem originated from (and thus removed an avenue on further diagnosis / remediation), which is one of the classic UI/UX sins[1].
(There should be countless webpages out there that can explain better than me what's a good and what's a bad error message.)
The table names were historically static, and always valid. The only requirement is that the string is \0-terminated. That should be true even for nftables. The use of NLA_STRING for NFTA_TABLE_NAME should enforce this at the netlink level already.
(Ironically, since C lacks a managed type like std::string, there is less incentive to even have {ptr, len}-type string objects/views.)
Pablo Neira Ayuso
maintainerRe: [PATCH nf-next 3/4] netfilter: x_tables: do not print specified table
Quoted 21 lines · Jan Engelhardt
net/ipv4/netfilter/ipt_rpfilter.c static int rpfilter_check(const struct xt_mtchk_param *par) · line 100
Quoted 13 lines · Pablo Neira Ayuso
This is defensive, possibly this string has been already been sanitized but simply print that this match/target extension can only be used for a given table.
net/ipv4/netfilter/ipt_rpfilter.c +1
-2@@ -95,8 +95,7 @@ static int rpfilter_check(const struct xt_mtchk_param *par)if (strcmp (par->table,"mangle" ) !=0 &&strcmp (par->table,"raw" ) !=0 ) { -pr_info_ratelimited ("only valid in \'raw\' or \'mangle\' table, not \'%s\'\n" , - par->table); +pr_info_ratelimited ("only valid in \'raw\' or \'mangle\' table\n" );return -EINVAL ; }You have now robbed the user of information where the problem originated from (and thus removed an avenue on further diagnosis / remediation), which is one of the classic UI/UX sins[1].
Quoted 2 lines
(There should be countless webpages out there that can explain better than me what's a good and what's a bad error message.)
You are right, I will keep this patch back.
Pablo Neira Ayuso
maintainerPATCH 4/4 netfilter: xt_cgroup: use pr_info_ratelimited()
In reply to Pablo Neira AyusoThis seems to be the last xtables extension not using the ratelimited version, update it.
--- net/netfilter/xt_cgroup.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
net/netfilter/xt_cgroup.c +5 -5
@@ -33,7 +33,7 @@ static int cgroup_mt_check_v0(const struct xt_mtchk_param *par)return -EINVAL ;if (!IS_ENABLED (CONFIG_CGROUP_NET_CLASSID )) { -pr_info (NET_CLS_CLASSID_INVALID_MSG ); +pr_info_ratelimited (NET_CLS_CLASSID_INVALID_MSG );return -EINVAL ; }
@@ -49,7 +49,7 @@ static int cgroup_mt_check_v1(const struct xt_mtchk_param *par)return -EINVAL ;if (!info->has_path && !info->has_classid) { -pr_info ("xt_cgroup: no path or classid specified\n" ); +pr_info_ratelimited ("xt_cgroup: no path or classid specified\n" );return -EINVAL ; }
@@ -59,7 +59,7 @@ static int cgroup_mt_check_v1(const struct xt_mtchk_param *par) }if (info->has_classid && !IS_ENABLED (CONFIG_CGROUP_NET_CLASSID )) { -pr_info (NET_CLS_CLASSID_INVALID_MSG ); +pr_info_ratelimited (NET_CLS_CLASSID_INVALID_MSG );return -EINVAL ; }
@@ -89,7 +89,7 @@ static int cgroup_mt_check_v2(const struct xt_mtchk_param *par)return -EINVAL ;if (!info->has_path && !info->has_classid) { -pr_info ("xt_cgroup: no path or classid specified\n" ); +pr_info_ratelimited ("xt_cgroup: no path or classid specified\n" );return -EINVAL ; }
@@ -99,7 +99,7 @@ static int cgroup_mt_check_v2(const struct xt_mtchk_param *par) }if (info->has_classid && !IS_ENABLED (CONFIG_CGROUP_NET_CLASSID )) { -pr_info (NET_CLS_CLASSID_INVALID_MSG ); +pr_info_ratelimited (NET_CLS_CLASSID_INVALID_MSG );return -EINVAL ; }
Signature · 1 line
2.47.3
Re: [PATCH nf-next 4/4] netfilter: xt_cgroup: use pr_info_ratelimited()
Quoted 2 lines · Pablo Neira Ayuso
This seems to be the last xtables extension not using the ratelimited version, update it.
Makes sense, thanks Pablo.
Re: [PATCH nf-next 4/4] netfilter: xt_cgroup: use pr_info_ratelimited()
In reply to Pablo Neira AyusoQuoted 5 lines · Pablo Neira Ayuso
This seems to be the last xtables extension not using the ratelimited version, update it.
Fixes c38c4597e4bf ("netfilter: implement xt_cgroup cgroup2 path match")Signed-off-by Pablo Neira Ayuso <[email protected]>
For the whole series:
Thanks Pablo and Florian. Right getting rid of them makes much more sense than fixing the wrong spots.
Quoted 3 lines · Pablo Neira Ayuso
Remove
pr_debug()for these xtables extensions, these have no use these days. Still, turnpr_debug()intopr_info_ratelimited()in the .check path since this helps provide a hint via dmesg in legacy iptables.
Makes sense, thanks.