From patchwork Tue Nov 18 01:10:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 40985 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7A31324035 for ; Tue, 18 Nov 2014 01:12:13 +0000 (UTC) Received: by mail-lb0-f198.google.com with SMTP id 10sf12088199lbg.9 for ; Mon, 17 Nov 2014 17:12:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=LVjXtCMb9EWoGD7yDMsC7dymOpZMuocqd6TSfL8eFJU=; b=STjlsbSg3xaqZsWTkf9WZxQ3JGRaTeeaBP9pFsVaP+t02VdNOiR4+M6FznUtnA9mp5 glrIhdvhd0X+xBKa8x8sjKP40vtk1Jz2JxmAQvJWj3lxAJdv93WhTwpAp9+Qo0xdCPFx WR5mchMzig2O/OgPhhyA746QJ4gq9lF0TLg0QbVywhdOHwHu4P50rZeZWS1H7Vr3QP1L qgel8t3klUTwh2dqCDBm+M2wtaD1iRT2C4nKnG0rOpgrHkr0JXtryZe6ora2uJrudRF4 S+tZFDkbWzAHgAeDMxl33ypI01niSGl2tUz7fB701MrfgvnVyJnek9R9C9bWXt0Mf3Q4 P/oQ== X-Gm-Message-State: ALoCoQk22jAVbcCsFme2ZuYsziWKZpMzSMwBohaOSzl4gIUQ6XbCml0bVBxFiLLA5KYyScSCKpM1 X-Received: by 10.180.37.105 with SMTP id x9mr2647088wij.7.1416273132528; Mon, 17 Nov 2014 17:12:12 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.146 with SMTP id ay18ls857247lab.51.gmail; Mon, 17 Nov 2014 17:12:12 -0800 (PST) X-Received: by 10.152.5.6 with SMTP id o6mr32186510lao.8.1416273132049; Mon, 17 Nov 2014 17:12:12 -0800 (PST) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id ai9si11581143lbc.55.2014.11.17.17.12.12 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Nov 2014 17:12:12 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by mail-la0-f46.google.com with SMTP id gd6so3569028lab.33 for ; Mon, 17 Nov 2014 17:12:12 -0800 (PST) X-Received: by 10.112.235.196 with SMTP id uo4mr31537355lbc.66.1416273131962; Mon, 17 Nov 2014 17:12:11 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp1256976lbc; Mon, 17 Nov 2014 17:12:11 -0800 (PST) X-Received: by 10.66.129.142 with SMTP id nw14mr7836180pab.119.1416273130298; Mon, 17 Nov 2014 17:12:10 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fy9si36600137pdb.167.2014.11.17.17.12.09 for ; Mon, 17 Nov 2014 17:12:10 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753769AbaKRBMH (ORCPT + 26 others); Mon, 17 Nov 2014 20:12:07 -0500 Received: from mail-pd0-f176.google.com ([209.85.192.176]:35826 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753739AbaKRBMD (ORCPT ); Mon, 17 Nov 2014 20:12:03 -0500 Received: by mail-pd0-f176.google.com with SMTP id y10so2942563pdj.21 for ; Mon, 17 Nov 2014 17:12:01 -0800 (PST) X-Received: by 10.70.118.165 with SMTP id kn5mr7235283pdb.140.1416273121922; Mon, 17 Nov 2014 17:12:01 -0800 (PST) Received: from localhost.localdomain (KD182249087116.au-net.ne.jp. [182.249.87.116]) by mx.google.com with ESMTPSA id cf12sm36225005pdb.77.2014.11.17.17.11.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Nov 2014 17:12:00 -0800 (PST) From: AKASHI Takahiro To: keescook@chromium.org, catalin.marinas@arm.com, will.deacon@arm.com Cc: dsaxena@linaro.org, arndb@arndb.de, linux-arm-kernel@lists.infradead.org, linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, AKASHI Takahiro Subject: [PATCH v8 5/6] arm64: add SIGSYS siginfo for compat task Date: Tue, 18 Nov 2014 10:10:37 +0900 Message-Id: <1416273038-15590-6-git-send-email-takahiro.akashi@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1416273038-15590-1-git-send-email-takahiro.akashi@linaro.org> References: <1416273038-15590-1-git-send-email-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: takahiro.akashi@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , SIGSYS is primarily used in secure computing to notify tracer of syscall events. This patch allows signal handler on compat task to get correct information with SA_SIGINFO specified when this signal is delivered. Reviewed-by: Kees Cook Signed-off-by: AKASHI Takahiro --- arch/arm64/include/asm/compat.h | 7 +++++++ arch/arm64/kernel/signal32.c | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h index 56de5aa..3fb053f 100644 --- a/arch/arm64/include/asm/compat.h +++ b/arch/arm64/include/asm/compat.h @@ -205,6 +205,13 @@ typedef struct compat_siginfo { compat_long_t _band; /* POLL_IN, POLL_OUT, POLL_MSG */ int _fd; } _sigpoll; + + /* SIGSYS */ + struct { + compat_uptr_t _call_addr; /* calling user insn */ + int _syscall; /* triggering system call number */ + compat_uint_t _arch; /* AUDIT_ARCH_* of syscall */ + } _sigsys; } _sifields; } compat_siginfo_t; diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c index 1b9ad02..5a1ba6e 100644 --- a/arch/arm64/kernel/signal32.c +++ b/arch/arm64/kernel/signal32.c @@ -186,6 +186,12 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, const siginfo_t *from) err |= __put_user(from->si_uid, &to->si_uid); err |= __put_user((compat_uptr_t)(unsigned long)from->si_ptr, &to->si_ptr); break; + case __SI_SYS: + err |= __put_user((compat_uptr_t)(unsigned long) + from->si_call_addr, &to->si_call_addr); + err |= __put_user(from->si_syscall, &to->si_syscall); + err |= __put_user(from->si_arch, &to->si_arch); + break; default: /* this is just in case for now ... */ err |= __put_user(from->si_pid, &to->si_pid); err |= __put_user(from->si_uid, &to->si_uid);