[Devel] [PATCH RHEL COMMIT] netfilter/x_tables: account entry offsets allocations

[Konstantin Khorenko]

The commit is pushed to "branch-rh9-5.14.vz9.1.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after ark-5.14
------>
commit 77ec2bfa8753b9767cd852ae87109a8f6adc955d
Author: Vasily Averin <vvs at virtuozzo.com>
Date:   Tue Sep 28 14:16:28 2021 +0300

    netfilter/x_tables: account entry offsets allocations
    
    Entry offsets may consume a lot of kernel memory. So let's account
    them.
    
    https://jira.sw.ru/browse/PSBM-54407
    
    Signed-off-by: Andrey Ryabinin <aryabinin at virtuozzo.com>
    
    (cherry picked from vz7 commit 56c0d7d5cc4b ("netfilter/x_tables: account
    entry offsets allocations"))
    
    VZ 8 rebase part https://jira.sw.ru/browse/PSBM-127783
    
    Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn at virtuozzo.com>
    
    VvS: rh9 rebase.
    (cherry picked from commit 563cb8c18fb3cd6007a219ccc4020bd338f52208)
    https://jira.sw.ru/browse/PSBM-133990
    Signed-off-by: Vasily Averin <vvs at virtuozzo.com>
---
 net/netfilter/x_tables.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index 4c8fe717d880..52e755718c69 100644
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -951,8 +951,7 @@ unsigned int *xt_alloc_entry_offsets(unsigned int size)
 	if (size > XT_MAX_TABLE_SIZE / sizeof(unsigned int))
 		return NULL;
 
-	return kvcalloc(size, sizeof(unsigned int), GFP_KERNEL);
-
+	return kvcalloc(size, sizeof(unsigned int), GFP_KERNEL_ACCOUNT);
 }
 EXPORT_SYMBOL(xt_alloc_entry_offsets);