From patchwork Fri Jul 26 13:21:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kirill Tkhai X-Patchwork-Id: 262157 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 452152C007A for ; Fri, 26 Jul 2013 23:21:17 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758167Ab3GZNVQ (ORCPT ); Fri, 26 Jul 2013 09:21:16 -0400 Received: from forward8.mail.yandex.net ([77.88.61.38]:34597 "EHLO forward8.mail.yandex.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757557Ab3GZNVQ (ORCPT ); Fri, 26 Jul 2013 09:21:16 -0400 Received: from web24e.yandex.ru (web24e.yandex.ru [77.88.61.4]) by forward8.mail.yandex.net (Yandex) with ESMTP id D388DF61589; Fri, 26 Jul 2013 17:21:13 +0400 (MSK) Received: from 127.0.0.1 (localhost.localdomain [127.0.0.1]) by web24e.yandex.ru (Yandex) with ESMTP id 693A61F98020; Fri, 26 Jul 2013 17:21:13 +0400 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1374844873; bh=qocUzR1MwLGsfZIvbHnnzAdyQjtXDuajL1lK7HvIniE=; h=From:To:Cc:Subject:Date; b=J+ISoiIzpKVRo9FiWq23rO79w8iJJJJGxVomy/1PsgVZ0SzN63qioSIcFVYlSG1Hl G7qj9vhgXtf0R7RBJOs/ixsFuHCXlC7hcEhNYTosfMJnltosfEES76Kcoya7iGtuLm UQVgRRbtpngZW7XKWCDbDSk80a0TJAt2n9H2bVNM= Received: from ns.ineum.ru (ns.ineum.ru [213.247.249.139]) by web24e.yandex.ru with HTTP; Fri, 26 Jul 2013 17:21:12 +0400 From: Kirill Tkhai To: "sparclinux@vger.kernel.org" Cc: David Miller Subject: [PATCH v2] sparc64: Fix not SRA'ed %o5 in 32-bit traced syscall MIME-Version: 1.0 Message-Id: <2143211374844872@web24e.yandex.ru> X-Mailer: Yamail [ http://yandex.ru ] 5.0 Date: Fri, 26 Jul 2013 17:21:12 +0400 Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org (From v1 to v2: changed comment) On the way linux_sparc_syscall32->linux_syscall_trace32->goto 2f, register %o5 doesn't clear its second 32-bit. Fix that. Signed-off-by: Kirill Tkhai CC: David Miller --- arch/sparc/kernel/syscalls.S | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S index 22a1098..73ec8a7 100644 --- a/arch/sparc/kernel/syscalls.S +++ b/arch/sparc/kernel/syscalls.S @@ -152,7 +152,7 @@ linux_syscall_trace32: srl %i4, 0, %o4 srl %i1, 0, %o1 srl %i2, 0, %o2 - ba,pt %xcc, 2f + ba,pt %xcc, 5f srl %i3, 0, %o3 linux_syscall_trace: @@ -182,13 +182,13 @@ linux_sparc_syscall32: srl %i1, 0, %o1 ! IEU0 Group ldx [%g6 + TI_FLAGS], %l0 ! Load - srl %i5, 0, %o5 ! IEU1 + srl %i3, 0, %o3 ! IEU0 srl %i2, 0, %o2 ! IEU0 Group andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0 bne,pn %icc, linux_syscall_trace32 ! CTI mov %i0, %l5 ! IEU1 - call %l7 ! CTI Group brk forced - srl %i3, 0, %o3 ! IEU0 +5: call %l7 ! CTI Group brk forced + srl %i5, 0, %o5 ! IEU1 ba,a,pt %xcc, 3f /* Linux native system calls enter here... */