diff options
| author | Timothy E Baldwin | 2016-05-12 19:47:25 +0200 |
|---|---|---|
| committer | Riku Voipio | 2016-05-27 13:49:48 +0200 |
| commit | 2466119c9551d606a0f92f9832e0c865bc04b488 (patch) | |
| tree | f8c9bc66e98dfa427c0c746c3dcce0ef66be097f /linux-user/syscall.c | |
| parent | Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into st... (diff) | |
| download | qemu-2466119c9551d606a0f92f9832e0c865bc04b488.tar.gz qemu-2466119c9551d606a0f92f9832e0c865bc04b488.tar.xz qemu-2466119c9551d606a0f92f9832e0c865bc04b488.zip | |
linux-user: Check array bounds in errno conversion
Check array bounds in host_to_target_errno() and target_to_host_errno().
Signed-off-by: Timothy Edward Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
Message-id: 1441497448-32489-2-git-send-email-T.E.Baldwin99@members.leeds.ac.uk
[PMM: Add a lower-bound check, use braces on if(), tweak commit message]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'linux-user/syscall.c')
| -rw-r--r-- | linux-user/syscall.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 032d338869..5246f360df 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -619,15 +619,19 @@ static uint16_t host_to_target_errno_table[ERRNO_TABLE_SIZE] = { static inline int host_to_target_errno(int err) { - if(host_to_target_errno_table[err]) + if (err >= 0 && err < ERRNO_TABLE_SIZE && + host_to_target_errno_table[err]) { return host_to_target_errno_table[err]; + } return err; } static inline int target_to_host_errno(int err) { - if (target_to_host_errno_table[err]) + if (err >= 0 && err < ERRNO_TABLE_SIZE && + target_to_host_errno_table[err]) { return target_to_host_errno_table[err]; + } return err; } |