diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-21 17:48:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-21 17:48:45 -0400 |
commit | 95faf6992df468f617edb788da8c21c6eed0dfa7 (patch) | |
tree | 121683c4e94117b9e41d31b0bc359c01a05412ba /kernel/fork.c | |
parent | 3928d4f5ee37cdc523894f6e549e6aae521d8980 (diff) |
mm: make vm_area_dup() actually copy the old vma data
.. and re-initialize th eanon_vma_chain head.
This removes some boiler-plate from the users, and also makes it clear
why it didn't need use the 'zalloc()' version.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/fork.c')
-rw-r--r-- | kernel/fork.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 0e23deb5acfc..67253e41bfb0 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -315,7 +315,13 @@ struct vm_area_struct *vm_area_alloc(void) | |||
315 | 315 | ||
316 | struct vm_area_struct *vm_area_dup(struct vm_area_struct *orig) | 316 | struct vm_area_struct *vm_area_dup(struct vm_area_struct *orig) |
317 | { | 317 | { |
318 | return kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); | 318 | struct vm_area_struct *new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); |
319 | |||
320 | if (new) { | ||
321 | *new = *orig; | ||
322 | INIT_LIST_HEAD(&new->anon_vma_chain); | ||
323 | } | ||
324 | return new; | ||
319 | } | 325 | } |
320 | 326 | ||
321 | void vm_area_free(struct vm_area_struct *vma) | 327 | void vm_area_free(struct vm_area_struct *vma) |
@@ -473,8 +479,6 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, | |||
473 | tmp = vm_area_dup(mpnt); | 479 | tmp = vm_area_dup(mpnt); |
474 | if (!tmp) | 480 | if (!tmp) |
475 | goto fail_nomem; | 481 | goto fail_nomem; |
476 | *tmp = *mpnt; | ||
477 | INIT_LIST_HEAD(&tmp->anon_vma_chain); | ||
478 | retval = vma_dup_policy(mpnt, tmp); | 482 | retval = vma_dup_policy(mpnt, tmp); |
479 | if (retval) | 483 | if (retval) |
480 | goto fail_nomem_policy; | 484 | goto fail_nomem_policy; |