Skip to content

L
lxc
Unverified Commit 37180208 by Christian Brauner
Options

tools: only check for O_RDONLY

On some Android systems the lxc folders where containers are stored might be read-only and so checking for O_RDWR, will effectively make the tools useless on these systems, so let's dumb the check down to O_RDONLY. Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent f290a806
Showing with 5 additions and 5 deletions
src/lxc/tools/lxc_attach.c
...@@ -395,7 +395,7 @@ int main(int argc, char *argv[]) ...@@ -395,7 +395,7 @@ int main(int argc, char *argv[])
lxc_log_options_no_override(); lxc_log_options_no_override();
if (geteuid()) { if (geteuid()) {
if (access(my_args.lxcpath[0], O_RDWR) < 0) { if (access(my_args.lxcpath[0], O_RDONLY) < 0) {
if (!my_args.quiet) if (!my_args.quiet)
fprintf(stderr, "You lack access to %s\n", my_args.lxcpath[0]); fprintf(stderr, "You lack access to %s\n", my_args.lxcpath[0]);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
......
src/lxc/tools/lxc_copy.c
...@@ -184,7 +184,7 @@ int main(int argc, char *argv[]) ...@@ -184,7 +184,7 @@ int main(int argc, char *argv[])
lxc_log_options_no_override(); lxc_log_options_no_override();
if (geteuid()) { if (geteuid()) {
if (access(my_args.lxcpath[0], O_RDWR) < 0) { if (access(my_args.lxcpath[0], O_RDONLY) < 0) {
if (!my_args.quiet) if (!my_args.quiet)
fprintf(stderr, "You lack access to %s\n", my_args.lxcpath[0]); fprintf(stderr, "You lack access to %s\n", my_args.lxcpath[0]);
exit(ret); exit(ret);
......
src/lxc/tools/lxc_create.c
...@@ -252,7 +252,7 @@ int main(int argc, char *argv[]) ...@@ -252,7 +252,7 @@ int main(int argc, char *argv[])
if (mkdir_p(my_args.lxcpath[0], 0755)) { if (mkdir_p(my_args.lxcpath[0], 0755)) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (access(my_args.lxcpath[0], O_RDWR) < 0) { if (access(my_args.lxcpath[0], O_RDONLY) < 0) {
fprintf(stderr, "You lack access to %s\n", my_args.lxcpath[0]); fprintf(stderr, "You lack access to %s\n", my_args.lxcpath[0]);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
......
src/lxc/tools/lxc_snapshot.c
...@@ -95,7 +95,7 @@ int main(int argc, char *argv[]) ...@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
lxc_log_options_no_override(); lxc_log_options_no_override();
if (geteuid()) { if (geteuid()) {
if (access(my_args.lxcpath[0], O_RDWR) < 0) { if (access(my_args.lxcpath[0], O_RDONLY) < 0) {
fprintf(stderr, "You lack access to %s\n", fprintf(stderr, "You lack access to %s\n",
my_args.lxcpath[0]); my_args.lxcpath[0]);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
......
src/lxc/tools/lxc_start.c
...@@ -231,7 +231,7 @@ int main(int argc, char *argv[]) ...@@ -231,7 +231,7 @@ int main(int argc, char *argv[])
exit(err); exit(err);
lxc_log_options_no_override(); lxc_log_options_no_override();
if (access(my_args.lxcpath[0], O_RDWR) < 0) { if (access(my_args.lxcpath[0], O_RDONLY) < 0) {
if (!my_args.quiet) if (!my_args.quiet)
fprintf(stderr, "You lack access to %s\n", my_args.lxcpath[0]); fprintf(stderr, "You lack access to %s\n", my_args.lxcpath[0]);
exit(err); exit(err);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment