tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix argument type for FS_IOC_GETFLAGS and FS_IOC_SETFLAGS

Browse source 
These ioctls take a pointer to an 'int' (or an 'unsigned int', it
doesn't matter), not an 'unsigned long'.  See 'man ioctl_iflags'.
Presumably it happened to work anyway because Android only runs on
little endian platforms.

Bug: 146419093
Bug: 163453310
Change-Id: I73099dafd4ee8d497c0a754149271871a37454f6
Signed-off-by: Eric Biggers <ebiggers@google.com>
This commit is contained in:
Eric Biggers 2020-10-23 16:32:58 -07:00 committed by Daniel Rosenberg
parent cb581cc8de
commit f9d9ac29d0
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Utils.cpp
View file

@ -199,7 +199,7 @@ int SetDefaultAcl(const std::string& path, mode_t mode, uid_t uid, gid_t gid,
} }
int SetQuotaInherit(const std::string& path) { int SetQuotaInherit(const std::string& path) {
unsigned long flags; unsigned int flags;
android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(path.c_str(), O_RDONLY | O_CLOEXEC))); android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(path.c_str(), O_RDONLY | O_CLOEXEC)));
if (fd == -1) { if (fd == -1) {
@ -417,7 +417,7 @@ int PrepareAppDirFromRoot(const std::string& path, const std::string& root, int
} }
int SetAttrs(const std::string& path, unsigned int attrs) { int SetAttrs(const std::string& path, unsigned int attrs) {
unsigned long flags; unsigned int flags;
android::base::unique_fd fd( android::base::unique_fd fd(
TEMP_FAILURE_RETRY(open(path.c_str(), O_RDONLY | O_NONBLOCK | O_CLOEXEC))); TEMP_FAILURE_RETRY(open(path.c_str(), O_RDONLY | O_NONBLOCK | O_CLOEXEC)));
@ -426,14 +426,14 @@ int SetAttrs(const std::string& path, unsigned int attrs) {
return -1; return -1;
} }
if (ioctl(fd, FS_IOC_GETFLAGS, (void*)&flags)) { if (ioctl(fd, FS_IOC_GETFLAGS, &flags)) {
PLOG(ERROR) << "Failed to get flags for " << path; PLOG(ERROR) << "Failed to get flags for " << path;
return -1; return -1;
} }
if ((flags & attrs) == attrs) return 0; if ((flags & attrs) == attrs) return 0;
flags |= attrs; flags |= attrs;
if (ioctl(fd, FS_IOC_SETFLAGS, (void*)&flags)) { if (ioctl(fd, FS_IOC_SETFLAGS, &flags)) {
PLOG(ERROR) << "Failed to set flags for " << path << "(0x" << std::hex << attrs << ")"; PLOG(ERROR) << "Failed to set flags for " << path << "(0x" << std::hex << attrs << ")";
return -1; return -1;
} }