From patchwork Thu Oct 2 09:46:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 38282 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1D90A20549 for ; Thu, 2 Oct 2014 09:47:54 +0000 (UTC) Received: by mail-wi0-f200.google.com with SMTP id cc10sf942542wib.7 for ; Thu, 02 Oct 2014 02:47:53 -0700 (PDT) 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=rnvkSJzS4o7gacYxMjQ89Z/V5NptSL3R1lnQzth5tRc=; b=cpk5fMZnCZ1KcympUQ4YdfIQc0TTXn+YAfkqE5lcbXquScT5jF6qpDIv/DzQ3VeQS6 VZ7UST7FseFJEx5GEvicZSQGvrHAlZPN0gvzoWX2EtpFGlQvwcvBpCQ6sYwN7EwE/h5k ssfoat0WCGWw1Ar+2lbbBqMfNvY1St812nhHKLyPU4V1cCDNwX16cXcdR9djhlg5epTB iRER+VcCcKV8rePATqApT43RjYGXnJrDy7ixiJQ1EvF8Q1WVO8bAOO1LsCoVogIEMGm1 Nhwfl28h3K13m+lZb9BWyFzbJbQj8FmASRheft4+C90xinhXzvhYLxAFwDQ7BNyjdyib sQwA== X-Gm-Message-State: ALoCoQneOVYPgltRN+qSvJY+mtGCH3n7aMD7qeux25Hu0A95ycEalAIEbfynEDx8j864cphmL8nI X-Received: by 10.112.6.138 with SMTP id b10mr314874lba.18.1412243273305; Thu, 02 Oct 2014 02:47:53 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.28.39 with SMTP id y7ls257845lag.0.gmail; Thu, 02 Oct 2014 02:47:53 -0700 (PDT) X-Received: by 10.112.144.106 with SMTP id sl10mr9193569lbb.68.1412243273133; Thu, 02 Oct 2014 02:47:53 -0700 (PDT) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com [209.85.217.182]) by mx.google.com with ESMTPS id bn10si5650394lbc.108.2014.10.02.02.47.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 02 Oct 2014 02:47:53 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by mail-lb0-f182.google.com with SMTP id z11so1920736lbi.13 for ; Thu, 02 Oct 2014 02:47:53 -0700 (PDT) X-Received: by 10.152.5.168 with SMTP id t8mr61158300lat.67.1412243273057; Thu, 02 Oct 2014 02:47:53 -0700 (PDT) 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.130.169 with SMTP id of9csp23635lbb; Thu, 2 Oct 2014 02:47:52 -0700 (PDT) X-Received: by 10.66.120.176 with SMTP id ld16mr87107098pab.84.1412243271569; Thu, 02 Oct 2014 02:47:51 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ez9si3331693pab.128.2014.10.02.02.47.50 for ; Thu, 02 Oct 2014 02:47:51 -0700 (PDT) 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 S1752009AbaJBJrq (ORCPT + 27 others); Thu, 2 Oct 2014 05:47:46 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:45008 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750987AbaJBJro (ORCPT ); Thu, 2 Oct 2014 05:47:44 -0400 Received: by mail-pa0-f49.google.com with SMTP id hz1so1893304pad.8 for ; Thu, 02 Oct 2014 02:47:43 -0700 (PDT) X-Received: by 10.68.220.10 with SMTP id ps10mr85996271pbc.135.1412243263506; Thu, 02 Oct 2014 02:47:43 -0700 (PDT) Received: from localhost.localdomain (KD182249093205.au-net.ne.jp. [182.249.93.205]) by mx.google.com with ESMTPSA id w7sm3013036pbs.4.2014.10.02.02.47.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 02 Oct 2014 02:47:42 -0700 (PDT) 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 v7 5/6] arm64: add SIGSYS siginfo for compat task Date: Thu, 2 Oct 2014 18:46:15 +0900 Message-Id: <1412243176-16192-6-git-send-email-takahiro.akashi@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1412243176-16192-1-git-send-email-takahiro.akashi@linaro.org> References: <1412243176-16192-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.217.182 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. 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 253e33b..c877915 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 */ + unsigned int _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);