Netfilter fixes for net
Subsystems (3)
Pablo Neira Ayuso
maintainercover Netfilter fixes for net
Hi David,
The follow patchset contains Netfilter fixes for your net tree, they are:
1) Fix compilation warning in x_tables with clang due to useless redundant reassignment, from Colin Ian King.
2) Add bugtrap to net_exit to catch uninitialized lists, patch from Vasily Averin.
3) Fix out of bounds memory reads in H323 conntrack helper, this comes with an initial patch to remove replace the obscure CHECK_BOUND macro as a dependency. From Eric Sesterhenn.
4) Reduce retransmission timeout when window is 0 in TCP conntrack, from Florian Westphal.
6) ctnetlink clamp timeout to INT_MAX if timeout is too large, otherwise timeout wraps around and it results in killing the entry that is being added immediately.
7) Missing CAP_NET_ADMIN checks in cthelper and xt_osf, due to no netns support. From Kevin Cernekee.
8) Missing maximum number of instructions checks in xt_bpf, patch from Jann Horn.
9) With no CONFIG_PROC_FS ipt_CLUSTERIP compilation breaks, patch from Arnd Bergmann.
10) Missing netlink attribute policy in nftables exthdr, from Florian Westphal.
11) Enable conntrack with IPv6 MASQUERADE rules, as a357b3f80bc8 should have done in first place, from Konstantin Khlebnikov.
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Thanks a lot!
----------------------------------------------------------------
The following changes since commit 32a72bbd5da2411eab591bf9bc2e39349106193a:
net: vxge: Fix some indentation issues (2017-11-20 11:36:30 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git HEAD
for you to fetch changes up to 23715275e4fb6f64358a499d20928a9e93819f2f:
netfilter: ip6t_MASQUERADE: add dependency on conntrack module (2017-12-11 17:04:50 +0100)
----------------------------------------------------------------
Arnd Bergmann (1):
netfilter: ipt_CLUSTERIP: fix clusterip_net_exit build regression
Colin Ian King (1):
netfilter: remove redundant assignment to e
Eric Sesterhenn (2):
netfilter: nf_ct_h323: Convert CHECK_BOUND macro to function
netfilter: nf_ct_h323: Extend nf_h323_error_boundary to work on bits as well
Florian Westphal (2):
netfilter: conntrack: lower timeout to RETRANS seconds if window is 0
netfilter: exthdr: add missign attributes to policy
Jann Horn (1):
netfilter: xt_bpf: add overflow checks
Jay Elliott (1):
netfilter: conntrack: clamp timeouts to INT_MAX
Kevin Cernekee (2):
netfilter: nfnetlink_cthelper: Add missing permission checks
netfilter: xt_osf: Add missing permission checks
Konstantin Khlebnikov (1):
netfilter: ip6t_MASQUERADE: add dependency on conntrack module
Vasily Averin (1):
netfilter: exit_net cleanup check added
net/ipv4/netfilter/arp_tables.c | 1 - net/ipv4/netfilter/ip_tables.c | 1 - net/ipv4/netfilter/ipt_CLUSTERIP.c | 3 +- net/ipv6/netfilter/ip6_tables.c | 1 - net/ipv6/netfilter/ip6t_MASQUERADE.c | 8 ++- net/netfilter/nf_conntrack_h323_asn1.c | 128 +++++++++++++++++++++++++-------- net/netfilter/nf_conntrack_netlink.c | 12 +++- net/netfilter/nf_conntrack_proto_tcp.c | 3 + net/netfilter/nf_tables_api.c | 7 ++ net/netfilter/nfnetlink_cthelper.c | 10 +++ net/netfilter/nfnetlink_log.c | 5 ++ net/netfilter/nfnetlink_queue.c | 5 ++ net/netfilter/nft_exthdr.c | 2 + net/netfilter/x_tables.c | 9 +++ net/netfilter/xt_bpf.c | 6 ++ net/netfilter/xt_osf.c | 7 ++ 16 files changed, 170 insertions(+), 38 deletions(-)
Pablo Neira Ayuso
maintainerPATCH 1/12 netfilter: remove redundant assignment to e
From: Colin Ian King <[email protected]>
The assignment to variable e is redundant since the same assignment occurs just a few lines later, hence it can be removed. Cleans up clang warning for arp_tables, ip_tables and ip6_tables:
warning: Value stored to 'e' is never read
--- net/ipv4/netfilter/arp_tables.c | 1 - net/ipv4/netfilter/ip_tables.c | 1 - net/ipv6/netfilter/ip6_tables.c | 1 - 3 files changed, 3 deletions(-)
net/ipv4/netfilter/arp_tables.c +0 -1
@@ -373,7 +373,6 @@ static int mark_source_chains(const struct xt_table_info *newinfo,if (!xt_find_jump_offset (offsets, newpos, newinfo->number))return 0 ; - e = entry0 + newpos; }else {/* ... this is a fallthru */ newpos = pos + e->next_offset;
net/ipv4/netfilter/ip_tables.c +0 -1
@@ -439,7 +439,6 @@ mark_source_chains(const struct xt_table_info *newinfo,if (!xt_find_jump_offset (offsets, newpos, newinfo->number))return 0 ; - e = entry0 + newpos; }else {/* ... this is a fallthru */ newpos = pos + e->next_offset;
net/ipv6/netfilter/ip6_tables.c +0 -1
@@ -458,7 +458,6 @@ mark_source_chains(const struct xt_table_info *newinfo,if (!xt_find_jump_offset (offsets, newpos, newinfo->number))return 0 ; - e = entry0 + newpos; }else {/* ... this is a fallthru */ newpos = pos + e->next_offset;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 2/12 netfilter: exit_net cleanup check added
In reply to Pablo Neira AyusoFrom: Vasily Averin <[email protected]>
Be sure that lists initialized in net_init hook was return to initial state.
--- net/ipv4/netfilter/ipt_CLUSTERIP.c | 1 + net/netfilter/nf_tables_api.c | 7 +++++++ net/netfilter/nfnetlink_log.c | 5 +++++ net/netfilter/nfnetlink_queue.c | 5 +++++ net/netfilter/x_tables.c | 9 +++++++++ 5 files changed, 27 insertions(+)
net/ipv4/netfilter/ipt_CLUSTERIP.c +1 -0
@@ -819,6 +819,7 @@ static void clusterip_net_exit(struct net *net) cn->procdir =NULL ;#endif nf_unregister_net_hook (net, &cip_arp_ops); +WARN_ON_ONCE (!list_empty (&cn->configs)); }static struct pernet_operations clusterip_net_ops = {
net/netfilter/nf_tables_api.c +7 -0
@@ -5847,6 +5847,12 @@ static int __net_init nf_tables_init_net(struct net *net)return 0 ; } +static void __net_exit nf_tables_exit_net(struct net *net) +{ +WARN_ON_ONCE (!list_empty (&net->nft.af_info)); +WARN_ON_ONCE (!list_empty (&net->nft.commit_list)); +} +int __nft_release_basechain (struct nft_ctx *ctx) {struct nft_rule *rule, *nr;
@@ -5917,6 +5923,7 @@ static void __nft_release_afinfo(struct net *net, struct nft_af_info *afi)static struct pernet_operations nf_tables_net_ops = { .init = nf_tables_init_net, + .exit = nf_tables_exit_net, };static int __init nf_tables_module_init (void )
net/netfilter/nfnetlink_log.c +5 -0
@@ -1093,10 +1093,15 @@ static int __net_init nfnl_log_net_init(struct net *net) static void __net_exit nfnl_log_net_exit(struct net *net) { +struct nfnl_log_net *log =nfnl_log_pernet (net); +unsigned int i; +#ifdef CONFIG_PROC_FS remove_proc_entry ("nfnetlink_log" , net->nf.proc_netfilter);#endif nf_log_unset (net, &nfulnl_logger); +for (i =0 ; i <INSTANCE_BUCKETS ; i++) +WARN_ON_ONCE (!hlist_empty (&log->instance_table[i])); }static struct pernet_operations nfnl_log_net_ops = {
net/netfilter/nfnetlink_queue.c +5 -0
@@ -1512,10 +1512,15 @@ static int __net_init nfnl_queue_net_init(struct net *net) static void __net_exit nfnl_queue_net_exit(struct net *net) { +struct nfnl_queue_net *q =nfnl_queue_pernet (net); +unsigned int i; +nf_unregister_queue_handler (net);#ifdef CONFIG_PROC_FS remove_proc_entry ("nfnetlink_queue" , net->nf.proc_netfilter);#endif +for (i =0 ; i <INSTANCE_BUCKETS ; i++) +WARN_ON_ONCE (!hlist_empty (&q->instance_table[i])); }static void nfnl_queue_net_exit_batch (struct list_head *net_exit_list)
net/netfilter/x_tables.c +9 -0
@@ -1729,8 +1729,17 @@ static int __net_init xt_net_init(struct net *net)return 0 ; } +static void __net_exit xt_net_exit(struct net *net) +{ +int i; + +for (i =0 ; i <NFPROTO_NUMPROTO ; i++) +WARN_ON_ONCE (!list_empty (&net->xt.tables[i])); +} +static struct pernet_operations xt_net_ops = { .init = xt_net_init, + .exit = xt_net_exit, };static int __init xt_init (void )
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 3/12 netfilter: nf_ct_h323: Convert CHECK_BOUND macro to function
In reply to Pablo Neira AyusoFrom: Eric Sesterhenn <[email protected]>
It is bad practive to return in a macro, this patch moves the check into a function.
--- net/netfilter/nf_conntrack_h323_asn1.c | 94 +++++++++++++++++++++++----------- 1 file changed, 65 insertions(+), 29 deletions(-)
net/netfilter/nf_conntrack_h323_asn1.c +65 -29
@@ -103,7 +103,6 @@ struct bitstr {#define INC_BIT (bs) if((++(bs)->bit)>7){(bs)->cur++;(bs)->bit=0;}#define INC_BITS (bs,b) if(((bs)->bit+=(b))>7){(bs)->cur+=(bs)->bit>>3;(bs)->bit&=7;}#define BYTE_ALIGN (bs) if((bs)->bit){(bs)->cur++;(bs)->bit=0;} -#define CHECK_BOUND (bs,n) if((bs)->cur+(n)>(bs)->end)return(H323_ERROR_BOUND)static unsigned int get_len (struct bitstr *bs);static unsigned int get_bit (struct bitstr *bs);static unsigned int get_bits (struct bitstr *bs,unsigned int b);
@@ -165,6 +164,14 @@ static unsigned int get_len(struct bitstr *bs)return v; } +static int nf_h323_error_boundary (struct bitstr *bs,size_t bytes) +{ +if (*bs->cur + bytes > *bs->end) +return 1 ; + +return 0 ; +} +/****************************************************************************/ static unsigned int get_bit (struct bitstr *bs) {
@@ -280,7 +287,8 @@ static int decode_bool(struct bitstr *bs, const struct field_t *f,INC_BIT (bs); -CHECK_BOUND (bs,0 ); +if (nf_h323_error_boundary (bs,0 )) +return H323_ERROR_BOUND ;return H323_ERROR_NONE ; }
@@ -293,11 +301,14 @@ static int decode_oid(struct bitstr *bs, const struct field_t *f,"%*.s%s\n" , level *TAB_SIZE ," " , f->name);BYTE_ALIGN (bs); -CHECK_BOUND (bs,1 ); +if (nf_h323_error_boundary (bs,1 )) +return H323_ERROR_BOUND ; + len = *bs->cur++; bs->cur += len; +if (nf_h323_error_boundary (bs,0 )) +return H323_ERROR_BOUND ; -CHECK_BOUND (bs,0 );return H323_ERROR_NONE ; }
@@ -330,7 +341,8 @@ static int decode_int(struct bitstr *bs, const struct field_t *f,break ;case UNCO :BYTE_ALIGN (bs); -CHECK_BOUND (bs,2 ); +if (nf_h323_error_boundary (bs,2 )) +return H323_ERROR_BOUND ; len =get_len (bs); bs->cur += len;break ;
@@ -341,7 +353,8 @@ static int decode_int(struct bitstr *bs, const struct field_t *f,"\n" ); -CHECK_BOUND (bs,0 ); +if (nf_h323_error_boundary (bs,0 )) +return H323_ERROR_BOUND ;return H323_ERROR_NONE ; }
@@ -357,7 +370,8 @@ static int decode_enum(struct bitstr *bs, const struct field_t *f,INC_BITS (bs, f->sz); } -CHECK_BOUND (bs,0 ); +if (nf_h323_error_boundary (bs,0 )) +return H323_ERROR_BOUND ;return H323_ERROR_NONE ; }
@@ -375,12 +389,14 @@ static int decode_bitstr(struct bitstr *bs, const struct field_t *f, len = f->lb;break ;case WORD :/* 2-byte length */ -CHECK_BOUND (bs,2 ); +if (nf_h323_error_boundary (bs,2 )) +return H323_ERROR_BOUND ; len = (*bs->cur++) <<8 ; len += (*bs->cur++) + f->lb;break ;case SEMI : -CHECK_BOUND (bs,2 ); +if (nf_h323_error_boundary (bs,2 )) +return H323_ERROR_BOUND ; len =get_len (bs);break ;default :
@@ -391,7 +407,8 @@ static int decode_bitstr(struct bitstr *bs, const struct field_t *f, bs->cur += len >>3 ; bs->bit = len &7 ; -CHECK_BOUND (bs,0 ); +if (nf_h323_error_boundary (bs,0 )) +return H323_ERROR_BOUND ;return H323_ERROR_NONE ; }
@@ -409,7 +426,8 @@ static int decode_numstr(struct bitstr *bs, const struct field_t *f,BYTE_ALIGN (bs);INC_BITS (bs, (len <<2 )); -CHECK_BOUND (bs,0 ); +if (nf_h323_error_boundary (bs,0 )) +return H323_ERROR_BOUND ;return H323_ERROR_NONE ; }
@@ -440,12 +458,14 @@ static int decode_octstr(struct bitstr *bs, const struct field_t *f,break ;case BYTE :/* Range == 256 */ BYTE_ALIGN (bs); -CHECK_BOUND (bs,1 ); +if (nf_h323_error_boundary (bs,1 )) +return H323_ERROR_BOUND ; len = (*bs->cur++) + f->lb;break ;case SEMI :BYTE_ALIGN (bs); -CHECK_BOUND (bs,2 ); +if (nf_h323_error_boundary (bs,2 )) +return H323_ERROR_BOUND ; len =get_len (bs) + f->lb;break ;default :/* 2 <= Range <= 255 */
@@ -458,7 +478,8 @@ static int decode_octstr(struct bitstr *bs, const struct field_t *f,"\n" ); -CHECK_BOUND (bs,0 ); +if (nf_h323_error_boundary (bs,0 )) +return H323_ERROR_BOUND ;return H323_ERROR_NONE ; }
@@ -473,7 +494,8 @@ static int decode_bmpstr(struct bitstr *bs, const struct field_t *f,switch (f->sz) {case BYTE :/* Range == 256 */ BYTE_ALIGN (bs); -CHECK_BOUND (bs,1 ); +if (nf_h323_error_boundary (bs,1 )) +return H323_ERROR_BOUND ; len = (*bs->cur++) + f->lb;break ;default :/* 2 <= Range <= 255 */
@@ -484,7 +506,8 @@ static int decode_bmpstr(struct bitstr *bs, const struct field_t *f, bs->cur += len <<1 ; -CHECK_BOUND (bs,0 ); +if (nf_h323_error_boundary (bs,0 )) +return H323_ERROR_BOUND ;return H323_ERROR_NONE ; }
@@ -525,9 +548,11 @@ static int decode_seq(struct bitstr *bs, const struct field_t *f,/* Decode */ if (son->attr &OPEN ) {/* Open field */ -CHECK_BOUND (bs,2 ); +if (nf_h323_error_boundary (bs,2 )) +return H323_ERROR_BOUND ; len =get_len (bs); -CHECK_BOUND (bs, len); +if (nf_h323_error_boundary (bs, len)) +return H323_ERROR_BOUND ;if (!base || !(son->attr &DECODE )) {"%*.s%s\n" , (level +1 ) *TAB_SIZE ," " , son->name);
@@ -556,7 +581,8 @@ static int decode_seq(struct bitstr *bs, const struct field_t *f,/* Get the extension bitmap */ bmp2_len =get_bits (bs,7 ) +1 ; -CHECK_BOUND (bs, (bmp2_len +7 ) >>3 ); +if (nf_h323_error_boundary (bs, (bmp2_len +7 ) >>3 )) +return H323_ERROR_BOUND ; bmp2 =get_bitmap (bs, bmp2_len); bmp |= bmp2 >> f->sz;if (base)
@@ -567,9 +593,11 @@ static int decode_seq(struct bitstr *bs, const struct field_t *f,for (opt =0 ; opt < bmp2_len; opt++, i++, son++) {/* Check Range */ if (i >= f->ub) {/* Newer Version? */ -CHECK_BOUND (bs,2 ); +if (nf_h323_error_boundary (bs,2 )) +return H323_ERROR_BOUND ; len =get_len (bs); -CHECK_BOUND (bs, len); +if (nf_h323_error_boundary (bs, len)) +return H323_ERROR_BOUND ; bs->cur += len;continue ; }
@@ -583,9 +611,11 @@ static int decode_seq(struct bitstr *bs, const struct field_t *f,if (!((0x80000000 >> opt) & bmp2))/* Not present */ continue ; -CHECK_BOUND (bs,2 ); +if (nf_h323_error_boundary (bs,2 )) +return H323_ERROR_BOUND ; len =get_len (bs); -CHECK_BOUND (bs, len); +if (nf_h323_error_boundary (bs, len)) +return H323_ERROR_BOUND ;if (!base || !(son->attr &DECODE )) {"%*.s%s\n" , (level +1 ) *TAB_SIZE ," " , son->name);
@@ -623,19 +653,22 @@ static int decode_seqof(struct bitstr *bs, const struct field_t *f,switch (f->sz) {case BYTE :BYTE_ALIGN (bs); -CHECK_BOUND (bs,1 ); +if (nf_h323_error_boundary (bs,1 )) +return H323_ERROR_BOUND ; count = *bs->cur++;break ;case WORD :BYTE_ALIGN (bs); -CHECK_BOUND (bs,2 ); +if (nf_h323_error_boundary (bs,2 )) +return H323_ERROR_BOUND ; count = *bs->cur++; count <<=8 ; count += *bs->cur++;break ;case SEMI :BYTE_ALIGN (bs); -CHECK_BOUND (bs,2 ); +if (nf_h323_error_boundary (bs,2 )) +return H323_ERROR_BOUND ; count =get_len (bs);break ;default :
@@ -659,7 +692,8 @@ static int decode_seqof(struct bitstr *bs, const struct field_t *f,if (son->attr &OPEN ) {BYTE_ALIGN (bs); len =get_len (bs); -CHECK_BOUND (bs, len); +if (nf_h323_error_boundary (bs, len)) +return H323_ERROR_BOUND ;if (!base || !(son->attr &DECODE )) {"%*.s%s\n" , (level +1 ) *TAB_SIZE ," " , son->name);
@@ -728,7 +762,8 @@ static int decode_choice(struct bitstr *bs, const struct field_t *f,if (type >= f->ub) {/* Newer version? */ BYTE_ALIGN (bs); len =get_len (bs); -CHECK_BOUND (bs, len); +if (nf_h323_error_boundary (bs, len)) +return H323_ERROR_BOUND ; bs->cur += len;return H323_ERROR_NONE ; }
@@ -743,7 +778,8 @@ static int decode_choice(struct bitstr *bs, const struct field_t *f,if (ext || (son->attr &OPEN )) {BYTE_ALIGN (bs); len =get_len (bs); -CHECK_BOUND (bs, len); +if (nf_h323_error_boundary (bs, len)) +return H323_ERROR_BOUND ;if (!base || !(son->attr &DECODE )) {"%*.s%s\n" , (level +1 ) *TAB_SIZE ," " , son->name);
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 4/12 netfilter: nf_ct_h323: Extend nf_h323_error_boundary to work on bits as well
In reply to Pablo Neira AyusoFrom: Eric Sesterhenn <[email protected]>
This patch fixes several out of bounds memory reads by extending the nf_h323_error_boundary() function to work on bits as well an check the affected parts.
--- net/netfilter/nf_conntrack_h323_asn1.c | 92 +++++++++++++++++++++++----------- 1 file changed, 62 insertions(+), 30 deletions(-)
net/netfilter/nf_conntrack_h323_asn1.c +62 -30
@@ -164,8 +164,13 @@ static unsigned int get_len(struct bitstr *bs)return v; } -static int nf_h323_error_boundary (struct bitstr *bs,size_t bytes) +static int nf_h323_error_boundary (struct bitstr *bs,size_t bytes,size_t bits) { + bits += bs->bit; + bytes += bits /BITS_PER_BYTE ; +if (bits %BITS_PER_BYTE >0 ) + bytes++; +if (*bs->cur + bytes > *bs->end)return 1 ;
@@ -286,8 +291,7 @@ static int decode_bool(struct bitstr *bs, const struct field_t *f,"%*.s%s\n" , level *TAB_SIZE ," " , f->name);INC_BIT (bs); - -if (nf_h323_error_boundary (bs,0 )) +if (nf_h323_error_boundary (bs,0 ,0 ))return H323_ERROR_BOUND ;return H323_ERROR_NONE ; }
@@ -301,12 +305,12 @@ static int decode_oid(struct bitstr *bs, const struct field_t *f,"%*.s%s\n" , level *TAB_SIZE ," " , f->name);BYTE_ALIGN (bs); -if (nf_h323_error_boundary (bs,1 )) +if (nf_h323_error_boundary (bs,1 ,0 ))return H323_ERROR_BOUND ; len = *bs->cur++; bs->cur += len; -if (nf_h323_error_boundary (bs,0 )) +if (nf_h323_error_boundary (bs,0 ,0 ))return H323_ERROR_BOUND ;return H323_ERROR_NONE ;
@@ -330,6 +334,8 @@ static int decode_int(struct bitstr *bs, const struct field_t *f, bs->cur +=2 ;break ;case CONS :/* 64K < Range < 4G */ +if (nf_h323_error_boundary (bs,0 ,2 )) +return H323_ERROR_BOUND ; len =get_bits (bs,2 ) +1 ;BYTE_ALIGN (bs);if (base && (f->attr &DECODE )) {/* timeToLive */
@@ -341,7 +347,7 @@ static int decode_int(struct bitstr *bs, const struct field_t *f,break ;case UNCO :BYTE_ALIGN (bs); -if (nf_h323_error_boundary (bs,2 )) +if (nf_h323_error_boundary (bs,2 ,0 ))return H323_ERROR_BOUND ; len =get_len (bs); bs->cur += len;
@@ -353,7 +359,7 @@ static int decode_int(struct bitstr *bs, const struct field_t *f,"\n" ); -if (nf_h323_error_boundary (bs,0 )) +if (nf_h323_error_boundary (bs,0 ,0 ))return H323_ERROR_BOUND ;return H323_ERROR_NONE ; }
@@ -370,7 +376,7 @@ static int decode_enum(struct bitstr *bs, const struct field_t *f,INC_BITS (bs, f->sz); } -if (nf_h323_error_boundary (bs,0 )) +if (nf_h323_error_boundary (bs,0 ,0 ))return H323_ERROR_BOUND ;return H323_ERROR_NONE ; }
@@ -389,13 +395,13 @@ static int decode_bitstr(struct bitstr *bs, const struct field_t *f, len = f->lb;break ;case WORD :/* 2-byte length */ -if (nf_h323_error_boundary (bs,2 )) +if (nf_h323_error_boundary (bs,2 ,0 ))return H323_ERROR_BOUND ; len = (*bs->cur++) <<8 ; len += (*bs->cur++) + f->lb;break ;case SEMI : -if (nf_h323_error_boundary (bs,2 )) +if (nf_h323_error_boundary (bs,2 ,0 ))return H323_ERROR_BOUND ; len =get_len (bs);break ;
@@ -407,7 +413,7 @@ static int decode_bitstr(struct bitstr *bs, const struct field_t *f, bs->cur += len >>3 ; bs->bit = len &7 ; -if (nf_h323_error_boundary (bs,0 )) +if (nf_h323_error_boundary (bs,0 ,0 ))return H323_ERROR_BOUND ;return H323_ERROR_NONE ; }
@@ -421,12 +427,14 @@ static int decode_numstr(struct bitstr *bs, const struct field_t *f,"%*.s%s\n" , level *TAB_SIZE ," " , f->name);/* 2 <= Range <= 255 */ +if (nf_h323_error_boundary (bs,0 , f->sz)) +return H323_ERROR_BOUND ; len =get_bits (bs, f->sz) + f->lb;BYTE_ALIGN (bs);INC_BITS (bs, (len <<2 )); -if (nf_h323_error_boundary (bs,0 )) +if (nf_h323_error_boundary (bs,0 ,0 ))return H323_ERROR_BOUND ;return H323_ERROR_NONE ; }
@@ -458,17 +466,19 @@ static int decode_octstr(struct bitstr *bs, const struct field_t *f,break ;case BYTE :/* Range == 256 */ BYTE_ALIGN (bs); -if (nf_h323_error_boundary (bs,1 )) +if (nf_h323_error_boundary (bs,1 ,0 ))return H323_ERROR_BOUND ; len = (*bs->cur++) + f->lb;break ;case SEMI :BYTE_ALIGN (bs); -if (nf_h323_error_boundary (bs,2 )) +if (nf_h323_error_boundary (bs,2 ,0 ))return H323_ERROR_BOUND ; len =get_len (bs) + f->lb;break ;default :/* 2 <= Range <= 255 */ +if (nf_h323_error_boundary (bs,0 , f->sz)) +return H323_ERROR_BOUND ; len =get_bits (bs, f->sz) + f->lb;BYTE_ALIGN (bs);break ;
@@ -478,7 +488,7 @@ static int decode_octstr(struct bitstr *bs, const struct field_t *f,"\n" ); -if (nf_h323_error_boundary (bs,0 )) +if (nf_h323_error_boundary (bs,0 ,0 ))return H323_ERROR_BOUND ;return H323_ERROR_NONE ; }
@@ -494,11 +504,13 @@ static int decode_bmpstr(struct bitstr *bs, const struct field_t *f,switch (f->sz) {case BYTE :/* Range == 256 */ BYTE_ALIGN (bs); -if (nf_h323_error_boundary (bs,1 )) +if (nf_h323_error_boundary (bs,1 ,0 ))return H323_ERROR_BOUND ; len = (*bs->cur++) + f->lb;break ;default :/* 2 <= Range <= 255 */ +if (nf_h323_error_boundary (bs,0 , f->sz)) +return H323_ERROR_BOUND ; len =get_bits (bs, f->sz) + f->lb;BYTE_ALIGN (bs);break ;
@@ -506,7 +518,7 @@ static int decode_bmpstr(struct bitstr *bs, const struct field_t *f, bs->cur += len <<1 ; -if (nf_h323_error_boundary (bs,0 )) +if (nf_h323_error_boundary (bs,0 ,0 ))return H323_ERROR_BOUND ;return H323_ERROR_NONE ; }
@@ -526,9 +538,13 @@ static int decode_seq(struct bitstr *bs, const struct field_t *f, base = (base && (f->attr &DECODE )) ? base + f->offset :NULL ;/* Extensible? */ +if (nf_h323_error_boundary (bs,0 ,1 )) +return H323_ERROR_BOUND ; ext = (f->attr &EXT ) ?get_bit (bs) :0 ;/* Get fields bitmap */ +if (nf_h323_error_boundary (bs,0 , f->sz)) +return H323_ERROR_BOUND ; bmp =get_bitmap (bs, f->sz);if (base) *(unsigned int *)base = bmp;
@@ -548,10 +564,10 @@ static int decode_seq(struct bitstr *bs, const struct field_t *f,/* Decode */ if (son->attr &OPEN ) {/* Open field */ -if (nf_h323_error_boundary (bs,2 )) +if (nf_h323_error_boundary (bs,2 ,0 ))return H323_ERROR_BOUND ; len =get_len (bs); -if (nf_h323_error_boundary (bs, len)) +if (nf_h323_error_boundary (bs, len,0 ))return H323_ERROR_BOUND ;if (!base || !(son->attr &DECODE )) { PRINT("%*.s%s\n", (level + 1) * TAB_SIZE,
@@ -580,8 +596,10 @@ static int decode_seq(struct bitstr *bs, const struct field_t *f,return H323_ERROR_NONE ;/* Get the extension bitmap */ +if (nf_h323_error_boundary (bs,0 ,7 )) +return H323_ERROR_BOUND ; bmp2_len =get_bits (bs,7 ) +1 ; -if (nf_h323_error_boundary (bs, (bmp2_len +7 ) >>3 )) +if (nf_h323_error_boundary (bs,0 , bmp2_len))return H323_ERROR_BOUND ; bmp2 =get_bitmap (bs, bmp2_len); bmp |= bmp2 >> f->sz;
@@ -593,10 +611,10 @@ static int decode_seq(struct bitstr *bs, const struct field_t *f,for (opt =0 ; opt < bmp2_len; opt++, i++, son++) {/* Check Range */ if (i >= f->ub) {/* Newer Version? */ -if (nf_h323_error_boundary (bs,2 )) +if (nf_h323_error_boundary (bs,2 ,0 ))return H323_ERROR_BOUND ; len =get_len (bs); -if (nf_h323_error_boundary (bs, len)) +if (nf_h323_error_boundary (bs, len,0 ))return H323_ERROR_BOUND ; bs->cur += len;continue ;
@@ -611,10 +629,10 @@ static int decode_seq(struct bitstr *bs, const struct field_t *f,if (!((0x80000000 >> opt) & bmp2))/* Not present */ continue ; -if (nf_h323_error_boundary (bs,2 )) +if (nf_h323_error_boundary (bs,2 ,0 ))return H323_ERROR_BOUND ; len =get_len (bs); -if (nf_h323_error_boundary (bs, len)) +if (nf_h323_error_boundary (bs, len,0 ))return H323_ERROR_BOUND ;if (!base || !(son->attr &DECODE )) { PRINT("%*.s%s\n", (level + 1) * TAB_SIZE, " ",
@@ -653,13 +671,13 @@ static int decode_seqof(struct bitstr *bs, const struct field_t *f,switch (f->sz) {case BYTE :BYTE_ALIGN (bs); -if (nf_h323_error_boundary (bs,1 )) +if (nf_h323_error_boundary (bs,1 ,0 ))return H323_ERROR_BOUND ; count = *bs->cur++;break ;case WORD :BYTE_ALIGN (bs); -if (nf_h323_error_boundary (bs,2 )) +if (nf_h323_error_boundary (bs,2 ,0 ))return H323_ERROR_BOUND ; count = *bs->cur++; count <<=8 ;
@@ -667,11 +685,13 @@ static int decode_seqof(struct bitstr *bs, const struct field_t *f,break ;case SEMI :BYTE_ALIGN (bs); -if (nf_h323_error_boundary (bs,2 )) +if (nf_h323_error_boundary (bs,2 ,0 ))return H323_ERROR_BOUND ; count =get_len (bs);break ;default : +if (nf_h323_error_boundary (bs,0 , f->sz)) +return H323_ERROR_BOUND ; count =get_bits (bs, f->sz);break ; }
@@ -691,8 +711,10 @@ static int decode_seqof(struct bitstr *bs, const struct field_t *f,for (i =0 ; i < count; i++) {if (son->attr &OPEN ) {BYTE_ALIGN (bs); +if (nf_h323_error_boundary (bs,2 ,0 )) +return H323_ERROR_BOUND ; len =get_len (bs); -if (nf_h323_error_boundary (bs, len)) +if (nf_h323_error_boundary (bs, len,0 ))return H323_ERROR_BOUND ;if (!base || !(son->attr &DECODE )) { PRINT("%*.s%s\n", (level + 1) * TAB_SIZE,
@@ -744,11 +766,17 @@ static int decode_choice(struct bitstr *bs, const struct field_t *f, base = (base && (f->attr &DECODE )) ? base + f->offset :NULL ;/* Decode the choice index number */ +if (nf_h323_error_boundary (bs,0 ,1 )) +return H323_ERROR_BOUND ;if ((f->attr &EXT ) &&get_bit (bs)) { ext =1 ; +if (nf_h323_error_boundary (bs,0 ,7 )) +return H323_ERROR_BOUND ; type =get_bits (bs,7 ) + f->lb; }else { ext =0 ; +if (nf_h323_error_boundary (bs,0 , f->sz)) +return H323_ERROR_BOUND ; type =get_bits (bs, f->sz);if (type >= f->lb)return H323_ERROR_RANGE ;
@@ -761,8 +789,10 @@ static int decode_choice(struct bitstr *bs, const struct field_t *f,/* Check Range */ if (type >= f->ub) {/* Newer version? */ BYTE_ALIGN (bs); +if (nf_h323_error_boundary (bs,2 ,0 )) +return H323_ERROR_BOUND ; len =get_len (bs); -if (nf_h323_error_boundary (bs, len)) +if (nf_h323_error_boundary (bs, len,0 ))return H323_ERROR_BOUND ; bs->cur += len;return H323_ERROR_NONE ;
@@ -777,8 +807,10 @@ static int decode_choice(struct bitstr *bs, const struct field_t *f,if (ext || (son->attr &OPEN )) {BYTE_ALIGN (bs); +if (nf_h323_error_boundary (bs, len,0 )) +return H323_ERROR_BOUND ; len =get_len (bs); -if (nf_h323_error_boundary (bs, len)) +if (nf_h323_error_boundary (bs, len,0 ))return H323_ERROR_BOUND ;if (!base || !(son->attr &DECODE )) { PRINT("%*.s%s\n", (level + 1) * TAB_SIZE, " ",
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 5/12 netfilter: conntrack: lower timeout to RETRANS seconds if window is 0
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
When zero window is announced we can get into a situation where connection stays around forever:
1. One side announces zero window.
2. Other side closes.
In this case, no FIN is sent (stuck in send queue).
Unless other side opens the window up again conntrack stays in ESTABLISHED state for a very long time.
Lets alleviate this by lowering the timeout to RETRANS (5 minutes), the other end should be sending zero window probes to keep the connection established as long as a socket still exists.
--- net/netfilter/nf_conntrack_proto_tcp.c | 3 +++ 1 file changed, 3 insertions(+)
net/netfilter/nf_conntrack_proto_tcp.c +3 -0
@@ -1039,6 +1039,9 @@ static int tcp_packet(struct nf_conn *ct, IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED && timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK]) timeout = timeouts[TCP_CONNTRACK_UNACK ]; + else if (ct->proto.tcp.last_win == 0 && + timeouts[new_state] > timeouts[TCP_CONNTRACK_RETRANS]) + timeout = timeouts[TCP_CONNTRACK_RETRANS ]; else timeout = timeouts[new_state];spin_unlock_bh (&ct->lock);
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 6/12 netfilter: conntrack: clamp timeouts to INT_MAX
In reply to Pablo Neira AyusoFrom: Jay Elliott <[email protected]>
When the conntracking code multiplies a timeout by HZ, it can overflow from positive to negative; this causes it to instantly expire. To protect against this the multiplication is done in 64-bit so we can prevent it from exceeding INT_MAX.
--- net/netfilter/nf_conntrack_netlink.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
net/netfilter/nf_conntrack_netlink.c +9 -3
@@ -1566,9 +1566,11 @@ static int ctnetlink_change_helper(struct nf_conn *ct,static int ctnetlink_change_timeout (struct nf_conn *ct,const struct nlattr *const cda[]) { -u_int32_t timeout =ntohl (nla_get_be32 (cda[CTA_TIMEOUT ])); +u64 timeout = (u64 )ntohl (nla_get_be32 (cda[CTA_TIMEOUT ])) *HZ ; - ct->timeout = nfct_time_stamp + timeout *HZ ; +if (timeout >INT_MAX ) + timeout =INT_MAX ; + ct->timeout = nfct_time_stamp + (u32 )timeout;if (test_bit (IPS_DYING_BIT , &ct->status))return -ETIME ;
@@ -1768,6 +1770,7 @@ ctnetlink_create_conntrack(struct net *net,int err = -EINVAL ;struct nf_conntrack_helper *helper;struct nf_conn_tstamp *tstamp; +u64 timeout; ct =nf_conntrack_alloc (net, zone, otuple, rtuple,GFP_ATOMIC );if (IS_ERR (ct))
@@ -1776,7 +1779,10 @@ ctnetlink_create_conntrack(struct net *net,if (!cda[CTA_TIMEOUT ]) goto err1; - ct->timeout = nfct_time_stamp +ntohl (nla_get_be32 (cda[CTA_TIMEOUT ])) *HZ ; + timeout = (u64 )ntohl (nla_get_be32 (cda[CTA_TIMEOUT ])) *HZ ; +if (timeout >INT_MAX ) + timeout =INT_MAX ; + ct->timeout = (u32 )timeout + nfct_time_stamp;rcu_read_lock ();if (cda[CTA_HELP ]) {
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 7/12 netfilter: nfnetlink_cthelper: Add missing permission checks
In reply to Pablo Neira AyusoFrom: Kevin Cernekee <[email protected]>
The capability check in nfnetlink_rcv() verifies that the caller has CAP_NET_ADMIN in the namespace that "owns" the netlink socket. However, nfnl_cthelper_list is shared by all net namespaces on the system. An unprivileged user can create user and net namespaces in which he holds CAP_NET_ADMIN to bypass the netlink_net_capable() check:
$ nfct helper list
nfct v1.4.4: netlink error: Operation not permitted
$ vpnns -- nfct helper list
{
.name = ftp,
.queuenum = 0,
.l3protonum = 2,
.l4protonum = 6,
.priv_data_len = 24,
.status = enabled,
};Add capable() checks in nfnetlink_cthelper, as this is cleaner than trying to generalize the solution.
--- net/netfilter/nfnetlink_cthelper.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
net/netfilter/nfnetlink_cthelper.c +10 -0
@@ -17,6 +17,7 @@#include <linux/types.h> #include <linux/list.h> #include <linux/errno.h> +#include <linux/capability.h> #include <net/netlink.h> #include <net/sock.h>
@@ -407,6 +408,9 @@ static int nfnl_cthelper_new(struct net *net, struct sock *nfnl,struct nfnl_cthelper *nlcth;int ret =0 ; +if (!capable (CAP_NET_ADMIN )) +return -EPERM ; +if (!tb[NFCTH_NAME ] || !tb[NFCTH_TUPLE ])return -EINVAL ;
@@ -611,6 +615,9 @@ static int nfnl_cthelper_get(struct net *net, struct sock *nfnl,struct nfnl_cthelper *nlcth;bool tuple_set = false; +if (!capable (CAP_NET_ADMIN )) +return -EPERM ; +if (nlh->nlmsg_flags &NLM_F_DUMP ) {struct netlink_dump_control c = { .dump = nfnl_cthelper_dump_table,
@@ -678,6 +685,9 @@ static int nfnl_cthelper_del(struct net *net, struct sock *nfnl,struct nfnl_cthelper *nlcth, *n;int j =0 , ret; +if (!capable (CAP_NET_ADMIN )) +return -EPERM ; +if (tb[NFCTH_NAME ]) helper_name =nla_data (tb[NFCTH_NAME ]);
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 8/12 netfilter: xt_bpf: add overflow checks
In reply to Pablo Neira AyusoFrom: Jann Horn <[email protected]>
Check whether inputs from userspace are too long (explicit length field too big or string not null-terminated) to avoid out-of-bounds reads.
As far as I can tell, this can at worst lead to very limited kernel heap memory disclosure or oopses.
This bug can be triggered by an unprivileged user even if the xt_bpf module is not loaded: iptables is available in network namespaces, and the xt_bpf module can be autoloaded.
Triggering the bug with a classic BPF filter with fake length 0x1000 causes the following KASAN report:
==================================================================
BUG: KASAN: slab-out-of-bounds in bpf_prog_create+0x84/0xf0
Read of size 32768 at addr ffff8801eff2c494 by task test/4627
CPU: 0 PID: 4627 Comm: test Not tainted 4.15.0-rc1+ #1
[...]
Call Trace:
dump_stack+0x5c/0x85
print_address_description+0x6a/0x260
kasan_report+0x254/0x370
? bpf_prog_create+0x84/0xf0
memcpy+0x1f/0x50
bpf_prog_create+0x84/0xf0
bpf_mt_check+0x90/0xd6 [xt_bpf]
[...]
Allocated by task 4627:
kasan_kmalloc+0xa0/0xd0
__kmalloc_node+0x47/0x60
xt_alloc_table_info+0x41/0x70 [x_tables]
[...]
The buggy address belongs to the object at ffff8801eff2c3c0
which belongs to the cache kmalloc-2048 of size 2048
The buggy address is located 212 bytes inside of
2048-byte region [ffff8801eff2c3c0, ffff8801eff2cbc0)[...]
==================================================================
--- net/netfilter/xt_bpf.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/netfilter/xt_bpf.c +6 -0
@@ -27,6 +27,9 @@ static int __bpf_mt_check_bytecode(struct sock_filter *insns, __u16 len, {struct sock_fprog_kern program; +if (len >XT_BPF_MAX_NUM_INSTR ) +return -EINVAL ; + program.len = len; program.filter = insns;
@@ -55,6 +58,9 @@ static int __bpf_mt_check_path(const char *path, struct bpf_prog **ret)mm_segment_t oldfs =get_fs ();int retval, fd; +if (strnlen (path,XT_BPF_PATH_MAX ) ==XT_BPF_PATH_MAX ) +return -EINVAL ; +set_fs (KERNEL_DS ); fd =bpf_obj_get_user (path,0 );set_fs (oldfs);
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 9/12 netfilter: xt_osf: Add missing permission checks
In reply to Pablo Neira AyusoFrom: Kevin Cernekee <[email protected]>
The capability check in nfnetlink_rcv() verifies that the caller has CAP_NET_ADMIN in the namespace that "owns" the netlink socket. However, xt_osf_fingers is shared by all net namespaces on the system. An unprivileged user can create user and net namespaces in which he holds CAP_NET_ADMIN to bypass the netlink_net_capable() check:
vpnns -- nfnl_osf -f /tmp/pf.os
vpnns -- nfnl_osf -f /tmp/pf.os -d
These non-root operations successfully modify the systemwide OS fingerprint list. Add new capable() checks so that they can't.
--- net/netfilter/xt_osf.c | 7 +++++++ 1 file changed, 7 insertions(+)
net/netfilter/xt_osf.c +7 -0
@@ -19,6 +19,7 @@#include <linux/module.h> #include <linux/kernel.h> +#include <linux/capability.h> #include <linux/if.h> #include <linux/inetdevice.h> #include <linux/ip.h>
@@ -70,6 +71,9 @@ static int xt_osf_add_callback(struct net *net, struct sock *ctnl,struct xt_osf_finger *kf =NULL , *sf;int err =0 ; +if (!capable (CAP_NET_ADMIN )) +return -EPERM ; +if (!osf_attrs[OSF_ATTR_FINGER ])return -EINVAL ;
@@ -115,6 +119,9 @@ static int xt_osf_remove_callback(struct net *net, struct sock *ctnl,struct xt_osf_finger *sf;int err = -ENOENT ; +if (!capable (CAP_NET_ADMIN )) +return -EPERM ; +if (!osf_attrs[OSF_ATTR_FINGER ])return -EINVAL ;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 10/12 netfilter: ipt_CLUSTERIP: fix clusterip_net_exit build regression
In reply to Pablo Neira AyusoFrom: Arnd Bergmann <[email protected]>
The added check produces a build error when CONFIG_PROC_FS is disabled:
net/ipv4/netfilter/ipt_CLUSTERIP.c: In function 'clusterip_net_exit':net/ipv4/netfilter/ipt_CLUSTERIP.c:822:28: error: 'cn' undeclared (first use in this function)
This moves the variable declaration out of the #ifdef to make it available to the WARN_ON_ONCE().
--- net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/netfilter/ipt_CLUSTERIP.c +1 -1
@@ -813,8 +813,8 @@ static int clusterip_net_init(struct net *net)static void clusterip_net_exit (struct net *net) { -#ifdef CONFIG_PROC_FS struct clusterip_net *cn =net_generic (net, clusterip_net_id); +#ifdef CONFIG_PROC_FS proc_remove (cn->procdir); cn->procdir =NULL ;#endif
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 11/12 netfilter: exthdr: add missign attributes to policy
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
Add missing netlink attribute policy.
--- net/netfilter/nft_exthdr.c | 2 ++ 1 file changed, 2 insertions(+)
net/netfilter/nft_exthdr.c +2 -0
@@ -214,6 +214,8 @@ static const struct nla_policy nft_exthdr_policy[NFTA_EXTHDR_MAX + 1] = { [NFTA_EXTHDR_OFFSET] = { .type = NLA_U32 }, [NFTA_EXTHDR_LEN] = { .type = NLA_U32 }, [NFTA_EXTHDR_FLAGS] = { .type = NLA_U32 }, + [NFTA_EXTHDR_OP] = { .type = NLA_U32 }, + [NFTA_EXTHDR_SREG] = { .type = NLA_U32 }, }; static int nft_exthdr_init(const struct nft_ctx *ctx,
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 12/12 netfilter: ip6t_MASQUERADE: add dependency on conntrack module
In reply to Pablo Neira AyusoFrom: Konstantin Khlebnikov <[email protected]>
After commit 4d3a57f23dec ("netfilter: conntrack: do not enable connection tracking unless needed") conntrack is disabled by default unless some module explicitly declares dependency in particular network namespace.
--- net/ipv6/netfilter/ip6t_MASQUERADE.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
net/ipv6/netfilter/ip6t_MASQUERADE.c +7 -1
@@ -33,13 +33,19 @@ static int masquerade_tg6_checkentry(const struct xt_tgchk_param *par)if (range->flags &NF_NAT_RANGE_MAP_IPS )return -EINVAL ; -return 0 ; +return nf_ct_netns_get (par->net, par->family); +} + +static void masquerade_tg6_destroy (const struct xt_tgdtor_param *par) +{ +nf_ct_netns_put (par->net, par->family); }static struct xt_target masquerade_tg6_reg__read_mostly = { .name ="MASQUERADE" , .family =NFPROTO_IPV6 , .checkentry = masquerade_tg6_checkentry, + .destroy = masquerade_tg6_destroy, .target = masquerade_tg6, .targetsize =sizeof (struct nf_nat_range ), .table ="nat" ,
Signature · 1 line
2.11.0
David Miller
maintainerFrom: Pablo Neira Ayuso <[email protected]>
Date: Wed, 13 Dec 2017 19:45:08 +0100
Quoted 2 lines
The follow patchset contains Netfilter fixes for your net tree, they are:
...
Quoted 3 lines
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Pulled, but the attention to detail in these patches could be improved.
There were several obvious typos in the commit messages in this series.