netfilter: expect: fix crash when putting uninited expectation

[mirror_ubuntu-artful-kernel.git] / kernel / fork.c

diff --git a/kernel/fork.c b/kernel/fork.c
index e53770d2bf956bf5bf6ec1a42c75121552713da6..0f69a3e5281effb9185a71bd5f4fcd79f58a6140 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -326,8 +326,8 @@ static void account_kernel_stack(struct task_struct *tsk, int account)
                }
 
                /* All stack pages belong to the same memcg. */
-               memcg_kmem_update_page_stat(vm->pages[0], MEMCG_KERNEL_STACK_KB,
-                                           account * (THREAD_SIZE / 1024));
+               mod_memcg_page_state(vm->pages[0], MEMCG_KERNEL_STACK_KB,
+                                    account * (THREAD_SIZE / 1024));
        } else {
                /*
                 * All stack pages are in the same zone and belong to the
@@ -338,8 +338,8 @@ static void account_kernel_stack(struct task_struct *tsk, int account)
                mod_zone_page_state(page_zone(first_page), NR_KERNEL_STACK_KB,
                                    THREAD_SIZE / 1024 * account);
 
-               memcg_kmem_update_page_stat(first_page, MEMCG_KERNEL_STACK_KB,
-                                           account * (THREAD_SIZE / 1024));
+               mod_memcg_page_state(first_page, MEMCG_KERNEL_STACK_KB,
+                                    account * (THREAD_SIZE / 1024));
        }
 }
 
@@ -1637,9 +1637,9 @@ static __latent_entropy struct task_struct *copy_process(
        prev_cputime_init(&p->prev_cputime);
 
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN
-       seqcount_init(&p->vtime_seqcount);
-       p->vtime_snap = 0;
-       p->vtime_snap_whence = VTIME_INACTIVE;
+       seqcount_init(&p->vtime.seqcount);
+       p->vtime.starttime = 0;
+       p->vtime.state = VTIME_INACTIVE;
 #endif
 
 #if defined(SPLIT_RSS_COUNTING)