From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57594) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T49YJ-0002yY-Bt for qemu-devel@nongnu.org; Wed, 22 Aug 2012 07:56:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T49YI-0004Oc-IL for qemu-devel@nongnu.org; Wed, 22 Aug 2012 07:56:51 -0400 Received: from mx.meyering.net ([88.168.87.75]:45313 helo=hx.meyering.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T49YI-0004OP-5Z for qemu-devel@nongnu.org; Wed, 22 Aug 2012 07:56:50 -0400 From: Jim Meyering Date: Wed, 22 Aug 2012 13:55:55 +0200 Message-Id: <1345636556-29008-5-git-send-email-jim@meyering.net> In-Reply-To: <1345636556-29008-1-git-send-email-jim@meyering.net> References: <1345636556-29008-1-git-send-email-jim@meyering.net> Subject: [Qemu-devel] [PATCHv3 4/5] arm-semi: don't leak 1KB user string lock buffer upon TARGET_SYS_OPEN List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jim Meyering From: Jim Meyering Always call unlock_user before returning. Signed-off-by: Jim Meyering --- target-arm/arm-semi.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/target-arm/arm-semi.c b/target-arm/arm-semi.c index 2495206..73bde58 100644 --- a/target-arm/arm-semi.c +++ b/target-arm/arm-semi.c @@ -194,18 +194,19 @@ uint32_t do_arm_semihosting(CPUARMState *env) if (!(s = lock_user_string(ARG(0)))) /* FIXME - should this error code be -TARGET_EFAULT ? */ return (uint32_t)-1; - if (ARG(1) >= 12) + if (ARG(1) >= 12) { + unlock_user(s, ARG(0), 0); return (uint32_t)-1; + } if (strcmp(s, ":tt") == 0) { - if (ARG(1) < 4) - return STDIN_FILENO; - else - return STDOUT_FILENO; + int result_fileno = ARG(1) < 4 ? STDIN_FILENO : STDOUT_FILENO; + unlock_user(s, ARG(0), 0); + return result_fileno; } if (use_gdb_syscalls()) { gdb_do_syscall(arm_semi_cb, "open,%s,%x,1a4", ARG(0), (int)ARG(2)+1, gdb_open_modeflags[ARG(1)]); - return env->regs[0]; + ret = env->regs[0]; } else { ret = set_swi_errno(ts, open(s, open_modeflags[ARG(1)], 0644)); } -- 1.7.12