From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pablo Neira Ayuso Subject: Re: [PATCH net] netfilter: x_tables: avoid stack-out-of-bounds read in xt_copy_counters_from_user Date: Fri, 6 Oct 2017 15:05:12 +0200 Message-ID: <20171006130512.GA10882@salvia> References: <1507197007.14419.15.camel@edumazet-glaptop3.roam.corp.google.com> <20171005095644.GB27522@breakpoint.cc> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Eric Dumazet , Jozsef Kadlecsik , netfilter-devel@vger.kernel.org, netdev , Willem de Bruijn To: Florian Westphal Return-path: Content-Disposition: inline In-Reply-To: <20171005095644.GB27522@breakpoint.cc> Sender: netdev-owner@vger.kernel.org List-Id: netfilter-devel.vger.kernel.org On Thu, Oct 05, 2017 at 11:56:44AM +0200, Florian Westphal wrote: > Eric Dumazet wrote: > > From: Eric Dumazet > > > > syzkaller reports an out of bound read in strlcpy(), triggered > > by xt_copy_counters_from_user() > > > > Fix this by using memcpy(), then forcing a zero byte at the last position > > of the destination, as Florian did for the non COMPAT code. > > > > Fixes: d7591f0c41ce ("netfilter: x_tables: introduce and use xt_copy_counters_from_user") > > Signed-off-by: Eric Dumazet > > Cc: Willem de Bruijn > > --- > > net/netfilter/x_tables.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c > > index c83a3b5e1c6c2a91b713b6681a794bd79ab3fa08..d8571f4142080a3c121fc90f0b52d81ee9df6712 100644 > > --- a/net/netfilter/x_tables.c > > +++ b/net/netfilter/x_tables.c > > @@ -892,7 +892,7 @@ void *xt_copy_counters_from_user(const void __user *user, unsigned int len, > > if (copy_from_user(&compat_tmp, user, sizeof(compat_tmp)) != 0) > > return ERR_PTR(-EFAULT); > > > > - strlcpy(info->name, compat_tmp.name, sizeof(info->name)); > > + memcpy(info->name, compat_tmp.name, sizeof(info->name) - 1); > > Argh, right, compat_tmp.name might not be 0 terminated :-/ > > Acked-by: Florian Westphal Applied to nf, thanks.