rust_binder: fix BINDER_GET_EXTENDED_ERROR
Subsystems (3)
Alice Ryhl
maintainerPATCH v2 1/1 rust_binder: fix BINDER_GET_EXTENDED_ERROR
This code currently copies the ExtendedError struct to the stack, modifies the copy, and then doesn't modify the original. Thus, fix it.
Furthermore, errors when replying must be delivered directly to the remote thread, so update deliver_reply() to take an extended error argument.
---
Changes in v2:
- Also handle extended error for replies.
- Link to v1: https://lore.kernel.org/r/[email protected]
--- drivers/android/binder/error.rs | 13 +++---- drivers/android/binder/thread.rs | 65 +++++++++++++++++++++++++---------- drivers/android/binder/transaction.rs | 15 ++++---- 3 files changed, 58 insertions(+), 35 deletions(-)
drivers/android/binder/error.rs +5 -8
@@ -73,20 +73,17 @@ impl fmt::Debug for BinderError {fn fmt (&self, f: &mut fmt::Formatter <'_>) -> fmt::Result {match self.reply {BR_FAILED_REPLY =>match self.source.as_ref () { -Some (source) => f - .debug_struct ("BR_FAILED_REPLY" ) - .field ("source" , source) - .finish (), +Some (source) => source.fmt (f),None => f.pad ("BR_FAILED_REPLY" ), },BR_DEAD_REPLY => f.pad ("BR_DEAD_REPLY" ),BR_FROZEN_REPLY => f.pad ("BR_FROZEN_REPLY" ),BR_TRANSACTION_PENDING_FROZEN => f.pad ("BR_TRANSACTION_PENDING_FROZEN" ),BR_TRANSACTION_COMPLETE => f.pad ("BR_TRANSACTION_COMPLETE" ), - _ => f - .debug_struct ("BinderError" ) - .field ("reply" , &self.reply) - .finish (), + _ =>match self.source.as_ref () { +Some (source) => source.fmt (f), +None => f.pad ("OTHER_ERROR" ), + }, } } }
drivers/android/binder/thread.rs +46 -19
135 lines not on this page · raw message
drivers/android/binder/transaction.rs +7 -8
@@ -42,6 +42,7 @@ pub(crate) struct TransactionInfo { pub(crate) reply: u32, pub(crate) oneway_spam_suspect: bool, pub(crate) is_reply: bool, + pub(crate) debug_id: usize, }impl TransactionInfo {
@@ -93,7 +94,6 @@ pub(crate) fn new( from: &Arc<Thread>, info: &mut TransactionInfo, ) -> BinderResult<DLArc<Self>> { -let debug_id =super ::next_debug_id ();let allow_fds = node_ref.node.flags &FLAT_BINDER_FLAG_ACCEPTS_FDS !=0 ;let txn_security_ctx = node_ref.node.flags &FLAT_BINDER_FLAG_TXN_SECURITY_CTX !=0 ;let mut txn_security_ctx_off =if txn_security_ctx {Some (0 ) }else {None };
@@ -101,7 +101,7 @@ pub(crate) fn new(let mut alloc =match from.copy_transaction_data ( to.clone (), info, - debug_id, + info.debug_id, allow_fds, txn_security_ctx_off.as_mut (), ) {
@@ -128,7 +128,7 @@ pub(crate) fn new(let data_address = alloc.ptr; Ok(DTRWrap::arc_pin_init(pin_init!(Transaction { - debug_id, + debug_id: info.debug_id, target_node: Some(target_node), from_parent, sender_euid: Kuid::current_euid(),
@@ -152,9 +152,8 @@ pub(crate) fn new_reply( info: &mut TransactionInfo, allow_fds: bool, ) -> BinderResult<DLArc<Self>> { -let debug_id =super ::next_debug_id ();let mut alloc = -match from.copy_transaction_data (to.clone (), info, debug_id, allow_fds,None ) { +match from.copy_transaction_data (to.clone (), info, info.debug_id, allow_fds,None ) {Ok (alloc) => alloc,Err (err) => {pr_warn! ("Failure in copy_transaction_data: {:?}" , err);
@@ -165,7 +164,7 @@ pub(crate) fn new_reply( alloc.set_info_clear_on_drop (); } Ok(DTRWrap::arc_pin_init(pin_init!(Transaction { - debug_id, + debug_id: info.debug_id, target_node: None, from_parent: None, sender_euid: Kuid::current_euid(),
@@ -394,7 +393,7 @@ fn do_work(let send_failed_reply =ScopeGuard ::new (|| {if self.target_node.is_some () && self.flags &TF_ONE_WAY ==0 {let reply =Err (BR_FAILED_REPLY ); - self.from.deliver_reply (reply, &self); + self.from.deliver_reply (reply, &self,None ); } self.drop_outstanding_txn (); });
@@ -478,7 +477,7 @@ fn cancel(self: DArc<Self>) {// If this is not a reply or oneway transaction, then send a dead reply. if self.target_node.is_some () && self.flags &TF_ONE_WAY ==0 {let reply =Err (BR_DEAD_REPLY ); - self.from.deliver_reply (reply, &self); + self.from.deliver_reply (reply, &self,None ); } self.drop_outstanding_txn ();
---
base-commit: da61573f783897ae5a96c8f1c71aad6242344feb
change-id: 20260527-set-extended-error-e2ca37e0696d
Best regards,
Signature · 1 line
Alice Ryhl <[email protected]>
Alice Ryhl
maintainerQuoted 15 lines · Alice Ryhl
This code currently copies the ExtendedError struct to the stack, modifies the copy, and then doesn't modify the original. Thus, fix it.
Furthermore, errors when replying must be delivered directly to the remote thread, so update
deliver_reply()to take an extended error argument.Fixes eafedbc7c050 ("rust_binder: add Rust Binder driver")Signed-off-by Alice Ryhl <[email protected]>
BR_DEAD_REPLY=>f.pad("BR_DEAD_REPLY"),
BR_FROZEN_REPLY=>f.pad("BR_FROZEN_REPLY"),BR_TRANSACTION_PENDING_FROZEN=>f.pad("BR_TRANSACTION_PENDING_FROZEN"),BR_TRANSACTION_COMPLETE=>f.pad("BR_TRANSACTION_COMPLETE"),
drivers/android/binder/error.rs impl fmt::Debug for BinderError { · line 85
Quoted 7 lines
drivers/android/binder/error.rs +3
-4- _ => f - .debug_struct ("BinderError" ) - .field ("reply" , &self.reply) - .finish(), + _ => match self.source.as_ref() { +Some (source) => source.fmt (f), +None => f.pad ("OTHER_ERROR" ),
As sashiko points out, this is probably better as:
self.reply.fmt(f)
to just print the raw integer.
drivers/android/binder/thread.rs fn reply_inner(self: &Arc<Self>, info: &mut TransactionInfo) -> BinderResult { · line 1361
Quoted 7 lines
drivers/android/binder/thread.rs +5
-2-let reply =Err (BR_FAILED_REPLY ); - orig.from.deliver_reply (reply, &orig); + +let param = err.source.as_ref ().map_or (0 , |e| e.to_errno ()); +let ee =ExtendedError ::new (orig.debug_idas u32 , err.reply, param); + orig.from + .deliver_reply (Err (BR_FAILED_REPLY ), &orig,Some (ee));
As sashiko points out it should be info.debug_id instead of orig.debug_id here.
Alice