Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752762AbYKQXrS (ORCPT ); Mon, 17 Nov 2008 18:47:18 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751920AbYKQXrJ (ORCPT ); Mon, 17 Nov 2008 18:47:09 -0500 Received: from gateway-1237.mvista.com ([63.81.120.158]:46929 "EHLO gateway-1237.mvista.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751818AbYKQXrH (ORCPT ); Mon, 17 Nov 2008 18:47:07 -0500 Message-ID: <4922027A.4060805@ct.jp.nec.com> Date: Mon, 17 Nov 2008 15:47:06 -0800 From: Hiroshi Shimamoto User-Agent: Thunderbird 2.0.0.17 (Windows/20080914) MIME-Version: 1.0 To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" Cc: linux-kernel@vger.kernel.org, xiyou.wangcong@gmail.com Subject: [PATCH v2 2/5] x86: ia32_signal: introduce COPY_SEG_STRICT References: <491E4101.7010405@ct.jp.nec.com> <492201F2.1060804@ct.jp.nec.com> In-Reply-To: <492201F2.1060804@ct.jp.nec.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1462 Lines: 49 From: Hiroshi Shimamoto Impact: cleanup Introduce COPY_SEG_STRICT for ia32_restore_sigcontext(). Signed-off-by: Hiroshi Shimamoto --- arch/x86/ia32/ia32_signal.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c index a28790a..f74178e 100644 --- a/arch/x86/ia32/ia32_signal.c +++ b/arch/x86/ia32/ia32_signal.c @@ -201,6 +201,12 @@ struct rt_sigframe err |= __get_user(regs->x, &sc->x); \ } +#define COPY_SEG_STRICT(seg) { \ + unsigned short tmp; \ + err |= __get_user(tmp, &sc->seg); \ + regs->seg = tmp | 3; \ +} + #define RELOAD_SEG(seg,mask) \ { unsigned int cur; \ unsigned short pre; \ @@ -246,10 +252,8 @@ static int ia32_restore_sigcontext(struct pt_regs *regs, COPY(dx); COPY(cx); COPY(ip); /* Don't touch extended registers */ - err |= __get_user(regs->cs, &sc->cs); - regs->cs |= 3; - err |= __get_user(regs->ss, &sc->ss); - regs->ss |= 3; + COPY_SEG_STRICT(cs); + COPY_SEG_STRICT(ss); err |= __get_user(tmpflags, &sc->flags); regs->flags = (regs->flags & ~FIX_EFLAGS) | (tmpflags & FIX_EFLAGS); -- 1.5.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/