binder: No need to pass alloc explicitly to translate_object.

Signed-off-by: Wedson Almeida Filho <[email protected]>

Author: wedsonaf

drivers/android/allocation.rs

@@ -121,8 +121,9 @@ impl Drop for Allocation<'_> {
         }
 
         if let Some(info) = &self.allocation_info {
-            let view = AllocationView::new(self, info.offsets.start);
-            for i in info.offsets.clone().step_by(size_of::<usize>()) {
+            let offsets = info.offsets.clone();
+            let view = AllocationView::new(self, offsets.start);
+            for i in offsets.step_by(size_of::<usize>()) {
                 if view.cleanup_object(i).is_err() {
                     pr_warn!("Error cleaning up object at offset {}\n", i)
                 }
@@ -133,13 +134,13 @@ impl Drop for Allocation<'_> {
     }
 }
 
-pub(crate) struct AllocationView<'a> {
-    alloc: &'a Allocation<'a>,
+pub(crate) struct AllocationView<'a, 'b> {
+    pub(crate) alloc: &'a mut Allocation<'b>,
     limit: usize,
 }
 
-impl<'a> AllocationView<'a> {
-    pub(crate) fn new(alloc: &'a Allocation, limit: usize) -> Self {
+impl<'a, 'b> AllocationView<'a, 'b> {
+    pub(crate) fn new(alloc: &'a mut Allocation<'b>, limit: usize) -> Self {
         AllocationView { alloc, limit }
     }
 

drivers/android/thread.rs

@@ -376,11 +376,10 @@ impl Thread {
     fn translate_object(
         &self,
         index_offset: usize,
-        alloc: &Allocation,
         view: &AllocationView,
         allow_fds: bool,
     ) -> BinderResult {
-        let offset = alloc.read(index_offset)?;
+        let offset = view.alloc.read(index_offset)?;
         let header = view.read::<bindings::binder_object_header>(offset)?;
         // TODO: Handle other types.
         match header.type_ {
@@ -421,9 +420,9 @@ impl Thread {
         end: usize,
         allow_fds: bool,
     ) -> BinderResult {
-        let view = AllocationView::new(&alloc, start);
+        let view = AllocationView::new(alloc, start);
         for i in (start..end).step_by(size_of::<usize>()) {
-            if let Err(err) = self.translate_object(i, alloc, &view, allow_fds) {
+            if let Err(err) = self.translate_object(i, &view, allow_fds) {
                 alloc.set_info(AllocationInfo { offsets: start..i });
                 return Err(err);
             }