scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-10 17:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

mount-encrypted: fix mount detection to use device

Browse Source 
Instead of fsid, which is unpopulated for tmpfs, use device number
since that will increment for each different tmpfs.

BUG=chrome-os-partner:15192
TEST=parrot build, manual testing
BRANCH=none

Change-Id: I0024f7283c90684daaf1278d3cf6b76cc85bb253
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/35615
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Elly Jones <ellyjones@chromium.org>
This commit is contained in:
Kees Cook
2012-10-15 14:06:53 -07:00
committed by Gerrit
parent adc6764229
commit b59d06e6e8
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
utility/mount-helpers.c
View File

@@ -19,7 +19,6 @@
#include <math.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/statvfs.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/mount.h>
@@ -99,17 +98,17 @@ int runcmd(const gchar *argv[], gchar **output)
int same_vfs(const char *mnt_a, const char *mnt_b)
{
struct statvfs stat_a, stat_b;
struct stat stat_a, stat_b;
if (statvfs(mnt_a, &stat_a)) {
PERROR("statvfs(%s)", mnt_a);
if (lstat(mnt_a, &stat_a)) {
PERROR("lstat(%s)", mnt_a);
exit(1);
}
if (statvfs(mnt_b, &stat_b)) {
PERROR("statvfs(%s)", mnt_b);
if (lstat(mnt_b, &stat_b)) {
PERROR("lstat(%s)", mnt_b);
exit(1);
}
return (stat_a.f_fsid == stat_b.f_fsid);
return (stat_a.st_dev == stat_b.st_dev);
}
/* Returns allocated string that holds [length]*2 + 1 characters. */