rust/binder: remove dependency on 64-bit cpu architectures

Sven Van Asbroeck · Sven Van Asbroeck · commit 42c135150b7b · 2021-04-16T13:12:10.000-04:00
Remove the assumption that c_types::c_ulong is u64. This is true
only on 64-bit cpu architectures.

Signed-off-by: Sven Van Asbroeck &lt;thesven73@gmail.com&gt;
diff --git a/drivers/android/process.rs b/drivers/android/process.rs
@@ -905,12 +905,12 @@ impl FileOperations for Process {
             return Err(Error::EINVAL);
         }
 
-        if (vma.vm_flags & (bindings::VM_WRITE as u64)) != 0 {
+        if (vma.vm_flags & (bindings::VM_WRITE as c_types::c_ulong)) != 0 {
             return Err(Error::EPERM);
         }
 
-        vma.vm_flags |= (bindings::VM_DONTCOPY | bindings::VM_MIXEDMAP) as u64;
-        vma.vm_flags &= !(bindings::VM_MAYWRITE as u64);
+        vma.vm_flags |= (bindings::VM_DONTCOPY | bindings::VM_MIXEDMAP) as c_types::c_ulong;
+        vma.vm_flags &= !(bindings::VM_MAYWRITE as c_types::c_ulong);
 
         // TODO: Set ops. We need to learn when the user unmaps so that we can stop using it.
         self.create_mapping(vma)

Original file line number	Diff line number	Diff line change
`@@ -905,12 +905,12 @@ impl FileOperations for Process {`
`905`	`905`	`return Err(Error::EINVAL);`
`906`	`906`	`}`
`907`	`907`
`908`		`- if (vma.vm_flags & (bindings::VM_WRITE as u64)) != 0 {`
	`908`	`+ if (vma.vm_flags & (bindings::VM_WRITE as c_types::c_ulong)) != 0 {`
`909`	`909`	`return Err(Error::EPERM);`
`910`	`910`	`}`
`911`	`911`
`912`		`- vma.vm_flags \|= (bindings::VM_DONTCOPY \| bindings::VM_MIXEDMAP) as u64;`
`913`		`- vma.vm_flags &= !(bindings::VM_MAYWRITE as u64);`
	`912`	`+ vma.vm_flags \|= (bindings::VM_DONTCOPY \| bindings::VM_MIXEDMAP) as c_types::c_ulong;`
	`913`	`+ vma.vm_flags &= !(bindings::VM_MAYWRITE as c_types::c_ulong);`
`914`	`914`
`915`	`915`	`// TODO: Set ops. We need to learn when the user unmaps so that we can stop using it.`
`916`	`916`	`self.create_mapping(vma)`