From patchwork Thu Mar 3 18:35:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 591569 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 51461141B57 for ; Fri, 4 Mar 2016 05:36:04 +1100 (AEDT) Received: from localhost ([::1]:36795 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abY6U-0005qO-FR for incoming@patchwork.ozlabs.org; Thu, 03 Mar 2016 13:36:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46434) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abY67-0005Wx-Ud for qemu-devel@nongnu.org; Thu, 03 Mar 2016 13:35:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1abY67-0001tN-3r for qemu-devel@nongnu.org; Thu, 03 Mar 2016 13:35:39 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:56080) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abY66-0001tG-Sx for qemu-devel@nongnu.org; Thu, 03 Mar 2016 13:35:39 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84) (envelope-from ) id 1abY63-0000mD-C2; Thu, 03 Mar 2016 18:35:35 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 3 Mar 2016 18:35:34 +0000 Message-Id: <1457030134-11357-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.9.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:8b0:1d0::2 Cc: Riku Voipio , Laurent Vivier , patches@linaro.org Subject: [Qemu-devel] [PATCH] linux-user: Check array bounds in errno conversion X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Timothy E Baldwin Check array bounds in host_to_target_errno() and target_to_host_errno(). Signed-off-by: Timothy Edward Baldwin 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 Reviewed-by: Laurent Vivier --- This is a bugfix patch fished out of Timothy's signal-race-fixes patch series. We had a previous go-around doing this with unsigned integers, but that doesn't work. linux-user/syscall.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 9517531..f9dcdd4 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -617,15 +617,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; }