Skip to contentSkip to conversation

mm: fix vma->anon_name memory leak for anonymous shmem VMAs

PATCH Superseded Suren Baghdasaryan 2 participants 6 messages Dec 28, 2022 – Jan 5, 2023

Subsystems (4)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Suren Baghdasaryan

author reviewer
#0 lore raw

PATCH 1/1 mm: fix vma->anon_name memory leak for anonymous shmem VMAs

free_anon_vma_name() is missing a check for anonymous shmem VMA which leads to a memory leak due to refcount not being dropped. Fix this by adding the missing check.

Fixes d09e8ca6cb93 ("mm: anonymous shared memory naming")
Reported-by [email protected]
---
 include/linux/mm_inline.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/mm_inline.h +1 -1
index e8ed225d8f7c..d650ca2c5d29 100644
@@ -413,7 +413,7 @@ static inline void free_anon_vma_name(struct vm_area_struct *vma)
 	 * Not using anon_vma_name because it generates a warning if mmap_lock
 	 * is not held, which might be the case here.
 	 */
-	if (!vma->vm_file)
+	if (!vma->vm_file || vma_is_anon_shmem(vma))
 		anon_vma_name_put(vma->anon_name);
 }
 
Signature · 1 line
2.39.0.314.g84b9a713c41-goog
#1 lore raw
Quoted 16 lines · Suren Baghdasaryan

free_anon_vma_name() is missing a check for anonymous shmem VMA which leads to a memory leak due to refcount not being dropped. Fix this by adding the missing check.

Fixes d09e8ca6cb93 ("mm: anonymous shared memory naming")
Reported-by [email protected]
---
  include/linux/mm_inline.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/mm_inline.h +0 -0
index e8ed225d8f7c..d650ca2c5d29 100644

include/linux/mm_inline.h static inline void free_anon_vma_name(struct vm_area_struct *vma) · line 417

Quoted 6 lines
include/linux/mm_inline.h +1 -1
@@ -413,7 +413,7 @@ static inline void free_anon_vma_name(struct vm_area_struct *vma)
  	 * Not using anon_vma_name because it generates a warning if mmap_lock
  	 * is not held, which might be the case here.
  	 */
-	if (!vma->vm_file)
+	if (!vma->vm_file || vma_is_anon_shmem(vma))
  		anon_vma_name_put(vma->anon_name);

Wouldn't it be me more consistent to check for "vma->anon_name"?

That's what dup_anon_vma_name() checks. And it's safe now because anon_name is no longer overloaded in vm_area_struct.

Signature · 3 lines
Thanks,

David / dhildenb
author reviewer
#2 lore raw
Quoted 27 lines · David Hildenbrand
Quoted 16 lines · Suren Baghdasaryan

free_anon_vma_name() is missing a check for anonymous shmem VMA which leads to a memory leak due to refcount not being dropped. Fix this by adding the missing check.

Fixes d09e8ca6cb93 ("mm: anonymous shared memory naming")
Reported-by [email protected]
---
  include/linux/mm_inline.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/mm_inline.h +0 -0
index e8ed225d8f7c..d650ca2c5d29 100644

include/linux/mm_inline.h static inline void free_anon_vma_name(struct vm_area_struct *vma) · line 417

Quoted 6 lines
include/linux/mm_inline.h +1 -1
@@ -413,7 +413,7 @@ static inline void free_anon_vma_name(struct vm_area_struct *vma)
       * Not using anon_vma_name because it generates a warning if mmap_lock
       * is not held, which might be the case here.
       */
-     if (!vma->vm_file)
+     if (!vma->vm_file || vma_is_anon_shmem(vma))
              anon_vma_name_put(vma->anon_name);

Wouldn't it be me more consistent to check for "vma->anon_name"?

Quoted 2 lines

That's what dup_anon_vma_name() checks. And it's safe now because anon_name is no longer overloaded in vm_area_struct.

Thanks for the suggestion, David. Yes, with the recent change that does not overload anon_name, checking for "vma->anon_name" would be simpler. I think we can also drop anon_vma_name() function now
(https://elixir.bootlin.com/linux/v6.2-rc2/source/mm/madvise.c#L94)
since vma->anon_name does not depend on vma->vm_file anymore, remove the last part of this comment:
https://elixir.bootlin.com/linux/v6.2-rc2/source/include/linux/mm_types.h#L584
and use vma->anon_name directly going forward. If all that sounds good, I'll post a separate patch implementing all these changes. So, for this patch I would suggest keeping it as is because functionally it is correct and will change this check along with other corrections I mentioned above in a separate patch. Does that sound good?

- if (!vma->vm_file)
+ if (!vma->vm_file || vma_is_anon_shmem(vma))

Quoted 6 lines

--
Thanks,

David / dhildenb

#3 lore raw
Quoted 31 lines · Suren Baghdasaryan
Quoted 27 lines · David Hildenbrand
Quoted 16 lines · Suren Baghdasaryan

free_anon_vma_name() is missing a check for anonymous shmem VMA which leads to a memory leak due to refcount not being dropped. Fix this by adding the missing check.

Fixes d09e8ca6cb93 ("mm: anonymous shared memory naming")
Reported-by [email protected]
---
   include/linux/mm_inline.h | 2 +-
   1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/mm_inline.h +0 -0
index e8ed225d8f7c..d650ca2c5d29 100644

include/linux/mm_inline.h static inline void free_anon_vma_name(struct vm_area_struct *vma) · line 417

Quoted 6 lines
include/linux/mm_inline.h +1 -1
@@ -413,7 +413,7 @@ static inline void free_anon_vma_name(struct vm_area_struct *vma)
        * Not using anon_vma_name because it generates a warning if mmap_lock
        * is not held, which might be the case here.
        */
-     if (!vma->vm_file)
+     if (!vma->vm_file || vma_is_anon_shmem(vma))
               anon_vma_name_put(vma->anon_name);

Wouldn't it be me more consistent to check for "vma->anon_name"?

Quoted 2 lines

That's what dup_anon_vma_name() checks. And it's safe now because anon_name is no longer overloaded in vm_area_struct.

Quoted 13 lines

Thanks for the suggestion, David. Yes, with the recent change that does not overload anon_name, checking for "vma->anon_name" would be simpler. I think we can also drop anon_vma_name() function now
(https://elixir.bootlin.com/linux/v6.2-rc2/source/mm/madvise.c#L94)
since vma->anon_name does not depend on vma->vm_file anymore, remove the last part of this comment:
https://elixir.bootlin.com/linux/v6.2-rc2/source/include/linux/mm_types.h#L584
and use vma->anon_name directly going forward. If all that sounds good, I'll post a separate patch implementing all these changes. So, for this patch I would suggest keeping it as is because functionally it is correct and will change this check along with other corrections I mentioned above in a separate patch. Does that sound good?

Works for me.

for this one, as it fixes the issue.

Signature · 3 lines
Thanks,

David / dhildenb
author reviewer
#4 lore raw
Quoted 47 lines · David Hildenbrand
Quoted 31 lines · Suren Baghdasaryan
Quoted 27 lines · David Hildenbrand
Quoted 16 lines · Suren Baghdasaryan

free_anon_vma_name() is missing a check for anonymous shmem VMA which leads to a memory leak due to refcount not being dropped. Fix this by adding the missing check.

Fixes d09e8ca6cb93 ("mm: anonymous shared memory naming")
Reported-by [email protected]
---
   include/linux/mm_inline.h | 2 +-
   1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/mm_inline.h +0 -0
index e8ed225d8f7c..d650ca2c5d29 100644

include/linux/mm_inline.h static inline void free_anon_vma_name(struct vm_area_struct *vma) · line 417

Quoted 6 lines
include/linux/mm_inline.h +1 -1
@@ -413,7 +413,7 @@ static inline void free_anon_vma_name(struct vm_area_struct *vma)
        * Not using anon_vma_name because it generates a warning if mmap_lock
        * is not held, which might be the case here.
        */
-     if (!vma->vm_file)
+     if (!vma->vm_file || vma_is_anon_shmem(vma))
               anon_vma_name_put(vma->anon_name);

Wouldn't it be me more consistent to check for "vma->anon_name"?

Quoted 2 lines

That's what dup_anon_vma_name() checks. And it's safe now because anon_name is no longer overloaded in vm_area_struct.

Quoted 13 lines

Thanks for the suggestion, David. Yes, with the recent change that does not overload anon_name, checking for "vma->anon_name" would be simpler. I think we can also drop anon_vma_name() function now
(https://elixir.bootlin.com/linux/v6.2-rc2/source/mm/madvise.c#L94)
since vma->anon_name does not depend on vma->vm_file anymore, remove the last part of this comment:
https://elixir.bootlin.com/linux/v6.2-rc2/source/include/linux/mm_types.h#L584
and use vma->anon_name directly going forward. If all that sounds good, I'll post a separate patch implementing all these changes. So, for this patch I would suggest keeping it as is because functionally it is correct and will change this check along with other corrections I mentioned above in a separate patch. Does that sound good?

Quoted 3 lines

Works for me.

Thank you! Will post the followup cleanup patch shorly.

Quoted 8 lines

for this one, as it fixes the issue.

--
Thanks,

David / dhildenb

author reviewer
#5 lore raw
Quoted 49 lines · Suren Baghdasaryan
Quoted 47 lines · David Hildenbrand
Quoted 44 lines · Suren Baghdasaryan
Quoted 27 lines · David Hildenbrand
Quoted 16 lines · Suren Baghdasaryan

free_anon_vma_name() is missing a check for anonymous shmem VMA which leads to a memory leak due to refcount not being dropped. Fix this by adding the missing check.

Fixes d09e8ca6cb93 ("mm: anonymous shared memory naming")
Reported-by [email protected]
---
   include/linux/mm_inline.h | 2 +-
   1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/mm_inline.h +0 -0
index e8ed225d8f7c..d650ca2c5d29 100644

include/linux/mm_inline.h static inline void free_anon_vma_name(struct vm_area_struct *vma) · line 417

Quoted 6 lines
include/linux/mm_inline.h +1 -1
@@ -413,7 +413,7 @@ static inline void free_anon_vma_name(struct vm_area_struct *vma)
        * Not using anon_vma_name because it generates a warning if mmap_lock
        * is not held, which might be the case here.
        */
-     if (!vma->vm_file)
+     if (!vma->vm_file || vma_is_anon_shmem(vma))
               anon_vma_name_put(vma->anon_name);

Wouldn't it be me more consistent to check for "vma->anon_name"?

Quoted 2 lines

That's what dup_anon_vma_name() checks. And it's safe now because anon_name is no longer overloaded in vm_area_struct.

Thanks for the suggestion, David. Yes, with the recent change that does not overload anon_name, checking for "vma->anon_name" would be simpler. I think we can also drop anon_vma_name() function now
(https://elixir.bootlin.com/linux/v6.2-rc2/source/mm/madvise.c#L94)
since vma->anon_name does not depend on vma->vm_file anymore, remove the last part of this comment:
https://elixir.bootlin.com/linux/v6.2-rc2/source/include/linux/mm_types.h#L584
and use vma->anon_name directly going forward. If all that sounds good, I'll post a separate patch implementing all these changes. So, for this patch I would suggest keeping it as is because functionally it is correct and will change this check along with other corrections I mentioned above in a separate patch. Does that sound good?

Quoted 5 lines
Quoted 3 lines

Works for me.

Thank you! Will post the followup cleanup patch shorly.

Andrew, I posted v2 of this patch at
https://lore.kernel.org/all/[email protected]/.
Please replace the original one in your tree. I had to follow David's original suggestion instead of my planned cleanup because removing anon_vma_name() would require us to add #ifdef CONFIG_ANON_VMA_NAME everywhere we use vma->anon_name, which is quite ugly. Thanks,
Suren.

Quoted 9 lines
Quoted 9 lines

for this one, as it fixes the issue.

--
Thanks,

David / dhildenb