reactos/syzkaller
1
0
Fork 0
mirror of https://github.com/reactos/syzkaller.git synced 2024-11-27 05:10:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vm/adb: switch adb to root

Browse Source 
Userdebug builds have adb under 'shell' user by default.
Switch to root user before starting fuzzing.
This commit is contained in:
Dmitry Vyukov 2016-11-11 13:51:23 -08:00
parent 9041744a60
commit e3653a25ed
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
vm/adb/adb.go
View File

@ -158,14 +158,8 @@ func (inst *instance) adb(args ...string) ([]byte, error) {
func (inst *instance) repair() error {
// Assume that the device is in a bad state initially and reboot it.
for i := 0; i < 300; i++ {
if _, err := inst.adb("shell", "pwd"); err == nil {
break
}
if !vm.SleepInterruptible(time.Second) {
return fmt.Errorf("shutdown in progress")
}
}
// Ignore errors, maybe we will manage to reboot it anyway.
inst.waitForSsh()
// adb reboot episodically hangs, so we use a more reliable way.
// Ignore errors because all other adb commands hang as well
// and the binary can already be on the device.
@ -177,6 +171,18 @@ func (inst *instance) repair() error {
if !vm.SleepInterruptible(10 * time.Second) {
return fmt.Errorf("shutdown in progress")
}
if err := inst.waitForSsh(); err != nil {
return err
}
// Switch to root for userdebug builds.
inst.adb("root")
if err := inst.waitForSsh(); err != nil {
return err
}
return nil
}
func (inst *instance) waitForSsh() error {
var err error
for i := 0; i < 300; i++ {
if !vm.SleepInterruptible(time.Second) {