From 301fed073084f92cf9b92a48fccae89104b50341 Mon Sep 17 00:00:00 2001 From: Jin Qian Date: Tue, 2 May 2017 13:20:27 -0700 Subject: [PATCH] AOSP: e2fsdroid: skip setting timestamp if src_dir is null fs_mgr formats /data without src_dir. Test: zero-out first 4096 bytes on /data partition and reboot Bug: 35219933 Change-Id: I12f1eb1002fd96d18fc7a9ae5a529f673eb57273 From AOSP commit: b5330546f444b49c4d751e9ddd7677ae97161f0c Signed-off-by: Theodore Ts'o --- contrib/android/perms.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/android/perms.c b/contrib/android/perms.c index 1e4c6db..9a7a93f 100644 --- a/contrib/android/perms.c +++ b/contrib/android/perms.c @@ -153,11 +153,12 @@ static errcode_t set_timestamp(ext2_filsys fs, ext2_ino_t ino, return retval; } - if (params->fixed_time == -1) { + if (params->fixed_time == -1 && params->src_dir) { /* replace mountpoint from filename with src_dir */ if (asprintf(&src_filename, "%s/%s", params->src_dir, - params->filename + strlen(params->mountpoint)) < 0) + params->filename + strlen(params->mountpoint)) < 0) { return -ENOMEM; + } retval = lstat(src_filename, &stat); if (retval < 0) { com_err(__func__, retval, -- 1.8.3.1