diff options
| author | Kees Cook <keescook@chromium.org> | 2013-02-18 12:02:34 -0800 |
|---|---|---|
| committer | Lucas De Marchi <lucas.de.marchi@gmail.com> | 2013-02-19 19:19:51 -0300 |
| commit | c3e8d269466ab02e4c4a928f9f5af222f1138725 (patch) | |
| tree | 31706870d67e976313fe7171b159da649a7d27d9 | |
| parent | e87352d289aa19ed388e9e19507d86a39936f3b4 (diff) | |
| download | kmod-c3e8d269466ab02e4c4a928f9f5af222f1138725.tar.gz | |
libkmod: fix address argument to mmap calls
The first argument to mmap should be "NULL" instead of "0".
| -rw-r--r-- | libkmod/libkmod-file.c | 3 | ||||
| -rw-r--r-- | libkmod/libkmod-index.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libkmod/libkmod-file.c b/libkmod/libkmod-file.c index 219c63b..5313796 100644 --- a/libkmod/libkmod-file.c +++ b/libkmod/libkmod-file.c @@ -255,7 +255,8 @@ static int load_reg(struct kmod_file *file) return -errno; file->size = st.st_size; - file->memory = mmap(0, file->size, PROT_READ, MAP_PRIVATE, file->fd, 0); + file->memory = mmap(NULL, file->size, PROT_READ, MAP_PRIVATE, + file->fd, 0); if (file->memory == MAP_FAILED) return -errno; file->direct = true; diff --git a/libkmod/libkmod-index.c b/libkmod/libkmod-index.c index 516240e..d386f00 100644 --- a/libkmod/libkmod-index.c +++ b/libkmod/libkmod-index.c @@ -801,9 +801,9 @@ struct index_mm *index_mm_open(struct kmod_ctx *ctx, const char *filename, if ((size_t) st.st_size < sizeof(hdr)) goto fail_nommap; - if ((idx->mm = mmap(0, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0)) + if ((idx->mm = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0)) == MAP_FAILED) { - ERR(ctx, "mmap(0, %"PRIu64", PROT_READ, %d, MAP_PRIVATE, 0): %m\n", + ERR(ctx, "mmap(NULL, %"PRIu64", PROT_READ, %d, MAP_PRIVATE, 0): %m\n", st.st_size, fd); goto fail_nommap; } |