Hello!
On 11/28/2018 01:17 PM, Pablo Neira Ayuso wrote:
> From: Taehee Yoo <ap420073@xxxxxxxxx>
>
> In the htable_create(), hinfo is allocated by vmalloc()
> So that if error occurred, hinfo should be freed.
>
> Fixes: 11d5f15723c9 ("netfilter: xt_hashlimit: Create revision 2 to support higher pps rates")
> Signed-off-by: Taehee Yoo <ap420073@xxxxxxxxx>
> Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
> ---
> net/netfilter/xt_hashlimit.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
> index 3e7d259e5d8d..1ad4017f9b73 100644
> --- a/net/netfilter/xt_hashlimit.c
> +++ b/net/netfilter/xt_hashlimit.c
> @@ -295,9 +295,10 @@ static int htable_create(struct net *net, struct hashlimit_cfg3 *cfg,
>
> /* copy match config into hashtable config */
> ret = cfg_copy(&hinfo->cfg, (void *)cfg, 3);
> -
> - if (ret)
> + if (ret) {
> + vfree(hinfo);
> return ret;
> + }
>
> hinfo->cfg.size = size;
> if (hinfo->cfg.max == 0)
The next 4 hunks are half-related whitespace noise.
> @@ -814,7 +815,6 @@ hashlimit_mt_v1(const struct sk_buff *skb, struct xt_action_param *par)
> int ret;
>
> ret = cfg_copy(&cfg, (void *)&info->cfg, 1);
> -
> if (ret)
> return ret;
>
> @@ -830,7 +830,6 @@ hashlimit_mt_v2(const struct sk_buff *skb, struct xt_action_param *par)
> int ret;
>
> ret = cfg_copy(&cfg, (void *)&info->cfg, 2);
> -
> if (ret)
> return ret;
>
> @@ -921,7 +920,6 @@ static int hashlimit_mt_check_v1(const struct xt_mtchk_param *par)
> return ret;
>
> ret = cfg_copy(&cfg, (void *)&info->cfg, 1);
> -
> if (ret)
> return ret;
>
> @@ -940,7 +938,6 @@ static int hashlimit_mt_check_v2(const struct xt_mtchk_param *par)
> return ret;
>
> ret = cfg_copy(&cfg, (void *)&info->cfg, 2);
> -
> if (ret)
> return ret;
>
MBR, Sergei
