| Message ID | 20180423175714.9794-4-pablo@netfilter.org |
|---|---|
| State | Accepted |
| Delegated to: | Pablo Neira |
| Headers | show |
| Series | [01/12] netfilter: nf_conntrack_sip: allow duplicate SDP expectations | expand |
Hello! On 4/23/2018 8:57 PM, Pablo Neira Ayuso wrote: > From: Florian Westphal <fw@strlen.de> > > Dmitry reports 32bit ebtables on 64bit kernel got broken by > a recent change that returns -EINVAL when ruleset has no entries. > > ebtables however only counts user-defined chains, so for the > initial table nentries will be 0. > > Don't try to allocate the compat array in this case, as no user As if, perhaps? > defined rules exist no rule will need 64bit translation. > > Reported-by: Dmitry Vyukov <dvyukov@google.com> > Fixes: 7d7d7e02111e9 ("netfilter: compat: reject huge allocation requests") > Signed-off-by: Florian Westphal <fw@strlen.de> > Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> > --- > net/bridge/netfilter/ebtables.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c > index 032e0fe45940..28a4c3490359 100644 > --- a/net/bridge/netfilter/ebtables.c > +++ b/net/bridge/netfilter/ebtables.c > @@ -1825,13 +1825,14 @@ static int compat_table_info(const struct ebt_table_info *info, > { > unsigned int size = info->entries_size; > const void *entries = info->entries; > - int ret; > > newinfo->entries_size = size; > - > - ret = xt_compat_init_offsets(NFPROTO_BRIDGE, info->nentries); > - if (ret) > - return ret; > + if (info->nentries) { > + int ret = xt_compat_init_offsets(NFPROTO_BRIDGE, > + info->nentries); Need an empty line here... > + if (ret) > + return ret; > + } > > return EBT_ENTRY_ITERATE(entries, size, compat_calc_entry, info, > entries, newinfo); MBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index 032e0fe45940..28a4c3490359 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c @@ -1825,13 +1825,14 @@ static int compat_table_info(const struct ebt_table_info *info, { unsigned int size = info->entries_size; const void *entries = info->entries; - int ret; newinfo->entries_size = size; - - ret = xt_compat_init_offsets(NFPROTO_BRIDGE, info->nentries); - if (ret) - return ret; + if (info->nentries) { + int ret = xt_compat_init_offsets(NFPROTO_BRIDGE, + info->nentries); + if (ret) + return ret; + } return EBT_ENTRY_ITERATE(entries, size, compat_calc_entry, info, entries, newinfo);