Skip to content

Commit

Permalink
linux-user: Fix trampoline code for CRIS
Browse files Browse the repository at this point in the history
__put_user can write bytes, words (2 bytes) or longwords (4 bytes).
Here obviously words should have been written, but bytes were written,
so values like 0x9c5f were truncated to 0x5f.

Fix this by changing retcode from uint8_t to to uint16_t in
target_signal_frame and also in the unused rt_signal_frame.

This problem was reported by static code analysis (smatch).

Cc: qemu-stable@nongnu.org
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Acked-by: Riku Voipio <riku.voipio@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
  • Loading branch information
stweil authored and edgarigl committed Feb 3, 2014
1 parent ce603d8 commit 8cfc114
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions linux-user/signal.c
Expand Up @@ -3659,15 +3659,15 @@ struct target_sigcontext {
struct target_signal_frame {
struct target_sigcontext sc;
uint32_t extramask[TARGET_NSIG_WORDS - 1];
uint8_t retcode[8]; /* Trampoline code. */
uint16_t retcode[4]; /* Trampoline code. */
};

struct rt_signal_frame {
siginfo_t *pinfo;
void *puc;
siginfo_t info;
struct ucontext uc;
uint8_t retcode[8]; /* Trampoline code. */
uint16_t retcode[4]; /* Trampoline code. */
};

static void setup_sigcontext(struct target_sigcontext *sc, CPUCRISState *env)
Expand Down Expand Up @@ -3745,8 +3745,8 @@ static void setup_frame(int sig, struct target_sigaction *ka,
*/
err |= __put_user(0x9c5f, frame->retcode+0);
err |= __put_user(TARGET_NR_sigreturn,
frame->retcode+2);
err |= __put_user(0xe93d, frame->retcode+4);
frame->retcode + 1);
err |= __put_user(0xe93d, frame->retcode + 2);

/* Save the mask. */
err |= __put_user(set->sig[0], &frame->sc.oldmask);
Expand Down

0 comments on commit 8cfc114

Please sign in to comment.