Re: [PATCH nft] tests: shell: check that rule add with index works with echo

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, Sep 05, 2019 at 05:54:18PM +0200, Pablo Neira Ayuso wrote:
> On Tue, Sep 03, 2019 at 07:27:13PM -0400, Eric Garver wrote:
> > If --echo is used the rule cache will not be populated. This causes
> > rules added using the "index" keyword to be simply appended to the
> > chain. The bug was introduced in commit 3ab02db5f836 ("cache: add
> > NFT_CACHE_UPDATE and NFT_CACHE_FLUSHED flags").
> > 
> > Signed-off-by: Eric Garver <eric@xxxxxxxxxxx>
> > ---
> > I think the issue is in cache_evaluate(). It sets the flags to
> > NFT_CACHE_FULL and then bails early, but I'm not sure of the best way to
> > fix it. So I'll start by submitting a test case. :)
> > ---
> >  tests/shell/testcases/cache/0007_echo_cache_init_0 | 14 ++++++++++++++
> >  .../cache/dumps/0007_echo_cache_init_0.nft         |  7 +++++++
> >  2 files changed, 21 insertions(+)
> >  create mode 100755 tests/shell/testcases/cache/0007_echo_cache_init_0
> >  create mode 100644 tests/shell/testcases/cache/dumps/0007_echo_cache_init_0.nft
> > 
> > diff --git a/tests/shell/testcases/cache/0007_echo_cache_init_0 b/tests/shell/testcases/cache/0007_echo_cache_init_0
> > new file mode 100755
> > index 000000000000..280a0d06bdc3
> > --- /dev/null
> > +++ b/tests/shell/testcases/cache/0007_echo_cache_init_0
> > @@ -0,0 +1,14 @@
> > +#!/bin/bash
> > +
> > +set -e
> > +
> > +$NFT -i >/dev/null <<EOF
> > +add table inet t
> > +add chain inet t c
> > +add rule inet t c accept comment "first"
> > +add rule inet t c accept comment "third"
> > +EOF
> > +
> > +# make sure the rule cache gets initialized when using echo option
> > +#
> > +$NFT --echo add rule inet t c index 0 accept comment '"second"' >/dev/null
> 
> Looks like the problem is index == 0?

No. The index gets incremented by 1 by the JSON parser (CLI does the
same thing). It's never zero if the "index" keyword is used.

It's just as easily reproduced if you use any other index.

> 
>                 if (cmd->handle.index.id ||
>                     cmd->handle.position.id)
>                         flags |= NFT_CACHE_RULE | NFT_CACHE_UPDATE;

We never reach this code since cache_evaluate() breaks if --echo is
used. i.e. evaluate_cache_add() is never called.

> We might need to set up a flag, eg. cmd->handle.flags &
> NFT_HANDLE_INDEX, similarly with position, given that index.id can be
> zero. Alternatively, initialize index id to -1, assuming we'll never
> get to ~0U index.



[Index of Archives]     [Netfitler Users]     [Berkeley Packet Filter]     [LARTC]     [Bugtraq]     [Yosemite Forum]

  Powered by Linux