anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: fix merge issue in binder_alloc_set_vma()

Browse Source 
Upstream commit 81203ab7a6 ("binder: fix alloc->vma_vm_mm null-ptr
dereference") relocated the caching of alloc->vma_vm_mm to be done
during open(). This patch conflicted with local commit 0882368e61
("Revert "android: binder: stop saving a pointer to the VMA"").

During the merge resolution the old assignment of alloc->vma_vm_mm
during binder_alloc_set_vma() was incorrectly left in. This shouldn't
have any implications as we check that the vma->vm_mm is the same as
current->mm. However, let's remove it for completeness.

Cc: Greg Kroah-Hartman <gregkh@google.com>
Fixes: affdbc37bd ("Merge 5.15.66 into android13-5.15-lts")
Change-Id: Iea985b4f577fab71d15429fc2567b110d8174394
Signed-off-by: Carlos Llamas <cmllamas@google.com>
This commit is contained in:
Carlos Llamas
2023-05-17 16:39:05 +00:00
parent adaabe3996
commit 43b43053a4
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/android/binder_alloc.c
View File

@@ -314,8 +314,6 @@ err_no_vma:
static inline void binder_alloc_set_vma(struct binder_alloc *alloc,
struct vm_area_struct *vma)
{
if (vma)
alloc->vma_vm_mm = vma->vm_mm;
/*
* If we see alloc->vma is not NULL, buffer data structures set up
* completely. Look at smp_rmb side binder_alloc_get_vma.