From patchwork Thu Jul 17 11:26:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 33781 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1C62320969 for ; Thu, 17 Jul 2014 11:28:52 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id tr6sf19241424ieb.10 for ; Thu, 17 Jul 2014 04:28:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:subject:cc :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=/KOHtuHmmlKGHdKueUAfGUyuFSwk3WS54fPS85GPocY=; b=gn4zX8qksq8W0yh/ZfVofeklAS96X8j2JKgdOYIpO9n+TBf5mjrd2Bt4lfYgG0l4ft +CQBIGMbXW2mpEczhz7ATAyqsbZRGfh/2+1xjqKCV530kF+kwOb+q2pfA4ZmBC1O+s/k L5Rfm4ncgIRWt05eZ7kX4sHT0I1z9qIInkn6P3e2ovM1k8PxFvHvRKmNB7IY0nWU0BZj d3b/TJ55bijkMAUHq/oLc2z4bLAmBAJxt7psrMVIuqKr3qfnWV6bpgn1U1BCoqjt4rw6 4ng+C/Ir3VGQNjxNo1+66ebVLbkbJlIrI+Cz+BP23acNvpXuF5EaJrjZCa84znluEcIy kW2A== X-Gm-Message-State: ALoCoQmzoFA3fwGUUAv6RnP+d8FGPwaHUH9Z0iLp7ksBb/WhGz6/by5eo6D39VgPwVTOBT7WahM6 X-Received: by 10.42.123.16 with SMTP id p16mr18691508icr.21.1405596532043; Thu, 17 Jul 2014 04:28:52 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.104.17 with SMTP id z17ls667432qge.74.gmail; Thu, 17 Jul 2014 04:28:51 -0700 (PDT) X-Received: by 10.52.117.209 with SMTP id kg17mr23874893vdb.28.1405596531943; Thu, 17 Jul 2014 04:28:51 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id ft1si1785331vec.94.2014.07.17.04.28.51 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 17 Jul 2014 04:28:51 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id la4so4240099vcb.9 for ; Thu, 17 Jul 2014 04:28:51 -0700 (PDT) X-Received: by 10.52.129.200 with SMTP id ny8mr4403964vdb.27.1405596531849; Thu, 17 Jul 2014 04:28:51 -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.221.37.5 with SMTP id tc5csp27675vcb; Thu, 17 Jul 2014 04:28:51 -0700 (PDT) X-Received: by 10.70.35.143 with SMTP id h15mr35842533pdj.5.1405596531020; Thu, 17 Jul 2014 04:28:51 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id x10si1026458pde.417.2014.07.17.04.28.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Jul 2014 04:28:51 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X7jqM-0005B4-Jn; Thu, 17 Jul 2014 11:27:22 +0000 Received: from mezzanine.sirena.org.uk ([2400:8900::f03c:91ff:fedb:4f4]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X7jqJ-000559-6g for linux-arm-kernel@lists.infradead.org; Thu, 17 Jul 2014 11:27:20 +0000 Received: from cpc11-sgyl31-2-0-cust672.sgyl.cable.virginm.net ([94.175.94.161] helo=debutante) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1X7jpm-0002yj-QI; Thu, 17 Jul 2014 11:26:47 +0000 Received: from broonie by debutante with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1X7jpj-0006Nt-U3; Thu, 17 Jul 2014 12:26:43 +0100 From: Mark Brown To: Catalin Marinas , Will Deacon , Richard Guy Briggs , Eric Paris Date: Thu, 17 Jul 2014 12:26:42 +0100 Message-Id: <1405596402-23844-1-git-send-email-broonie@kernel.org> X-Mailer: git-send-email 2.0.1 X-SA-Exim-Connect-IP: 94.175.94.161 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mezzanine.sirena.org.uk X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.3.2 Subject: [PATCH] arm64: audit: Fix build for audit changes X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140717_042719_338050_3F35FBE9 X-CRM114-Status: GOOD ( 11.14 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record Cc: linux-audit@redhat.com, linaro-kernel@lists.linaro.org, linux-arm-kernel@lists.infradead.org, Mark Brown X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: broonie@kernel.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.220.178 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 From: Mark Brown Commit 3efe33f5d2 (audit: x86: drop arch from __audit_syscall_entry() interface) removed the arch parameter from __audit_syscall_entry() and updated the only current user in mainline but this breaks the ARMv8 audit code that has been added in -next. Fix this by making the equivalent update to ARMv8. Signed-off-by: Mark Brown Signed-off-by: Richard Guy Briggs --- arch/arm64/kernel/ptrace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 70526cfda056..310842e3d477 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -1115,8 +1115,8 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs) if (test_thread_flag(TIF_SYSCALL_TRACEPOINT)) trace_sys_enter(regs, regs->syscallno); - audit_syscall_entry(syscall_get_arch(), regs->syscallno, - regs->orig_x0, regs->regs[1], regs->regs[2], regs->regs[3]); + audit_syscall_entry(regs->syscallno, regs->orig_x0, regs->regs[1], + regs->regs[2], regs->regs[3]); return regs->syscallno; }