Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp997675ybi; Fri, 24 May 2019 15:12:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqxrLEIPB24sYqnKykrSVtdveiF/FM/9DkpcBTYto0SASvcTpVbbb2R++B03v8mCNnE87hJ0 X-Received: by 2002:aa7:87c3:: with SMTP id i3mr114203320pfo.85.1558735978643; Fri, 24 May 2019 15:12:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558735978; cv=none; d=google.com; s=arc-20160816; b=M2mSkDAoc0S/QqRLFyCaXNi5ni0vIjd24sgUJisQzyY2MsxRel9bLtP7XZ0P6woXj9 ON9h8eA/RLt58WRMm1DIQQ4EqQEK2VeARugIi/ovtAA5sfsEtD6adTOeuZRbwmKgAIj/ J81kh0WZjyulvnby8E4pPfDBwz4YRtqN4ny0fBGeMf12I/TL3ax0usxqhxwVOYPgaB2I Z1XEiyspnCcCM2k+ZPRQpT+4TVItk8yNUMNnx2EIhB3N1MPSdNiduwmNh23jmzcpzTFZ JNCskijWeKPm/1guyEss85KKH0+tgYPTy4YmDtSQI2LRaDie2vJIBtGs8BHhNhIF//8C juCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=v92h8itBUYfDlklDlHFCcJBl3/YhqLnEEC7wTIuTHIM=; b=mluZ+QhqkYgbDL7cCvkCrWQl3Rm8Xn6dATir0NXL6b12RrSX37p/DR88cTwaIbyQg8 VWFfGi2WiDwDsYPgsldfQAYaExpqQKnyIaK5ctBTyBYtWxRrNmWPpFi6o/dTkJO5sgk+ y+MrbS+32bQmcImbGj0RE8PQ0AxvNUxkKw5hCpfF+cmQwnYPjA2pe64CEPlCHq6tjzaA zFzy0NNKA5dx1qd7GhNRo6j8BbdHSR0kDYyS5VA/b1QFm1T806ggEtq+LeGeu4bfwrvy 0060/JjWEm9tudAOnn1ZRDtf8/bXw2O6K3lFJsFAmRW5z7x9NpjIDDSdT3zhTRrUWg1+ snKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=CUsAhV5X; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 135si5709538pgc.346.2019.05.24.15.12.43; Fri, 24 May 2019 15:12:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=CUsAhV5X; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732197AbfEXWLa (ORCPT + 99 others); Fri, 24 May 2019 18:11:30 -0400 Received: from mail-vs1-f74.google.com ([209.85.217.74]:33399 "EHLO mail-vs1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729348AbfEXWL3 (ORCPT ); Fri, 24 May 2019 18:11:29 -0400 Received: by mail-vs1-f74.google.com with SMTP id q25so2263813vsk.0 for ; Fri, 24 May 2019 15:11:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=v92h8itBUYfDlklDlHFCcJBl3/YhqLnEEC7wTIuTHIM=; b=CUsAhV5X7IG2TWg3my4XjAd8N+cugOoAK2eNkVT5xhIUmLHS0BGK+qa4DRM4Z22cLx tIKhnYDefXMooVOqGJ9AXeNU1h5v1ryC8qLaZnMLaza9RURY7h11L2mzTjYrLav40CKr PoYW9InXbd01jGqMhxFZDs1kzy5+0ZInB9sshvcc6ohLa6l9WU7EO5bpDmDfw2+eQguf XOSuj2JDaQrbY1F01G9b2NXP/AxJEF8DKwMlFxfeaLRFwiwgelynwdfg5FT9Dxd1GOri M9J2A8C/rEIBYKbDjFaBoUiuUY8RBlwTEYHAGjXyKbUWW73gq8uHo2DgxuaVEySRD4il dt2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=v92h8itBUYfDlklDlHFCcJBl3/YhqLnEEC7wTIuTHIM=; b=iLf0BGuMY9+ASFy6HFkjJzfk5zkDMSTS1z8ddVONiouspj3NCK4wVpicd9Nn9+ZSAL 6VUdf+3bcewVoaCThG60h8yIlkvpCUu2CQSeIIrZaX4SQ/T8zmbc4zMFgx2M2l1Wthxt ifSxQ1iAyIKEmqE8cMTPRHtvKarKqlkjPGsne/Uv9J7+0r9Rsjag/VE4+yU0dx0UDTbe CNRpremVbzV6GplTEAEbggp6SNHO6wp2ykTJkBG047UE3cJGjg7tc6xw8vL6j+17sFc1 gjTzfVWRavstuW2P31+QeYHlCUBgtc1lWAkmc8U5g/ydeCHwWFfZC/BQVqYxrTr5719Y WywA== X-Gm-Message-State: APjAAAWxu+6vVDmVNNm3rubCMh59I+Df3Rx65vtRKnrIxuWF/8d7I4NM 1LI4d6YruZIFlT2Yn4w1a3iZyPIc4nwnws/64NU= X-Received: by 2002:a1f:3143:: with SMTP id x64mr8099236vkx.32.1558735887958; Fri, 24 May 2019 15:11:27 -0700 (PDT) Date: Fri, 24 May 2019 15:11:17 -0700 In-Reply-To: <20190524221118.177548-1-samitolvanen@google.com> Message-Id: <20190524221118.177548-3-samitolvanen@google.com> Mime-Version: 1.0 References: <20190524221118.177548-1-samitolvanen@google.com> X-Mailer: git-send-email 2.22.0.rc1.257.g3120a18244-goog Subject: [PATCH v3 2/3] arm64: use the correct function type in SYSCALL_DEFINE0 From: Sami Tolvanen To: Catalin Marinas , Will Deacon , Mark Rutland Cc: Kees Cook , Nick Desaulniers , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Sami Tolvanen Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Although a syscall defined using SYSCALL_DEFINE0 doesn't accept parameters, use the correct function type to avoid indirect call type mismatches with Control-Flow Integrity checking. Signed-off-by: Sami Tolvanen --- arch/arm64/include/asm/syscall_wrapper.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm64/include/asm/syscall_wrapper.h b/arch/arm64/include/asm/syscall_wrapper.h index a4477e515b798..507d0ee6bc690 100644 --- a/arch/arm64/include/asm/syscall_wrapper.h +++ b/arch/arm64/include/asm/syscall_wrapper.h @@ -30,10 +30,10 @@ } \ static inline long __do_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)) -#define COMPAT_SYSCALL_DEFINE0(sname) \ - asmlinkage long __arm64_compat_sys_##sname(void); \ - ALLOW_ERROR_INJECTION(__arm64_compat_sys_##sname, ERRNO); \ - asmlinkage long __arm64_compat_sys_##sname(void) +#define COMPAT_SYSCALL_DEFINE0(sname) \ + asmlinkage long __arm64_compat_sys_##sname(const struct pt_regs *__unused); \ + ALLOW_ERROR_INJECTION(__arm64_compat_sys_##sname, ERRNO); \ + asmlinkage long __arm64_compat_sys_##sname(const struct pt_regs *__unused) #define COND_SYSCALL_COMPAT(name) \ cond_syscall(__arm64_compat_sys_##name); @@ -62,11 +62,11 @@ static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)) #ifndef SYSCALL_DEFINE0 -#define SYSCALL_DEFINE0(sname) \ - SYSCALL_METADATA(_##sname, 0); \ - asmlinkage long __arm64_sys_##sname(void); \ - ALLOW_ERROR_INJECTION(__arm64_sys_##sname, ERRNO); \ - asmlinkage long __arm64_sys_##sname(void) +#define SYSCALL_DEFINE0(sname) \ + SYSCALL_METADATA(_##sname, 0); \ + asmlinkage long __arm64_sys_##sname(const struct pt_regs *__unused); \ + ALLOW_ERROR_INJECTION(__arm64_sys_##sname, ERRNO); \ + asmlinkage long __arm64_sys_##sname(const struct pt_regs *__unused) #endif #ifndef COND_SYSCALL -- 2.22.0.rc1.257.g3120a18244-goog