コミット: b34cff344cfe26fbd6f6f0cf1b335b92b39b4228 - system-coremmmm (git)

system/corennnnn

コミットメタ情報

• リビジョン: b34cff344cfe26fbd6f6f0cf1b335b92b39b4228 (tree)
• 日時: 2016-07-29 19:25:47
• 作者: Biao Lu <biao.lu@inte...>
• コミッター: Chih-Wei Huang

ログメッセージ

init: Fix load_firmware error

In function 'load_firmware', parameter 'buf' passed to 'write'
is wrong. To fix it, use android::base::WriteFully to replace.

Change-Id: I13f79bdc9be9e5eb669f6bd975535b1dce965ef0
Signed-off-by: Biao Lu <[e-mail]>

変更サマリ

• modified: init/devices.cpp

差分

--- a/init/devices.cpp
+++ b/init/devices.cpp
@@ -40,6 +40,7 @@
 #include <sys/time.h>
 #include <sys/wait.h>
 
+#include <base/file.h>
 #include <cutils/list.h>
 #include <cutils/probe_module.h>
 #include <cutils/uevent.h>
@@ -952,21 +953,13 @@ static int load_firmware(int fw_fd, int loading_fd, int data_fd)
             ret = -1;
             break;
         }
-
-        len_to_copy -= nr;
-        while (nr > 0) {
-            ssize_t nw = 0;
-
-            nw = write(data_fd, buf + nw, nr);
-            if(nw <= 0) {
-                ret = -1;
-                goto out;
-            }
-            nr -= nw;
+        if (!android::base::WriteFully(data_fd, buf, nr)) {
+            ret = -1;
+            break;
         }
+        len_to_copy -= nr;
     }
 
-out:
     if(!ret)
         write(loading_fd, "0", 1);  /* successful end of transfer */
     else