opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Halt mounting with a faulty usermapping path 

The driver mounts the volume with global permissions in case a
usermapping file was given but opening or reading it had failed.
The driver did not even warn about this behaviour.
This could lead into potential security related problems when
every user has full permissions in the mounted volume.
pull/10/head
Mikael Heino 2021-10-22 13:59:22 +03:00
parent 92b9fbc6fe
commit 9d1211f13b
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lowntfs-3g.c
View File

@ -4787,6 +4787,16 @@ int main(int argc, char *argv[])
#endif /* POSIXACLS */
ctx->dmask = ctx->fmask = 0;
} else {
/*
* User mapping path was defined, but building it failed
* Warn the user and halt the mounting
*/
if (ctx->usermap_path) {
ntfs_log_perror("Failed to load user mapping '%s'",
ctx->usermap_path);
err = NTFS_VOLUME_SYNTAX_ERROR;
goto err_out;
}
ctx->security.uid = ctx->uid;
ctx->security.gid = ctx->gid;
/* same ownership/permissions for all files */
@ -4808,8 +4818,6 @@ int main(int argc, char *argv[])
permissions_mode = "Ownership and permissions disabled";
}
}
if (ctx->usermap_path)
free (ctx->usermap_path);
#if defined(HAVE_SETXATTR) && defined(XATTR_MAPPINGS)
xattr_mapping = ntfs_xattr_build_mapping(ctx->vol,
@ -4855,6 +4863,8 @@ int main(int argc, char *argv[])
fuse_session_destroy(se);
err_out:
ntfs_mount_error(opts.device, opts.mnt_point, err);
if (ctx->usermap_path)
free(ctx->usermap_path);
if (ctx->abs_mnt_point)
free(ctx->abs_mnt_point);
#if defined(HAVE_SETXATTR) && defined(XATTR_MAPPINGS)

14
src/ntfs-3g.c
View File

@ -4514,6 +4514,16 @@ int main(int argc, char *argv[])
#endif /* POSIXACLS */
ctx->dmask = ctx->fmask = 0;
} else {
/*
* User mapping path was defined, but building it failed
* Warn the user and halt the mounting
*/
if (ctx->usermap_path) {
ntfs_log_perror("Failed to load user mapping '%s'",
ctx->usermap_path);
err = NTFS_VOLUME_SYNTAX_ERROR;
goto err_out;
}
ctx->security.uid = ctx->uid;
ctx->security.gid = ctx->gid;
/* same ownership/permissions for all files */
@ -4535,8 +4545,6 @@ int main(int argc, char *argv[])
permissions_mode = "Ownership and permissions disabled";
}
}
if (ctx->usermap_path)
free (ctx->usermap_path);
#if defined(HAVE_SETXATTR) && defined(XATTR_MAPPINGS)
xattr_mapping = ntfs_xattr_build_mapping(ctx->vol,
@ -4584,6 +4592,8 @@ int main(int argc, char *argv[])
fuse_destroy(fh);
err_out:
ntfs_mount_error(opts.device, opts.mnt_point, err);
if (ctx->usermap_path)
free(ctx->usermap_path);
if (ctx->abs_mnt_point)
free(ctx->abs_mnt_point);
#if defined(HAVE_SETXATTR) && defined(XATTR_MAPPINGS)