binder: Address corner cases in deferred copy and fixup
PATCH 1/1 binder: Address corner cases in deferred copy and fixup
When handling BINDER_TYPE_FDA object we are pushing a parent fixup with a certain skip_size but no scatter-gather copy object, since the copy is handled standalone.
If BINDER_TYPE_FDA is the last children the scatter-gather copy loop will never stop to skip it, thus we are left with an item in the parent fixup list. This will trigger the BUG_ON().
Furthermore, it is possible to receive BINDER_TYPE_FDA object with num_fds=0 which will confuse the scatter-gather code.
In the android userspace I could only find these usecases in the libstagefright OMX implementation, so it might be that they're doing something very weird, but nonetheless the kernel should not panic about it.
--- drivers/android/binder.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/android/binder.c +9 -2
@@ -2295,7 +2295,7 @@ static int binder_do_deferred_txn_copies(struct binder_alloc *alloc, {int ret =0 ;struct binder_sg_copy *sgc, *tmpsgc; -struct binder_ptr_fixup *pf = +struct binder_ptr_fixup *tmppf, *pf = list_first_entry_or_null(pf_head, struct binder_ptr_fixup, node);
@@ -2349,7 +2349,11 @@ static int binder_do_deferred_txn_copies(struct binder_alloc *alloc,list_del (&sgc->node);kfree (sgc); } -BUG_ON (!list_empty (pf_head)); +list_for_each_entry_safe (pf, tmppf, pf_head, node) { +BUG_ON (pf->skip_size ==0 ); +list_del (&pf->node); +kfree (pf); + }BUG_ON (!list_empty (sgc_head));return ret >0 ? -EINVAL : ret;
@@ -2486,6 +2490,9 @@ static int binder_translate_fd_array(struct list_head *pf_head,struct binder_proc *proc = thread->proc;int ret; +if (fda->num_fds ==0 ) +return 0 ; + fd_buf_size =sizeof (u32) * fda->num_fds;if (fda->num_fds >=SIZE_MAX /sizeof (u32)) { binder_user_error("%d:%d got transaction with invalid number of fds (%lld)\n",
Signature · 1 line
2.35.1
Greg KH
maintainerQuoted 26 lines · Alessandro Astone
When handling
BINDER_TYPE_FDAobject we are pushing a parent fixup with a certainskip_sizebut no scatter-gather copy object, since the copy is handled standalone.
IfBINDER_TYPE_FDAis the last children the scatter-gather copy loop will never stop to skip it, thus we are left with an item in the parent fixup list. This will trigger theBUG_ON().Furthermore, it is possible to receive
BINDER_TYPE_FDAobject with num_fds=0 which will confuse the scatter-gather code.In the android userspace I could only find these usecases in the libstagefright OMX implementation, so it might be that they're doing something very weird, but nonetheless the kernel should not panic about it.
Fixes 09184ae9b575 ("binder: defer copies of pre-patched txn data")Signed-off-by Alessandro Astone <[email protected]>--- drivers/android/binder.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)drivers/android/binder.c +0
-0
drivers/android/binder.c static int binder_do_deferred_txn_copies(struct binder_alloc *alloc, · line 2298
Quoted 5 lines
drivers/android/binder.c +1
-1@@ -2295,7 +2295,7 @@ static int binder_do_deferred_txn_copies(struct binder_alloc *alloc, {int ret =0 ;struct binder_sg_copy *sgc, *tmpsgc; - struct binder_ptr_fixup *pf = + struct binder_ptr_fixup *tmppf, *pf =
Just make this a new line:
struct binder_ptr_fixup *tmppf;
above the existing line.
drivers/android/binder.c static int binder_do_deferred_txn_copies(struct binder_alloc *alloc, · line 2352
Quoted 8 lines
drivers/android/binder.c +0
-1list_first_entry_or_null(pf_head, struct binder_ptr_fixup, node);@@ -2349,7 +2349,11 @@ static int binder_do_deferred_txn_copies(struct binder_alloc *alloc,list_del (&sgc->node);kfree (sgc); } -BUG_ON (!list_empty (pf_head));
So you are hitting this BUG_ON() today?
Quoted 9 lines
drivers/android/binder.c +5
-0+list_for_each_entry_safe (pf, tmppf, pf_head, node) { +BUG_ON (pf->skip_size ==0 ); +list_del (&pf->node); +kfree (pf); + }BUG_ON (!list_empty (sgc_head));return ret >0 ? -EINVAL : ret;
drivers/android/binder.c static int binder_translate_fd_array(struct list_head *pf_head, · line 2494
Quoted 5 lines
drivers/android/binder.c +2
-0@@ -2486,6 +2490,9 @@ static int binder_translate_fd_array(struct list_head *pf_head,struct binder_proc *proc = thread->proc;int ret; +if (fda->num_fds ==0 ) +return 0 ;
Why return 0?
This feels like a separate issue from above, should this be 2 different commits?
thanks,
greg k-h
Quoted 33 lines · Greg KH
Quoted 26 lines · Alessandro Astone
When handling
BINDER_TYPE_FDAobject we are pushing a parent fixup with a certainskip_sizebut no scatter-gather copy object, since the copy is handled standalone.
IfBINDER_TYPE_FDAis the last children the scatter-gather copy loop will never stop to skip it, thus we are left with an item in the parent fixup list. This will trigger theBUG_ON().Furthermore, it is possible to receive
BINDER_TYPE_FDAobject with num_fds=0 which will confuse the scatter-gather code.In the android userspace I could only find these usecases in the libstagefright OMX implementation, so it might be that they're doing something very weird, but nonetheless the kernel should not panic about it.
Fixes 09184ae9b575 ("binder: defer copies of pre-patched txn data")Signed-off-by Alessandro Astone <[email protected]>--- drivers/android/binder.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)drivers/android/binder.c +0
-0drivers/android/binder.c static int binder_do_deferred_txn_copies(struct binder_alloc *alloc, · line 2298
Quoted 5 lines
drivers/android/binder.c +1
-1@@ -2295,7 +2295,7 @@ static int binder_do_deferred_txn_copies(struct binder_alloc *alloc, {int ret =0 ;struct binder_sg_copy *sgc, *tmpsgc; - struct binder_ptr_fixup *pf = + struct binder_ptr_fixup *tmppf, *pf =Just make this a new line:
Quoted 3 lines
struct binder_ptr_fixup *tmppf;above the existing line.
Ack.
Quoted 10 lines
drivers/android/binder.c static int binder_do_deferred_txn_copies(struct binder_alloc *alloc, · line 2352
Quoted 8 lines
drivers/android/binder.c +0
-1list_first_entry_or_null(pf_head, struct binder_ptr_fixup, node);@@ -2349,7 +2349,11 @@ static int binder_do_deferred_txn_copies(struct binder_alloc *alloc,list_del (&sgc->node);kfree (sgc); } -BUG_ON (!list_empty (pf_head));So you are hitting this
BUG_ON()today?
Correct, both on 5.17, stable 5.17.2 and current master
Quoted 12 lines
Quoted 12 lines
drivers/android/binder.c +5
-0+list_for_each_entry_safe (pf, tmppf, pf_head, node) { +BUG_ON (pf->skip_size ==0 ); +list_del (&pf->node); +kfree (pf); + }BUG_ON (!list_empty (sgc_head));return ret >0 ? -EINVAL : ret;@@ -2486,6 +2490,9 @@ static int binder_translate_fd_array(struct list_head *pf_head,struct binder_proc *proc = thread->proc;int ret;
Quoted 7 lines
drivers/android/binder.c static int binder_translate_fd_array(struct list_head *pf_head, · line 2494
Quoted 2 lines
drivers/android/binder.c +2
-0+if (fda->num_fds ==0 ) +return 0 ;Why return 0?
This feels like a separate issue from above, should this be 2 different commits?
return 0 because I want it to be handled as it was handled before
09184ae9b575 ("binder: defer copies of pre-patched txn data")
Function binder_do_deferred_txn_copies distinguishes between a copy-fixup and a skip with if (pf->skip_size) so if the skip_size is 0, which happens if fda->num_fds is 0, it would accidentally enter the wrong branch. By returning 0 early i make sure a skip of size 0 is not added. It's not an error because it was never an error before commit 09184ae9b575 and some userspace in android is hitting this path.
I would agree it's a separate issue.
I originally merged it in this same patch because
1) Both are fixups to 09184ae9b575
2) Both are triggered by the same real-world android transaction that looks something like this:
obj[0] BINDER_TYPE_PTR, parent
obj[1] BINDER_TYPE_PTR, child
obj[2] BINDER_TYPE_PTR, child
obj[3] BINDER_TYPE_FDA with num_fds=0
3) In the other hunk of this patch i replace the BUG_ON with:
BUG_ON(pf->skip_size == 0)
to only BUG if any item remaining in the pf_head list is not a skip, but as observed we may receive skips of size 0.
4) With this hunk only, you would no longer reproduce the BUG_ON because the only transaction we receive in android with BINDER_TYPE_FDA as last child coincidentally always has num_fds=0. Certainly some weird behaviour...
So if I split them, patch A would depend on patch B (see point 3), but the BUG of patch B would only be reproducible without patch A (see point 4).
But let me know if you still prefer them split.
Quoted 3 lines
thanks,
greg k-h
Quoted 99 lines · Alessandro Astone
Quoted 33 lines · Greg KH
Quoted 26 lines · Alessandro Astone
When handling
BINDER_TYPE_FDAobject we are pushing a parent fixup with a certainskip_sizebut no scatter-gather copy object, since the copy is handled standalone.
IfBINDER_TYPE_FDAis the last children the scatter-gather copy loop will never stop to skip it, thus we are left with an item in the parent fixup list. This will trigger theBUG_ON().Furthermore, it is possible to receive
BINDER_TYPE_FDAobject with num_fds=0 which will confuse the scatter-gather code.In the android userspace I could only find these usecases in the libstagefright OMX implementation, so it might be that they're doing something very weird, but nonetheless the kernel should not panic about it.
Fixes 09184ae9b575 ("binder: defer copies of pre-patched txn data")Signed-off-by Alessandro Astone <[email protected]>--- drivers/android/binder.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)drivers/android/binder.c +0
-0drivers/android/binder.c static int binder_do_deferred_txn_copies(struct binder_alloc *alloc, · line 2298
Quoted 5 lines
drivers/android/binder.c +1
-1@@ -2295,7 +2295,7 @@ static int binder_do_deferred_txn_copies(struct binder_alloc *alloc, {int ret =0 ;struct binder_sg_copy *sgc, *tmpsgc; - struct binder_ptr_fixup *pf = + struct binder_ptr_fixup *tmppf, *pf =Just make this a new line:
Quoted 3 lines
struct binder_ptr_fixup *tmppf;above the existing line.
Ack.
Quoted 10 lines
drivers/android/binder.c static int binder_do_deferred_txn_copies(struct binder_alloc *alloc, · line 2352
Quoted 8 lines
drivers/android/binder.c +0
-1list_first_entry_or_null(pf_head, struct binder_ptr_fixup, node);@@ -2349,7 +2349,11 @@ static int binder_do_deferred_txn_copies(struct binder_alloc *alloc,list_del (&sgc->node);kfree (sgc); } -BUG_ON (!list_empty (pf_head));So you are hitting this
BUG_ON()today?Correct, both on 5.17, stable 5.17.2 and current master
Quoted 12 lines
Quoted 12 lines
drivers/android/binder.c +5
-0+list_for_each_entry_safe (pf, tmppf, pf_head, node) { +BUG_ON (pf->skip_size ==0 ); +list_del (&pf->node); +kfree (pf); + }BUG_ON (!list_empty (sgc_head));return ret >0 ? -EINVAL : ret;@@ -2486,6 +2490,9 @@ static int binder_translate_fd_array(struct list_head *pf_head,struct binder_proc *proc = thread->proc;int ret;Quoted 7 lines
drivers/android/binder.c static int binder_translate_fd_array(struct list_head *pf_head, · line 2494
Quoted 2 lines
drivers/android/binder.c +2
-0+if (fda->num_fds ==0 ) +return 0 ;Why return 0?
This feels like a separate issue from above, should this be 2 different commits?
return 0 because I want it to be handled as it was handled before
09184ae9b575("binder: defer copies of pre-patched txn data")Function
binder_do_deferred_txn_copiesdistinguishes between a copy-fixup and a skip withif (pf->skip_size)so if theskip_sizeis 0, which happens iffda->num_fdsis 0, it would accidentally enter the wrong branch. By returning 0 early i make sure a skip of size 0 is not added. It's not an error because it was never an error before commit09184ae9b575and some userspace in android is hitting this path.I would agree it's a separate issue.
I originally merged it in this same patch because
1) Both are fixups to09184ae9b575
2) Both are triggered by the same real-world android transaction that looks something like this:
obj[0]BINDER_TYPE_PTR, parent
obj[1]BINDER_TYPE_PTR, child
obj[2]BINDER_TYPE_PTR, child
obj[3]BINDER_TYPE_FDAwith num_fds=0
3) In the other hunk of this patch i replace theBUG_ONwith:
BUG_ON(pf->skip_size == 0)
to only BUG if any item remaining in thepf_headlist is not a skip, but as observed we may receive skips of size 0.
4) With this hunk only, you would no longer reproduce theBUG_ONbecause the only transaction we receive in android withBINDER_TYPE_FDAas last child coincidentally always has num_fds=0. Certainly some weird behaviour...
Quoted 4 lines
So if I split them, patch A would depend on patch B (see point 3), but the BUG of patch B would only be reproducible without patch A (see point 4).
But let me know if you still prefer them split.
Thanks for the fix! Please go ahead and split it into two patches.
Quoted 4 lines
Quoted 4 lines
thanks,
greg k-h