mm: Fix UAF when anon vma name is used after vma is freed
Subsystems (3)
Suren Baghdasaryan
reviewerPATCH 1/1 mm: Fix UAF when anon vma name is used after vma is freed
When adjacent vmas are being merged it can result in the vma that was originally passed to madvise_update_vma being destroyed. In the current implementation, the name parameter passed to madvise_update_vma points directly to vma->anon_name->name and it is used after the call to vma_merge. In the cases when vma_merge merges the original vma and destroys it, this will result in use-after-free bug as shown below:
madvise_vma_behavior << passes vma->anon_name->name as name param
madvise_update_vma(name)
vma_merge
__vma_adjust
vm_area_free <-- frees the vma
replace_vma_anon_name(name) <-- UAF
Fix this by passing madvise_update_vma a copy of the name.
--- include/linux/mm.h | 2 ++ kernel/sys.c | 1 - mm/madvise.c | 14 +++++++++++++- 3 files changed, 15 insertions(+), 2 deletions(-)
include/linux/mm.h +2 -0
@@ -3370,6 +3370,8 @@ static inline int seal_check_future_write(int seals, struct vm_area_struct *vma)return 0 ; } +#define ANON_VMA_NAME_MAX_LEN 80 +#ifdef CONFIG_ANON_VMA_NAME int madvise_set_anon_name (struct mm_struct *mm,unsigned long start,unsigned long len_in,const char *name);
kernel/sys.c +0 -1
@@ -2263,7 +2263,6 @@ int __weak arch_prctl_spec_ctrl_set(struct task_struct *t, unsigned long which,#ifdef CONFIG_ANON_VMA_NAME -#define ANON_VMA_NAME_MAX_LEN 80#define ANON_VMA_NAME_INVALID_CHARS "\\`$[]"static inline bool is_valid_name_char (char ch)
mm/madvise.c +13 -1
@@ -976,6 +976,8 @@ static int madvise_vma_behavior(struct vm_area_struct *vma, {int error;unsigned long new_flags = vma->vm_flags; +char name_buf[ANON_VMA_NAME_MAX_LEN ]; +const char *anon_name;switch (behavior) {case MADV_REMOVE :
@@ -1040,8 +1042,18 @@ static int madvise_vma_behavior(struct vm_area_struct *vma,break ; } + anon_name =vma_anon_name (vma); +if (anon_name) { +/* +* Make a copy of the name because vma might be destroyed when +* merged with another one and the name parameter might be used +* after that. +*/ +strcpy (name_buf, anon_name); + anon_name = name_buf; + } error =madvise_update_vma (vma, prev, start, end, new_flags, -vma_anon_name (vma)); + anon_name); out:/*
Signature · 1 line
2.35.0.263.gb82422642f-goog
Andrew Morton
maintainerQuoted 48 lines · On Wed, 9 Feb 2022 16:18:01 -0800 Suren Baghdasaryan <[email protected]> wrote:
When adjacent vmas are being merged it can result in the vma that was originally passed to
madvise_update_vmabeing destroyed. In the current implementation, the name parameter passed tomadvise_update_vmapoints directly tovma->anon_name->nameand it is used after the call tovma_merge. In the cases whenvma_mergemerges the original vma and destroys it, this will result in use-after-free bug as shown below:
madvise_vma_behavior<< passesvma->anon_name->nameas name param
madvise_update_vma(name)
vma_merge
__vma_adjust
vm_area_free<-- frees the vma
replace_vma_anon_name(name)<-- UAFFix this by passing
madvise_update_vmaa copy of the name....
kernel/sys.c +0
-1@@ -2263,7 +2263,6 @@ int __weak arch_prctl_spec_ctrl_set(struct task_struct *t, unsigned long which,#ifdef CONFIG_ANON_VMA_NAME -#define ANON_VMA_NAME_MAX_LEN 80#define ANON_VMA_NAME_INVALID_CHARS "\\`$[]"static inline bool is_valid_name_char (char ch)mm/madvise.c +5
-0@@ -976,6 +976,8 @@ static int madvise_vma_behavior(struct vm_area_struct *vma, {int error;unsigned long new_flags = vma->vm_flags; +char name_buf[ANON_VMA_NAME_MAX_LEN ]; +const char *anon_name;switch (behavior) {case MADV_REMOVE :@@ -1040,8 +1042,18 @@ static int madvise_vma_behavior(struct vm_area_struct *vma,break ; } + anon_name =vma_anon_name (vma); +if (anon_name) { +/*
mm/madvise.c static int madvise_vma_behavior(struct vm_area_struct *vma, · line 1056
Quoted 10 lines
mm/madvise.c +8
-1+* Make a copy of the name because vma might be destroyed when +* merged with another one and the name parameter might be used +* after that. +*/ +strcpy (name_buf, anon_name); + anon_name = name_buf; + } error =madvise_update_vma (vma, prev, start, end, new_flags, -vma_anon_name (vma)); + anon_name);
anon_name is refcounted. Why not use kref_get()/kref_put() instead of taking a copy?
Suren Baghdasaryan
reviewerQuoted 48 lines · Andrew Morton
Quoted 45 lines · On Wed, 9 Feb 2022 16:18:01 -0800 Suren Baghdasaryan <[email protected]> wrote:
When adjacent vmas are being merged it can result in the vma that was originally passed to
madvise_update_vmabeing destroyed. In the current implementation, the name parameter passed tomadvise_update_vmapoints directly tovma->anon_name->nameand it is used after the call tovma_merge. In the cases whenvma_mergemerges the original vma and destroys it, this will result in use-after-free bug as shown below:
madvise_vma_behavior<< passesvma->anon_name->nameas name param
madvise_update_vma(name)
vma_merge
__vma_adjust
vm_area_free<-- frees the vma
replace_vma_anon_name(name)<-- UAFFix this by passing
madvise_update_vmaa copy of the name....
kernel/sys.c +0
-1@@ -2263,7 +2263,6 @@ int __weak arch_prctl_spec_ctrl_set(struct task_struct *t, unsigned long which,#ifdef CONFIG_ANON_VMA_NAME -#define ANON_VMA_NAME_MAX_LEN 80#define ANON_VMA_NAME_INVALID_CHARS "\\`$[]"static inline bool is_valid_name_char (char ch)mm/madvise.c +2
-0@@ -976,6 +976,8 @@ static int madvise_vma_behavior(struct vm_area_struct *vma, {int error;unsigned long new_flags = vma->vm_flags; +char name_buf[ANON_VMA_NAME_MAX_LEN ]; +const char *anon_name;switch (behavior) {case MADV_REMOVE :@@ -1040,8 +1042,18 @@ static int madvise_vma_behavior(struct vm_area_struct *vma,break ; }
Quoted 16 lines
mm/madvise.c static int madvise_vma_behavior(struct vm_area_struct *vma, · line 1056
Quoted 13 lines
mm/madvise.c +11
-1+ anon_name =vma_anon_name (vma); +if (anon_name) { +/* +* Make a copy of the name because vma might be destroyed when +* merged with another one and the name parameter might be used +* after that. +*/ +strcpy (name_buf, anon_name); + anon_name = name_buf; + } error =madvise_update_vma (vma, prev, start, end, new_flags, -vma_anon_name (vma)); + anon_name);
anon_nameis refcounted. Why not use kref_get()/kref_put() instead of taking a copy?
Yes, I considered that. It would require new get/put APIs for anon_name and I thought I better keep it simple. This path is used only by madvise() syscall, so the copy overhead should not be critical. But if you think refcounting is more appropriate here I'll happily rework it. It should still be quite simple. Please let me know.
Quoted 1 line
Suren Baghdasaryan
reviewer. .
Quoted 67 lines · Suren Baghdasaryan
Quoted 48 lines · Andrew Morton
Quoted 45 lines · On Wed, 9 Feb 2022 16:18:01 -0800 Suren Baghdasaryan <[email protected]> wrote:
When adjacent vmas are being merged it can result in the vma that was originally passed to
madvise_update_vmabeing destroyed. In the current implementation, the name parameter passed tomadvise_update_vmapoints directly tovma->anon_name->nameand it is used after the call tovma_merge. In the cases whenvma_mergemerges the original vma and destroys it, this will result in use-after-free bug as shown below:
madvise_vma_behavior<< passesvma->anon_name->nameas name param
madvise_update_vma(name)
vma_merge
__vma_adjust
vm_area_free<-- frees the vma
replace_vma_anon_name(name)<-- UAFFix this by passing
madvise_update_vmaa copy of the name....
kernel/sys.c +0
-1@@ -2263,7 +2263,6 @@ int __weak arch_prctl_spec_ctrl_set(struct task_struct *t, unsigned long which,#ifdef CONFIG_ANON_VMA_NAME -#define ANON_VMA_NAME_MAX_LEN 80#define ANON_VMA_NAME_INVALID_CHARS "\\`$[]"static inline bool is_valid_name_char (char ch)mm/madvise.c +2
-0@@ -976,6 +976,8 @@ static int madvise_vma_behavior(struct vm_area_struct *vma, {int error;unsigned long new_flags = vma->vm_flags; +char name_buf[ANON_VMA_NAME_MAX_LEN ]; +const char *anon_name;switch (behavior) {case MADV_REMOVE :@@ -1040,8 +1042,18 @@ static int madvise_vma_behavior(struct vm_area_struct *vma,break ; }Quoted 16 lines
mm/madvise.c static int madvise_vma_behavior(struct vm_area_struct *vma, · line 1056
Quoted 13 lines
mm/madvise.c +11
-1+ anon_name =vma_anon_name (vma); +if (anon_name) { +/* +* Make a copy of the name because vma might be destroyed when +* merged with another one and the name parameter might be used +* after that. +*/ +strcpy (name_buf, anon_name); + anon_name = name_buf; + } error =madvise_update_vma (vma, prev, start, end, new_flags, -vma_anon_name (vma)); + anon_name);
anon_nameis refcounted. Why not use kref_get()/kref_put() instead of taking a copy?
Quoted 6 lines
Yes, I considered that. It would require new get/put APIs for
anon_nameand I thought I better keep it simple. This path is used only bymadvise()syscall, so the copy overhead should not be critical. But if you think refcounting is more appropriate here I'll happily rework it. It should still be quite simple. Please let me know.
On second thought, we might have more places in the future we need to stabilize anon_name, so put/get API can be useful. After prototyping the refcounting approach it looks simple enough to use instead of copying. Let me test it a bit and I'll post a replacement patch for this one tomorrow.
Thanks,
Suren.
Quoted 2 lines
Quoted 2 lines
Suren Baghdasaryan
reviewerQuoted 78 lines · Suren Baghdasaryan
. .
Quoted 67 lines · Suren Baghdasaryan
Quoted 48 lines · Andrew Morton
Quoted 45 lines · On Wed, 9 Feb 2022 16:18:01 -0800 Suren Baghdasaryan <[email protected]> wrote:
When adjacent vmas are being merged it can result in the vma that was originally passed to
madvise_update_vmabeing destroyed. In the current implementation, the name parameter passed tomadvise_update_vmapoints directly tovma->anon_name->nameand it is used after the call tovma_merge. In the cases whenvma_mergemerges the original vma and destroys it, this will result in use-after-free bug as shown below:
madvise_vma_behavior<< passesvma->anon_name->nameas name param
madvise_update_vma(name)
vma_merge
__vma_adjust
vm_area_free<-- frees the vma
replace_vma_anon_name(name)<-- UAFFix this by passing
madvise_update_vmaa copy of the name....
kernel/sys.c +0
-1@@ -2263,7 +2263,6 @@ int __weak arch_prctl_spec_ctrl_set(struct task_struct *t, unsigned long which,#ifdef CONFIG_ANON_VMA_NAME -#define ANON_VMA_NAME_MAX_LEN 80#define ANON_VMA_NAME_INVALID_CHARS "\\`$[]"static inline bool is_valid_name_char (char ch)mm/madvise.c +2
-0@@ -976,6 +976,8 @@ static int madvise_vma_behavior(struct vm_area_struct *vma, {int error;unsigned long new_flags = vma->vm_flags; +char name_buf[ANON_VMA_NAME_MAX_LEN ]; +const char *anon_name;switch (behavior) {case MADV_REMOVE :@@ -1040,8 +1042,18 @@ static int madvise_vma_behavior(struct vm_area_struct *vma,break ; }Quoted 16 lines
mm/madvise.c static int madvise_vma_behavior(struct vm_area_struct *vma, · line 1056
Quoted 13 lines
mm/madvise.c +11
-1+ anon_name =vma_anon_name (vma); +if (anon_name) { +/* +* Make a copy of the name because vma might be destroyed when +* merged with another one and the name parameter might be used +* after that. +*/ +strcpy (name_buf, anon_name); + anon_name = name_buf; + } error =madvise_update_vma (vma, prev, start, end, new_flags, -vma_anon_name (vma)); + anon_name);
anon_nameis refcounted. Why not use kref_get()/kref_put() instead of taking a copy?Quoted 6 lines
Yes, I considered that. It would require new get/put APIs for
anon_nameand I thought I better keep it simple. This path is used only bymadvise()syscall, so the copy overhead should not be critical. But if you think refcounting is more appropriate here I'll happily rework it. It should still be quite simple. Please let me know.
Quoted 5 lines
On second thought, we might have more places in the future we need to stabilize
anon_name, so put/get API can be useful. After prototyping the refcounting approach it looks simple enough to use instead of copying. Let me test it a bit and I'll post a replacement patch for this one tomorrow.
Had some time to test and the patch seems stable. The refcounting version is posted at:
https://lore.kernel.org/all/[email protected]/
Thanks!
Quoted 5 lines
Thanks,
Suren.Quoted 2 lines
Quoted 2 lines