diff options
| author | Jorge Lucangeli Obes <jorgelo@google.com> | 2015-10-27 11:39:59 -0700 |
|---|---|---|
| committer | Jorge Lucangeli Obes <jorgelo@google.com> | 2015-10-27 11:42:31 -0700 |
| commit | 2034274edb55cf3717ca7fa49f614e69b0dc59c6 (patch) | |
| tree | 17ba18d7960c0d8d67aa11879d06e9239cfafa86 | |
| parent | 1102f5a58d539ed72defe40fcc1078840d1b3778 (diff) | |
| download | minijail-2034274edb55cf3717ca7fa49f614e69b0dc59c6.tar.gz | |
Remove warning suppressions.
Bug: None
Change-Id: Ie0a2a3f5c5817b3db3e8613da1ef4d1cc3505048
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | libminijail.c | 12 |
2 files changed, 7 insertions, 8 deletions
@@ -17,8 +17,7 @@ LOCAL_PATH := $(call my-dir) # Common variables # ======================================================== -minijailCommonCFlags := -Wall -Werror -Wno-unused-function \ - -Wno-unused-parameter -Wno-sign-compare +minijailCommonCFlags := -Wall -Werror minijailCommonSharedLibraries := libcap # libminijail shared library for target diff --git a/libminijail.c b/libminijail.c index 4f2228a..bebdb8c 100644 --- a/libminijail.c +++ b/libminijail.c @@ -688,7 +688,7 @@ static void write_ugid_mappings(const struct minijail *j, int *pipe_fds) sz = sizeof(fname); if (j->uidmap) { ret = snprintf(fname, sz, "/proc/%d/uid_map", j->initpid); - if (ret < 0 || ret >= sz) + if (ret < 0 || (size_t)ret >= sz) die("failed to write file name of uid_map"); fd = open(fname, O_WRONLY); if (fd < 0) @@ -700,7 +700,7 @@ static void write_ugid_mappings(const struct minijail *j, int *pipe_fds) } if (j->gidmap) { ret = snprintf(fname, sz, "/proc/%d/gid_map", j->initpid); - if (ret < 0 || ret >= sz) + if (ret < 0 || (size_t)ret >= sz) die("failed to write file name of gid_map"); fd = open(fname, O_WRONLY); if (fd < 0) @@ -881,11 +881,11 @@ void drop_ugid(const struct minijail *j) * uncommon for that to be less (if an older kernel) or more (if a newer * kernel). So suck up the answer via /proc. */ -static int get_last_valid_cap() +static unsigned int get_last_valid_cap() { const char cap_file[] = "/proc/sys/kernel/cap_last_cap"; FILE *fp = fopen(cap_file, "re"); - int last_valid_cap; + unsigned int last_valid_cap; if (fscanf(fp, "%u", &last_valid_cap) != 1) pdie("fscanf(%s)", cap_file); @@ -894,7 +894,7 @@ static int get_last_valid_cap() return last_valid_cap; } -void drop_caps(const struct minijail *j, int last_valid_cap) +void drop_caps(const struct minijail *j, unsigned int last_valid_cap) { cap_t caps = cap_get_proc(); cap_value_t flag[1]; @@ -994,7 +994,7 @@ void API minijail_enter(const struct minijail *j) * Get the last valid cap from /proc, since /proc can be unmounted * before drop_caps(). */ - int last_valid_cap = get_last_valid_cap(); + unsigned int last_valid_cap = get_last_valid_cap(); if (j->flags.pids) die("tried to enter a pid-namespaced jail;" |