From: Pablo Neira Ayuso Date: Tue, 15 Dec 2020 14:38:30 +0000 Subject: Re: [PATCH][next] netfilter: nftables: fix incorrect increment of loop counter Message-Id: <20201215143830.GA10086@salvia> List-Id: References: <20201214234015.85072-1-colin.king@canonical.com> In-Reply-To: <20201214234015.85072-1-colin.king@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Colin King Cc: Jozsef Kadlecsik , Florian Westphal , "David S . Miller" , Jakub Kicinski , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Hi, On Mon, Dec 14, 2020 at 11:40:15PM +0000, Colin King wrote: > From: Colin Ian King > > The intention of the err_expr cleanup path is to iterate over the > allocated expr_array objects and free them, starting from i - 1 and > working down to the start of the array. Currently the loop counter > is being incremented instead of decremented and also the index i is > being used instead of k, repeatedly destroying the same expr_array > element. Fix this by decrementing k and using k as the index into > expr_array. > > Addresses-Coverity: ("Infinite loop") > Fixes: 8cfd9b0f8515 ("netfilter: nftables: generalize set expressions support") > Signed-off-by: Colin Ian King Reviewed-by: Pablo Neira Ayuso @Jakub: Would you please take this one into net-next? Thanks! > --- > net/netfilter/nf_tables_api.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c > index 8d5aa0ac45f4..4186b1e52d58 100644 > --- a/net/netfilter/nf_tables_api.c > +++ b/net/netfilter/nf_tables_api.c > @@ -5254,8 +5254,8 @@ static int nft_set_elem_expr_clone(const struct nft_ctx *ctx, > return 0; > > err_expr: > - for (k = i - 1; k >= 0; k++) > - nft_expr_destroy(ctx, expr_array[i]); > + for (k = i - 1; k >= 0; k--) > + nft_expr_destroy(ctx, expr_array[k]); > > return -ENOMEM; > } > -- > 2.29.2 >