提交: 5665cf21409d9443e8afbb83d77d4bddcbec6d38 - system-core (git)

system/core

Commit MetaInfo

• 修订版: 5665cf21409d9443e8afbb83d77d4bddcbec6d38 (tree)
• 时间: 2018-03-05 19:24:24
• 作者: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

modprobe: fix return value

It seems bionic ignores the return value of the main function.
As a result, kernel won't know modprobe failed. That may cause
kernel panic.

Using exit() function to fix that.

更改概述

• modified: init/devices.cpp

差异

--- a/init/devices.cpp
+++ b/init/devices.cpp
@@ -558,7 +558,7 @@ int modprobe_main(int argc, char **argv)
     DeviceHandler dh;
     dh.ReadModulesDescFiles();
     dh.OnColdBootDone();
-    return dh.LoadModule(uevent) || dh.LoadModule(uevent.modalias, options.c_str()) ? 0 : -1;
+    exit(!dh.LoadModule(uevent) && !dh.LoadModule(uevent.modalias, options.c_str()));
 }
 
 }  // namespace init