From patchwork Sun Aug 17 14:26:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 35479 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f72.google.com (mail-pa0-f72.google.com [209.85.220.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0880D203C0 for ; Sun, 17 Aug 2014 14:31:39 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id eu11sf35861614pac.11 for ; Sun, 17 Aug 2014 07:31:33 -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=Oi75VWwe+JSy1d5kd70ruPaqaEm1JMKWEcEnfzKfL9w=; b=F3UmDFfaeivOEPit2cVjcBign4/KZB8NK6B4f+AoZRxJDC7jn3sZy0xyIVM/5CH29o WMyYuwo8wzcBhr2/V6BMxjaBipYcmdNCxbK3CsIRnkZ/AN51j8YVK7BaVcBG+DBcqVGD 9CT4CAbwmJCROShZ8GQM/ZlF93u4ddl6qq5w4LaoeIMe4sBWx8zLAYxw9ZKXehEylHDa AOXabrxkQWr/GO9MUN0XdL2KA8tKP/v1CRcbLVKPzGCmnMk3dl0RvSCfBhC52ii+g6KK 9h/HiIwhPWiXN62kPu5W+dXe3yxqSifBJhv4lCi3BRNcqm+QfwxoPUtxo5SfMLgdKZ9k qPTw== X-Gm-Message-State: ALoCoQnV0LS2e3ZVN8YZxWh1c+J1W8YqwdE1JI/c2k0z7Q2RqGWpTQdlnlSZCaDiMxXsNymncD8s X-Received: by 10.66.66.196 with SMTP id h4mr15222692pat.22.1408285893345; Sun, 17 Aug 2014 07:31:33 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.89.231 with SMTP id v94ls754465qgd.14.gmail; Sun, 17 Aug 2014 07:31:33 -0700 (PDT) X-Received: by 10.53.0.164 with SMTP id az4mr598142vdd.52.1408285893194; Sun, 17 Aug 2014 07:31:33 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id y3si4679845vei.104.2014.08.17.07.31.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 17 Aug 2014 07:31:33 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id lf12so4829860vcb.1 for ; Sun, 17 Aug 2014 07:31:33 -0700 (PDT) X-Received: by 10.221.24.7 with SMTP id rc7mr82515vcb.54.1408285893039; Sun, 17 Aug 2014 07:31:33 -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 tc5csp83830vcb; Sun, 17 Aug 2014 07:31:32 -0700 (PDT) X-Received: by 10.70.89.43 with SMTP id bl11mr2417787pdb.163.1408285891171; Sun, 17 Aug 2014 07:31:31 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id jr8si14730792pbc.44.2014.08.17.07.31.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Aug 2014 07:31:31 -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 1XJ1Qb-00081l-W2; Sun, 17 Aug 2014 14:27:25 +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 1XJ1QY-000809-1u for linux-arm-kernel@lists.infradead.org; Sun, 17 Aug 2014 14:27:22 +0000 Received: from 216-80-70-240.c3-0.alc-ubr4.chi-alc.il.cable.rcn.com ([216.80.70.240] helo=finisterre) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1XJ1Pt-0006SZ-Su; Sun, 17 Aug 2014 14:26:43 +0000 Received: from broonie by finisterre with local (Exim 4.84_RC1) (envelope-from ) id 1XJ1Pq-00083E-WB; Sun, 17 Aug 2014 09:26:39 -0500 From: Mark Brown To: Eric Paris , Richard Guy Briggs Date: Sun, 17 Aug 2014 09:26:37 -0500 Message-Id: <1408285597-30913-1-git-send-email-broonie@kernel.org> X-Mailer: git-send-email 2.1.0.rc1 X-SA-Exim-Connect-IP: 216.80.70.240 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, TVD_RCVD_IP 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-20140817_072722_223640_2EBB0E5A X-CRM114-Status: GOOD ( 11.89 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different Cc: linaro-kernel@lists.linaro.org, Mark Brown , Catalin Marinas , Will Deacon , linux-audit@redhat.com, linux-arm-kernel@lists.infradead.org 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.170 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 Acked-by: Catalin Marinas --- Now -rc1 is out this should be applied to the audit tree (or squashed into the commit above) - the arm64 audit support is in mainline now and -next is failing to build arm64 due to this. 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 0310811..159251f 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -1116,8 +1116,8 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs) trace_sys_enter(regs, regs->syscallno); #ifdef CONFIG_AUDITSYSCALL - 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]); #endif return regs->syscallno;